Changeset 21206

Timestamp:

Mar 5, 2013, 1:04:50 PM (11 years ago)

Author:

mistic100

Message:

-define body_id and fix breadcrumb
-fix edit page with simple and gthumb+

Location:

extensions/BatchDownloader

Files:

• include/download.inc.php (modified) (2 diffs)
• include/events.inc.php (modified) (3 diffs)
• template/thumbnails_css_js.tpl (modified) (2 diffs)

extensions/BatchDownloader/include/download.inc.php

@@ -137 +137 @@
 {
   // add links
-  $search = '<span class="wrap1">';
-  $replace = $search.'
+  $search = '#(<li>|<li class="gthumb">)#';
+  $replace = '$1
 {strip}<a class="removeSet" href="{$U_VIEW}&amp;remove={$thumbnail.id}" data-id="{$thumbnail.id}" rel="nofollow">
 {\'Remove from download set\'|@translate}&nbsp;<img src="{$ROOT_URL}{$BATCH_DOWNLOAD_PATH}template/image_delete.png" title="{\'Remove from download set\'|@translate}">
@@ -146 +146 @@
   $content.= file_get_contents(BATCH_DOWNLOAD_PATH.'template/thumbnails_css_js.tpl');
 
-  return str_replace($search, $replace, $content);
+  return preg_replace($search, $replace, $content);
 }
 

extensions/BatchDownloader/include/events.inc.php

@@ -13 +13 @@
     if (check_download_access() === false) access_denied();
     
+    add_event_handler('loc_begin_page_header', 'batch_download_page_header');
+    
     $page['section'] = 'download';
-    $page['title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].l10n('Batch Downloader').$conf['level_separator'];
+    $page['section_title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].l10n('Batch Downloader').$conf['level_separator'];
+    $page['title'] = l10n('Batch Downloader');
     
     switch (@$tokens[1])
@@ -20 +23 @@
       case 'init_zip':
         $page['sub_section'] = 'init_zip';
-        $page['title'].= l10n('Generate ZIP');
+        $page['section_title'].= l10n('Generate ZIP');
         break;
       case 'view':
         $page['sub_section'] = 'view';
-        $page['title'].= l10n('Edit the set');
+        $page['section_title'].= l10n('Edit the set');
         break;
       default:
@@ -30 +33 @@
     }
   }
+}
+
+function batch_download_page_header()
+{
+  global $page;
+  $page['body_id'] = 'theBatchDownloader';
 }
 

extensions/BatchDownloader/template/thumbnails_css_js.tpl

@@ -1 +1 @@
 {html_style}
-.thumbnails  .wrap1 {ldelim} position:relative; }
-.wrap1 .removeSet {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:10px;z-index:100;color:#eee;white-space:nowrap; }
-.wrap1:hover .removeSet {ldelim} display:block; 
+#thumbnails li {ldelim} position:relative !important;display:inline-block; }
+li .removeSet {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:10px;z-index:100 !important;color:#eee;white-space:nowrap; }
+li:hover .removeSet {ldelim} display:block !important; }
 {/html_style}
 
@@ -16 +16 @@
   }).done(function(msg) {ldelim}
     if (msg == "false") {ldelim}
-      $trigger.parent(".wrap1").hide("fast", function() {ldelim} $trigger.remove() });
+      $trigger.parent("li").hide("fast", function() {ldelim} $trigger.remove() });
       jQuery(".nbImagesSet").html(parseInt(jQuery(".nbImagesSet").html()) -1);
     } else {ldelim}