revert r12475, targeted version is 2.4

git-svn-id: http://piwigo.org/svn/branches/2.3@12476 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 16 insertions, 29 deletions

diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 83976df8f..8b42165f7 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -768,11 +768,7 @@ SELECT id,path,tn_ext,file,filesize,level,name
         'TN_SRC' => $src,
         'FILE' => $row['file'],
         'TITLE' => $title,
-        'LEVEL' => $row['level'],
-        'FILE_SRC' => $row['path'],
-        'U_EDIT' =>
-            PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
-            '&image_id='.$row['id'],
+        'LEVEL' => $row['level']
         )
       );
   }
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 83e9d6935..41173eddc 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -1,6 +1,5 @@
 {include file='include/tag_selection.inc.tpl'}
 {include file='include/datepicker.inc.tpl'}
-{include file='include/colorbox.inc.tpl'}
 
 {footer_script}{literal}
   pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#date_creation_year", "#date_creation_linked_date", "#date_creation_action_set");
@@ -12,8 +11,6 @@
 
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
-  jQuery("a.preview-box").colorbox();
-  
 	var tag_src = [{foreach from=$tags item=tag name=tags}{ldelim}name:"{$tag.name|@escape:'javascript'}",id:"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}];
   jQuery("#tags").tokenInput(
     tag_src,
@@ -551,25 +548,22 @@ jQuery(window).load(function() {
           {assign var='isSelected' value=false}
         {/if}
 
-      <li>
-        <span class="wrap1">
+      <li><span class="wrap1">
           <label>
             <span class="wrap2{if $isSelected} thumbSelected{/if}">
-            <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> | <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
-              {if $thumbnail.LEVEL > 0}
-              <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
-              <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
-              {/if}
-              <span>
-                <img src="{$thumbnail.TN_SRC}"
-                   alt="{$thumbnail.FILE}"
-                   title="{$thumbnail.TITLE|@escape:'html'}"
-                   class="thumbnail">
-              </span>
-            </span>
+        {if $thumbnail.LEVEL > 0}
+        <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
+        <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
+        {/if}
+            <span>
+              <img src="{$thumbnail.TN_SRC}"
+                 alt="{$thumbnail.FILE}"
+                 title="{$thumbnail.TITLE|@escape:'html'}"
+                 class="thumbnail">
+            </span></span>
             <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
           </label>
-        </span>
+          </span>
       </li>
       {/foreach}
     </ul>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index cf2a2580b..433d62ffb 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1025,20 +1025,17 @@ LEGEND {
 #batchManagerGlobal ul.thumbnails span.wrap1 {margin:5px}
 #batchManagerGlobal ul.thumbnails span.wrap2 {border:0}
 #batchManagerGlobal ul.thumbnails span.wrap2:hover {background-color:#7CBA0F;}
-#batchManagerGlobal ul.thumbnails div.actions {display:none;position:absolute;top:0;right:5px;}
-#batchManagerGlobal ul.thumbnails div.actions a {color:#222;}
-#batchManagerGlobal ul.thumbnails span.wrap1:hover div.actions {display:block;}
 #batchManagerGlobal #selectedMessage {padding:5px; -moz-border-radius:5px;-webkit-border-radius:5px;}
-#batchManagerGlobal #selectSet a {border-bottom:1px dotted;}
+#batchManagerGlobal #selectSet a {border-bottom:1px dotted}
 #batchManagerGlobal #applyOnDetails {font-style:italic;}
 #batchManagerGlobal .actionButtons {text-align:left;}
 #batchManagerGlobal #filterList {padding-left:5px;}
 #batchManagerGlobal #filterList li {margin-bottom:5px; list-style-type:none;}
-#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;}
+#batchManagerGlobal a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block}
 #batchManagerGlobal a.removeFilter:hover {background: url(icon/remove_filter_hover.png); border:none;}
 #batchManagerGlobal .removeFilter span {display:none}
 #batchManagerGlobal #applyFilterBlock {margin-top:20px;}
-#batchManagerGlobal .useFilterCheckbox {display:none;}
+#batchManagerGlobal .useFilterCheckbox {display:none}
 
 
 /* TokenInput (with Facebook style) */