aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-02-09 10:16:56 +0000
committerplegall <plg@piwigo.org>2012-02-09 10:16:56 +0000
commite1b5e45c12a25ac8ed674acf200f11c8a5003d9d (patch)
tree0c953d6cecd51923f891587cee7688aad8d3d0ad /admin/themes/default
parent62c69bb477ced2427a75e77c50e1bcad1f02e15a (diff)
feature 2309 added: ability to "move photos" into an album from the Batch
Manager, ie "dissociate from all albums" + "associate" in a single action. git-svn-id: http://piwigo.org/svn/trunk@13064 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes/default')
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl19
1 files changed, 18 insertions, 1 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 856633421..76a99de5b 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -194,6 +194,13 @@ $(document).ready(function() {
$("[id^=action_]").hide();
$("#action_"+$(this).attr("value")).show();
+ /* make sure the #albumSelect is on the right select box so that the */
+ /* "add new album" popup fills the right select box */
+ if ("associate" == $(this).attr("value") || "move" == $(this).attr("value")) {
+ jQuery("#albumSelect").removeAttr("id");
+ jQuery("#action_"+$(this).attr("value")+" select").attr("id", "albumSelect");
+ }
+
if ($(this).val() != -1) {
$("#applyActionBlock").show();
}
@@ -612,6 +619,7 @@ jQuery(window).load(function() {
<option value="delete">{'Delete selected photos'|@translate}</option>
{/if}
<option value="associate">{'Associate to album'|@translate}</option>
+ <option value="move">{'Move to album'|@translate}</option>
{if !empty($dissociate_options)}
<option value="dissociate">{'Dissociate from album'|@translate}</option>
{/if}
@@ -645,12 +653,21 @@ jQuery(window).load(function() {
<!-- associate -->
<div id="action_associate" class="bulkAction">
- <select id="albumSelect" style="width:400px" name="associate" size="1">
+ <select style="width:400px" name="associate" size="1">
{html_options options=$associate_options }
</select>
<br>{'... or '|@translate}</span><a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
</div>
+ <!-- move -->
+ <div id="action_move" class="bulkAction">
+ <select style="width:400px" name="move" size="1">
+ {html_options options=$move_options }
+ </select>
+<br>{'... or '|@translate}</span><a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
+ </div>
+
+
<!-- dissociate -->
<div id="action_dissociate" class="bulkAction">
<select style="width:400px" name="dissociate" size="1">