Changeset 1358:f117338392dc for admin/media.php

Timestamp:

08/14/13 14:16:36 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Messages are now displayed below the breadcrumb, fixes #1528

File:

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

admin/media.php

@@ -203 +203 @@
 if ($dir && !empty($_GET['remove']) && empty($_GET['noconfirm']))
 {
-     call_user_func($open_f,__('Media manager'));
-     
-     dcPage::breadcrumb(
-          array(
-               html::escapeHTML($core->blog->name) => '',
-               __('Media manager') => '',
-               '<span class="page-title">'.__('confirm removal').'</span>' => ''
-          ));
+     call_user_func($open_f,__('Media manager'),'',
+          dcPage::breadcrumb(
+               array(
+                    html::escapeHTML($core->blog->name) => '',
+                    __('Media manager') => '',
+                    '<span class="page-title">'.__('confirm removal').'</span>' => ''
+               ),!$popup)
+     );
      
      echo
@@ -232 +232 @@
 $user_ui_enhanceduploader = $core->auth->user_prefs->interface->enhanceduploader;
 
-call_user_func($open_f,__('Media manager'),
-     dcPage::jsLoad('js/_media.js').
-     ($core_media_writable ? dcPage::jsUpload(array('d='.$d)) : '')
-     );
-
-if (!empty($_GET['mkdok'])) {
-     dcPage::message(__('Directory has been successfully created.'));
-}
-
-if (!empty($_GET['upok'])) {
-     dcPage::message(__('Files have been successfully uploaded.'));
-}
-
-if (!empty($_GET['rmfok'])) {
-     dcPage::message(__('File has been successfully removed.'));
-}
-
-if (!empty($_GET['rmdok'])) {
-     dcPage::message(__('Directory has been successfully removed.'));
-}
-
-if (!empty($_GET['rebuildok'])) {
-     dcPage::message(__('Directory has been successfully rebuilt.'));
-}
-
-if (!empty($_GET['unzipok'])) {
-     dcPage::message(__('Zip file has been successfully extracted.'));
-}
 
 if (!isset($core->media)) {
-     dcPage::breadcrumb(
+     $breadcrumb = dcPage::breadcrumb(
           array(
                html::escapeHTML($core->blog->name) => '',
                '<span class="page-title">'.__('Media manager').'</span>' => ''
-          ));
+          ),!$popup);
 } else {
-     $breadcrumb = $core->media->breadCrumb(html::escapeURL($page_url).'&amp;d=%s','<span class="page-title">%s</span>');
-     if ($breadcrumb == '') {
-          dcPage::breadcrumb(
+     $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'&amp;d=%s','<span class="page-title">%s</span>');
+     if ($breadcrumb_media == '') {
+          $breadcrumb = dcPage::breadcrumb(
                array(
                     html::escapeHTML($core->blog->name) => '',
                     '<span class="page-title">'.__('Media manager').'</span>' => ''
-               ));
+               ),!$popup);
      } else {
-          dcPage::breadcrumb(
+          $breadcrumb = dcPage::breadcrumb(
                array(
                     html::escapeHTML($core->blog->name) => '',
                     __('Media manager') => html::escapeURL($page_url.'&d='),
-                    $breadcrumb => ''
-               ));
-     }
+                    $breadcrumb_media => ''
+               ),!$popup);
+     }
+}
+
+call_user_func($open_f,__('Media manager'),
+     dcPage::jsLoad('js/_media.js').
+     ($core_media_writable ? dcPage::jsUpload(array('d='.$d)) : ''),
+     $breadcrumb
+     );
+
+if (!empty($_GET['mkdok'])) {
+     dcPage::message(__('Directory has been successfully created.'));
+}
+
+if (!empty($_GET['upok'])) {
+     dcPage::message(__('Files have been successfully uploaded.'));
+}
+
+if (!empty($_GET['rmfok'])) {
+     dcPage::message(__('File has been successfully removed.'));
+}
+
+if (!empty($_GET['rmdok'])) {
+     dcPage::message(__('Directory has been successfully removed.'));
+}
+
+if (!empty($_GET['rebuildok'])) {
+     dcPage::message(__('Directory has been successfully rebuilt.'));
+}
+
+if (!empty($_GET['unzipok'])) {
+     dcPage::message(__('Zip file has been successfully extracted.'));
 }