From 2c07ea19c91b4c6dfdd878129ec248cafe156449 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 21 Mar 2016 10:47:56 -0400
Subject: [PATCH]  Bug 14582 - OPAC detail shows an unuseful link to "add tag"
 when user is not logged in
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch rearranges some parts of the OPAC detail page template so
that the "add tag" link does not appear if the user is not logged in.

This patch also includes some whitespace changes, so please diff
accordingly.

To test, apply the patch and set "TagsEnabled" to "Allow."

- With "TagsInputOnDetail" set to "Allow," view the detail page for a
  bibliographic record in the OPAC when /not/ logged in. You should see
  a "Log in to add tags" link which triggers the login modal when
  clicked.

- Log in and view the same page. Confirm that there is now an "Add
  tag(s)" link which triggers the add tags form. Confirm that the
  behavior of the add tags form is still correct.

- With "TagsInputOnDetail" set to "Don't allow" view the detail page
  again and verify that the "Log in to add tags" link doesn't appear
  when not logged in, and the "Add tags" link doesn't appear when logged
  in.

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 .../bootstrap/en/modules/opac-detail.tt       | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index e9a52b6339..e5db3ffd84 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -397,39 +397,36 @@
 
                     [% IF ( TagsShowEnabled ) %]
                         <div class="results_summary tags">
-                        [% IF ( TagLoop ) %]
-                            <span class="label">Tags from this library:</span>
-                            <ul id="tagslist">
-                                [% FOREACH TagLoo IN TagLoop %]
-                                    <li><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a> <span class="weight">([% TagLoo.weight_total %])</span>
-                                    [% IF ( loop.last ) %][% ELSE %], [% END %]
-                                    </li>
-                                [% END %]
-                            </ul>
-                        [% ELSE %]
-                            <span class="label">Tags from this library:</span> <span class="notags">No tags from this library for this title.</span>
-                        [% END %]
-                        [% IF ( TagsInputEnabled ) %] <a class="tag_add" id="tag_add[% biblionumber %]" href="#">Add tag(s)</a> [% END %]
-                        </div>
-                    [% END # /IF TagsShowEnabled %]
-
-                    [% IF ( TagsInputEnabled ) %]
-                      <div class="results_summary tagsinput">
-                            [% IF ( loggedinusername ) %]
-                                <form id="tagform[% biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl" style="display:none;">
-                                    <label for="newtag[% biblionumber %]">New tag(s), separated by a comma:</label>
-                                    <input name="newtag[% biblionumber %]" id="newtag[% biblionumber %]" maxlength="100" type="text"/>
-                                    <input name="tagbutton" class="btn btn-small tagbutton" title="[% biblionumber %]" type="submit" value="Add" />
-                                    <a class="cancel_tag_add" id="cancel[% biblionumber %]" href="#">(done)</a>
-                                </form>
-                                <span id="newtag[% biblionumber %]_status" class="tagstatus" style="display:none;">
-                                    Tag status here.
-                                </span>
+                            [% IF ( TagLoop ) %]
+                                <span class="label">Tags from this library:</span>
+                                <ul id="tagslist">
+                                    [% FOREACH TagLoo IN TagLoop %]
+                                        <li><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a> <span class="weight">([% TagLoo.weight_total %])</span>
+                                        [% IF ( loop.last ) %][% ELSE %], [% END %]
+                                        </li>
+                                    [% END %]
+                                </ul>
                             [% ELSE %]
-                                <span id="login4tags">Log in to add tags.</span>
+                                <span class="label">Tags from this library:</span> <span class="notags">No tags from this library for this title.</span>
                             [% END %]
+                            [% IF ( TagsInputEnabled ) %]
+                                [% IF ( loggedinusername ) %]
+                                    <form id="tagform[% biblionumber %]" method="post" action="/cgi-bin/koha/opac-tags.pl" style="display:none;">
+                                        <label for="newtag[% biblionumber %]">New tag(s), separated by a comma:</label>
+                                        <input name="newtag[% biblionumber %]" id="newtag[% biblionumber %]" maxlength="100" type="text"/>
+                                        <input name="tagbutton" class="btn btn-small tagbutton" title="[% biblionumber %]" type="submit" value="Add" />
+                                        <a class="cancel_tag_add" id="cancel[% biblionumber %]" href="#">(done)</a>
+                                    </form>
+                                    <span id="newtag[% biblionumber %]_status" class="tagstatus" style="display:none;">
+                                        Tag status here.
+                                    </span>
+                                    <a class="tag_add" id="tag_add[% biblionumber %]" href="#">Add tag(s)</a>
+                                [% ELSE %]
+                                    <span id="login4tags"><a class="loginModal-trigger" data-toggle="modal" role="button" href="/cgi-bin/koha/opac-user.pl">Log in to add tags.</a></span>
+                                [% END %]
+                            [% END # / IF TagsInputEnabled %]
                         </div>
-                    [% END # / IF TagsInputEnabled %]
+                    [% END # /IF TagsShowEnabled %]
 
                     [% IF ( SyndeticsEnabled ) %]
                         [% IF ( SyndeticsSeries && SyndeticsSERIES1Exists ) %]
-- 
2.39.5