From 9a60aaf16a4fc09e6e747e8c1b7bd2adde0e1f60 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Dec 2011 09:53:05 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 7226 - can't add tags on list Incorrect check for TagsInputOnList was preventing the right JavaScript from being triggered, and markup was nested inside the wrong logic for the confirmation message to be displayed consistently. Signed-off-by: Nicole C. Engard --- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 26 ++++++++++---------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 528b8a7..8fff936 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -92,7 +92,6 @@ $(function() { $("#addtags").html(""+_("Tag")+"<\/a> |"); $(".tagbutton").click(KOHA.Tags.add_tag_button); - [% IF ( TagsInputOnList ) %] [% IF ( loggedinusername ) %] $("#tagsel_tag").click(function(){ tagSelected(); @@ -112,7 +111,6 @@ $(function() { return false; }); [% END %] - [% END %] [% END %][% END %][% END %] [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %] }); @@ -278,14 +276,16 @@ $(function() { [% END %][% ELSE %]This record has no items.[% END %] [% END %] [% IF ( TagsEnabled ) %] - [% IF ( TagsShowOnList ) %] - [% IF ( itemsloo.TagLoop ) %] -
- Tags: - - [% END %] + [% IF ( TagsShowOnList ) %] + [% IF ( itemsloo.TagLoop.size ) %] +
+ Tags: +
    [% FOREACH TagLoo IN itemsloo.TagLoop %]
  • [% TagLoo.term %] ([% TagLoo.weight_total %])
  • + [% END %] +
+
+ [% END %] + [% END %] [% IF ( TagsInputOnList ) %] [% IF ( loggedinusername ) %]
@@ -299,10 +299,10 @@ $(function() { [% ELSIF ( loop.first ) %]Log in to add tags. [% END %] [% END %] - [% IF ( itemsloo.TagLoop ) %] -
[% END %] + [% IF ( loggedinusername ) %] + + [% END %] [% END %] - [% END %] Actions: [% IF ( RequestOnOpac ) %] -- 1.7.2.3