From 15c3be55afbcff1d5f149f53273bfb25009582a7 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 4 Feb 2021 17:40:24 +0000
Subject: [PATCH] Bug 27628: Fix minor HTML markup errors in OPAC search
 results templates

This patch makes a couple of minor corrections to templates related to
OPAC search results: An errant quote, and invalidly repeating ids.

The #login4tags id is changed to a class, and CSS related to this id
(which was not used) is removed. For consistency, the id is changed to a
class on the detail page as well.

To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).

 - Perform a search in the OPAC. Confirm that the "Log in to add tags"
   link still looks correct at various browser widths.
 - Confirm that it works to trigger the login modal.
 - Validate the source of the page. There should be no errors.

 - View the detail page for a bibliographic record.
 - The "Log in to add tags" link should look correct and work correctly.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss     | 7 +------
 .../opac-tmpl/bootstrap/en/includes/title-actions-menu.inc | 6 +++++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt   | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
index ed2ab69e4b..e6676fd76b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
@@ -120,8 +120,7 @@
             }
         }
 
-        a,
-        #login4tags {
+        a {
             @include border-radius-all( 4px );
             background-color: #F2F2EF;
             border: 1px solid #DDD;
@@ -136,10 +135,6 @@
             display: block;
             font-weight: bold;
         }
-
-        #login4tags {
-            margin-right: 1em;
-        }
     }
 
     #opac-main-search {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
index 124c95da4a..0b58145c49 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
@@ -36,7 +36,11 @@
                 Tag status here.
             </span>
         [% ELSE %]
-            <span class="actions"><span id="login4tags"><a class="btn btn-link btn-sm loginModal-trigger" href="/cgi-bin/koha/opac-user.pl"><i class="fa fa-tag" aria-hidden="true"></i> Log in to add tags</a></span></span>
+            <span class="actions">
+                <span class="login4tags">
+                    <a class="btn btn-link btn-sm loginModal-trigger" href="/cgi-bin/koha/opac-user.pl"><i class="fa fa-tag" aria-hidden="true"></i> Log in to add tags</a>
+                </span>
+            </span>
         [% END # IF loggedinusername %]
     [% END # if TagsInputEnabled %]
 
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 8c2cbacff9..a14c1e3607 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -349,7 +349,7 @@
                                 [% IF ( loggedinusername ) %]
                                     <a class="tag_add btn btn-sm btn-link" id="tag_add[% biblio.biblionumber | html %]" href="#"><i class="fa fa-tag" aria-hidden="true"></i> Add tag(s)</a>
                                 [% ELSE %]
-                                    <span id="login4tags">
+                                    <span class="login4tags">
                                         [% IF Koha.Preference('casAuthentication') %]
                                             [%# CAS authentication is too complicated for modal window %]
                                             <a href="/cgi-bin/koha/opac-user.pl">Log in to add tags.</a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index a60ac5f5e9..ad91bbbba6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -262,7 +262,7 @@
                                                             [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %]
                                                                 <option value="morelists">[ More lists ]</option>
                                                             [% END %]
-                                                            <option value="newlist">[ New list ]</option>"
+                                                            <option value="newlist">[ New list ]</option>
                                                         [% END # /IF virtualshelves %]
                                                     </select>
                                                     <input type="submit" class="btn btn-sm btn-primary" value="Save" />
-- 
2.39.5