From d7c3c65cd4d1475ae3bc8875114ffb7e54992b8d Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 31 Dec 2010 14:06:27 +0000 Subject: [PATCH] Batch Manager: * add l0n to the new Batch Manager where is was missing * change photo "name" to photo "title" * change the way we display "Select all" and "Select the whole set" git-svn-id: http://piwigo.org/svn/trunk@8408 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager.php | 31 -------- admin/batch_manager_global.php | 6 +- .../default/template/batch_manager_global.tpl | 77 +++++++++---------- language/en_UK/admin.lang.php | 32 ++++++++ language/fr_FR/admin.lang.php | 32 ++++++++ 5 files changed, 105 insertions(+), 73 deletions(-) diff --git a/admin/batch_manager.php b/admin/batch_manager.php index c055544ae..a608a9bf5 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -247,37 +247,6 @@ foreach ($filter_sets as $set) } $page['cat_elements_id'] = $current_set; -// // To element_set_(global|unit).php, we must provide the elements id of the -// // managed category in $page['cat_elements_id'] array. -// $page['cat_elements_id'] = array(); - -// else if ('duplicates' == $_GET['cat']) -// { -// $page['title'] = l10n('Files with same name in more than one physical category'); -// $template->assign(array('U_ACTIVE_MENU' => 5 )); -// -// // we are searching related elements twice or more to physical categories -// // 1 - Retrieve Files -// $query = ' -// SELECT DISTINCT(file) -// FROM '.IMAGES_TABLE.' -// GROUP BY file -// HAVING COUNT(DISTINCT storage_category_id) > 1 -// ;'; -// -// $duplicate_files = array_from_query($query, 'file'); -// $duplicate_files[]='Nofiles'; -// // 2 - Retrives related picture ids -// $query = ' -// SELECT id, file -// FROM '.IMAGES_TABLE.' -// WHERE file IN (\''.implode("','", $duplicate_files).'\') -// ORDER BY file, id -// ;'; -// -// $page['cat_elements_id'] = array_from_query($query, 'id'); -// } - // +-----------------------------------------------------------------------+ // | first element to display | // +-----------------------------------------------------------------------+ diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index c374e888d..1a6f1130a 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -191,8 +191,8 @@ DELETE ); } - // name - if ('name' == $action) + // title + if ('title' == $action) { $datas = array(); foreach ($collection as $image_id) @@ -201,7 +201,7 @@ DELETE $datas, array( 'id' => $image_id, - 'name' => $_POST['name'] + 'name' => $_POST['title'] ) ); } diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 8f08d8414..c62092c19 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -174,10 +174,6 @@ $(document).ready(function() { $(wrap2).addClass("thumbSelected"); }); - if (nb_thumbs_page < nb_thumbs_set) { - $("#selectSetMessage").show(); - } - checkPermitAction(); return false; @@ -198,7 +194,6 @@ $(document).ready(function() { }); $("#selectInvert").click(function () { - $("#selectSetMessage").hide(); $("input[name=setSelected]").attr('checked', false); $(".thumbnails label").each(function() { @@ -233,12 +228,12 @@ $(document).ready(function() { } }); - $("input[name=remove_name]").click(function () { + $("input[name=remove_title]").click(function () { if ($(this).is(':checked')) { - $("input[name=name]").hide(); + $("input[name=title]").hide(); } else { - $("input[name=name]").show(); + $("input[name=title]").show(); } }); @@ -338,7 +333,7 @@ a.removeFilter:hover {background: url(admin/themes/default/icon/remove_filter_ho Switch to unit mode

-

{'Batch manager'|@translate}

+

{'Batch Manager'|@translate}

@@ -347,16 +342,16 @@ a.removeFilter:hover {background: url(admin/themes/default/icon/remove_filter_ho