Changeset 3140:d8412870758a for admin

Timestamp:

11/20/15 14:23:10 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3141:edb7db547033, 3142:2519b08d820b

Message:

Minor adjustments on media manager

File:

• admin/media.php (modified) (4 diffs)

admin/media.php

@@ -140 +140 @@
 # Recent media dirs
 $last_dirs = null;
-//if ($d) {
+if (!$q) {     // Ignore search results
      $recent_dir = rtrim($d,'/');;
      $core->auth->user_prefs->addWorkspace('interface');
@@ -164 +164 @@
           $core->auth->user_prefs->interface->put('media_last_dirs',serialize($last_dirs));
      }
-//}
+}
 
 # Zip download
@@ -523 +523 @@
 echo '<div class="media-list">';
 echo $last_folders;
-
-if (count($items) == 0)
-{
-     echo
-     '<p>'.__('No file.').'</p>'.
-     sprintf($fmt_form_media,'',' hide'); // need for jsUpload to append new media
-}
-else
-{
-     $pager = new dcPager($page,count($items),$nb_per_page,10);
-
-     echo
+echo // Search form
      '<form action="'.$core->adminurl->get("admin.media").'" method="get" id="search-form">'.
      '<p><label for="search" class="classic">'.__('Search:').'</label> '.
@@ -544 +533 @@
      form::hidden(array('post_id'),$post_id).
      '</p>'.
-     '</form>'.
+     '</form>';
+
+if (count($items) == 0)
+{
+     echo
+     '<p>'.__('No file.').'</p>'.
+     sprintf($fmt_form_media,'',' hide'); // need for jsUpload to append new media
+}
+else
+{
+     $pager = new dcPager($page,count($items),$nb_per_page,10);
+
+     echo
      '<form action="'.$core->adminurl->get("admin.media").'" method="get" id="filters-form">'.
      '<span class="media-file-mode">'.