aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
Diffstat (limited to 'admin/themes')
-rw-r--r--admin/themes/default/template/tags.tpl37
-rw-r--r--admin/themes/default/theme.css2
2 files changed, 39 insertions, 0 deletions
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 10a4f8b84..51b8c3614 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -1,5 +1,28 @@
{include file='include/tag_selection.inc.tpl'}
+{footer_script}{literal}
+jQuery(document).ready(function(){
+ function displayDeletionWarnings() {
+ jQuery(".warningDeletion").show();
+ jQuery("input[name=destination_tag]:checked").parent("label").children(".warningDeletion").hide();
+ }
+
+ displayDeletionWarnings();
+
+ jQuery("#mergeTags label").click(function() {
+ displayDeletionWarnings();
+ });
+
+ jQuery("input[name=merge]").click(function() {
+ if (jQuery("ul.tagSelection input[type=checkbox]:checked").length < 2) {
+ alert("{/literal}{'Select at least two tags for merging'|@translate}{literal}");
+ return false;
+ }
+ });
+});
+{/literal}{/footer_script}
+
+
<div class="titrePage">
<h2>{'Manage tags'|@translate}</h2>
</div>
@@ -30,6 +53,19 @@
</fieldset>
{/if}
+ {if isset($MERGE_TAGS_LIST)}
+ <input type="hidden" name="merge_list" value="{$MERGE_TAGS_LIST}">
+
+ <fieldset id="mergeTags">
+ <legend>{'Merge tags'|@translate}</legend>
+ {'Select the destination tag'|@translate}<br><br>
+ {foreach from=$tags item=tag name=tagloop}
+ <label><input type="radio" name="destination_tag" value="{$tag.ID}"{if $smarty.foreach.tagloop.index == 0} checked="checked"{/if}> {$tag.NAME}<span class="warningDeletion"> {'(this tag will be deleted)'|@translate}</span></label><br>
+ {/foreach}
+ <br><input type="submit" name="confirm_merge" value="{'Confirm merge'|@translate}">
+ </fieldset>
+ {/if}
+
<fieldset>
<legend>{'Add a tag'|@translate}</legend>
@@ -49,6 +85,7 @@
<p>
<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
<input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}">
+ <input class="submit" type="submit" name="merge" value="{'Merge selected tags'|@translate}">
<input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');">
</p>
</fieldset>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index f8bf70be1..433d62ffb 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1078,3 +1078,5 @@ p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;}
#progressbar {border:1px solid #ccc; background-color:#eee;}
.ui-progressbar-value { background-image: url(images/pbar-ani.gif); height:10px;margin:-1px;border:1px solid #E78F08;}
+/* Tag Manager */
+.warningDeletion {display:none;font-style:italic;} \ No newline at end of file