Changeset 3136:0f2e1b90399b for admin

Timestamp:

11/13/15 15:22:01 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add recent folders direct access mechanism for the media manager (setting in user prefs)

Location:

admin

Files:

• media.php (modified) (6 diffs)
• preferences.php (modified) (3 diffs)
• style/default.css (modified) (1 diff)

admin/media.php

@@ -117 +117 @@
      }
      if (!$query) {
-          $core->media->chdir($d);
+          $try_d = $d;
+          // Reset current dir
+          $d = null;
+          // Change directory (may cause an exception if directory doesn't exist)
+          $core->media->chdir($try_d);
+          // Restore current dir variable
+          $d = $try_d;
           $core->media->getDir();
      } else {
@@ -131 +137 @@
      $core->error->add($e->getMessage());
 }
+
+# Recent media dirs
+$last_dirs = null;
+//if ($d) {
+     $recent_dir = rtrim($d,'/');;
+     $core->auth->user_prefs->addWorkspace('interface');
+     $nb_last_dirs = (integer)($core->auth->user_prefs->interface->media_nb_last_dirs);
+     if ($nb_last_dirs > 0) {
+          $last_dirs = @unserialize($core->auth->user_prefs->interface->media_last_dirs);
+          if (!is_array($last_dirs)) {
+               $last_dirs = array();
+          }
+          if (!in_array($recent_dir,$last_dirs)) {
+               // Add new dir at the top of the list
+               array_unshift($last_dirs,$recent_dir);
+               // Remove oldest dir(s)
+               while (count($last_dirs) > $nb_last_dirs) {
+                    array_pop($last_dirs);
+               }
+          } else {
+               // Move current dir at the top of list
+               unset($last_dirs[array_search($recent_dir,$last_dirs)]);
+               array_unshift($last_dirs,$recent_dir);
+          }
+          // Store new list
+          $core->auth->user_prefs->interface->put('media_last_dirs',serialize($last_dirs));
+     }
+//}
 
 # Zip download
@@ -318 +352 @@
      );
 } else {
+     $home_params = $page_url_params;
+     $home_params['d']='';
+     $home_params['q']='';
      if ($query || (!$query && $q)) {
           $count = $query ? count($dir['files']) : 0;
-          $home_params = $page_url_params;
-          $home_params['d']='';
-          $home_params['q']='';
           $breadcrumb = dcPage::breadcrumb(
                array(
@@ -340 +374 @@
                     array(
                          html::escapeHTML($core->blog->name) => '',
-                         __('Media manager') => ''
+                         __('Media manager') => $core->adminurl->get('admin.media',$home_params)
                     ),
                     array('home_link' => !$popup)
@@ -363 +397 @@
 }
 
+// Recent media folders
+$last_folders = '';
+$last_folders_item = '';
+$nb_last_dirs = (integer)($core->auth->user_prefs->interface->media_nb_last_dirs);
+if ($nb_last_dirs > 0) {
+     if (!is_array($last_dirs)) {
+          $last_dirs = @unserialize($core->auth->user_prefs->interface->media_last_dirs);
+     }
+     if (is_array($last_dirs)) {
+          foreach ($last_dirs as $ld) {
+               $ld_params = $page_url_params;
+               $ld_params['d'] = $ld;
+               $last_folders_item .=
+                    '<option value="'.urldecode($core->adminurl->get('admin.media',$ld_params)).'"'.
+                    ($ld == rtrim($d,'/') ? ' selected="selected"' : '').'>'.
+                    '/'.$ld.'</option>'."\n";
+          }
+          if ($last_folders_item != '') {
+               $last_folders =
+                    '<p class="media-recent hidden-if-no-js">'.
+                    '<label class="classic" for="switchfolder">'.__('Goto recent folder:').'</label> '.
+                    '<select name="switchfolder" id="switchfolder">'.
+                    $last_folders_item.
+                    '</select>'.
+                    '<script type="text/javascript">var urlmenu = document.getElementById(\'switchfolder\');
+                     urlmenu.onchange = function() { window.location = this.options[this.selectedIndex].value; };
+                    </script>'.
+                    '</p>';
+          }
+     }
+}
+
 call_user_func($open_f,__('Media manager'),
      dcPage::jsLoad('js/_media.js').
@@ -456 +522 @@
 
 echo '<div class="media-list">';
+echo $last_folders;
+
 if (count($items) == 0)
 {

admin/preferences.php

@@ -47 +47 @@
 $user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 $user_ui_media_by_page = ($core->auth->user_prefs->interface->media_by_page ? $core->auth->user_prefs->interface->media_by_page : 30);
+$user_ui_media_nb_last_dirs = $core->auth->user_prefs->interface->media_nb_last_dirs;
 
 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile';
@@ -191 +192 @@
           }
           $core->auth->user_prefs->interface->put('media_by_page',(integer)$_POST['user_ui_media_by_page'],'integer');
-
-          # Udate user
+          $core->auth->user_prefs->interface->put('media_nb_last_dirs',(integer)$_POST['user_ui_media_nb_last_dirs'],'integer');
+
+          # Update user
           $core->updUser($core->auth->userID(),$cur);
 
@@ -438 +440 @@
 form::field('user_ui_media_by_page',5,3,(integer) $user_ui_media_by_page).'</p>';
 
+echo
+'<p><label for="user_ui_media_nb_last_dirs" class="classic">'.__('Number of recent folders proposed in media manager:').'</label> '.
+form::field('user_ui_media_nb_last_dirs',5,3,(integer) $user_ui_media_nb_last_dirs).'</p>'.
+'<p class="clear form-note">'.__('Leave empty to ignore, displayed only if Javascript is enabled in your browser.').'</p>';
+
 if ($core->auth->isSuperAdmin()) {
      echo

admin/style/default.css

@@ -1959 +1959 @@
      text-align: right;
      }
+.media-recent {
+     float: left;
+     margin-right: 2em;
+}
 /* upload multiple */
 .enhanced_uploader .choose_files, .enhanced_uploader .cancel,