Attachment 111460 Details for Bug 26519 – Bug 26519: Clean up OPAC buttons with incorrect classes

[patch] Bug 26519: Clean up OPAC buttons with incorrect classes

Bug-26519-Clean-up-OPAC-buttons-with-incorrect-cla.patch (text/plain), 7.30 KB, created by Katrin Fischer on 2020-10-11 13:07:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-11 13:07:12 UTC

Size: 7.30 KB

patch

obsolete

>From 13ccc27987f70153cc40b80791682a303ea8fae3 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 23 Sep 2020 16:14:55 +0000
>Subject: [PATCH] Bug 26519: Clean up OPAC buttons with incorrect classes
>
>This patch makes some corrections to the OPAC templates to add the
>correct classes to a few buttons which were missed during the
>Bootstrap 4 upgrade, especially in cases where the buttons only appear
>when JavaScript is disabled.
>
>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).
>
>- Locate the bibliographic record for a serial record and view the
>  details. The subscription should have patron notification set.
>- Under the Subscriptions tab, the "Subscribe to email notifications"
>  button should look correct.
>- Click to subscribe and confirm that the buttons during and after the
>  process look correct.
>
>- Perform a catalog search in the OPAC. On the search results page,
>  disable JavaScript. This can be done in the browser's developer tools
>  under "Settings."
>- At the top of the table of search results there should be a
>  correctly-styled "Go" button next to the sorting dropdown menu. It
>  should work correctly.
>
>- View the contents of a list with JavaScript disabled.
>- The "Resort list" button should be correctly-styled and should work to
>  submit the form.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss          | 13 +++++++++++++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt  |  4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt |  7 +++----
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt |  2 +-
> 4 files changed, 19 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>index 615c9a05d8..c78024c9f5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
>@@ -16,6 +16,8 @@
> 
>     #sortsubmit {
>         display: inline;
>+        padding-left: 0;
>+        padding-right: 0;
>     }
> }
> 
>@@ -1337,6 +1339,17 @@ nav {
>     margin: .3em 0;
> }
> 
>+.ui-widget-content {
>+    a {
>+        &:link,
>+        &:visited {
>+            &.btn {
>+                color: #FFF;
>+            }
>+        }
>+    }
>+}
>+
> #social_networks {
>     margin-top: .5em;
> 
>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 2854660887..d566d4c04b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -796,9 +796,9 @@
>                                     <span class="email_notifications">
>                                         [% IF ( loggedinusername ) %]
>                                             [% IF ( subscription.hasalert ) %]
>-                                                <span>You have subscribed to email notification on new issues. </span><a style="color:#000;" class="btn" title="Cancel email notification" href="/cgi-bin/koha/opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Cancel email notification</a>
>+                                                <span>You have subscribed to email notification on new issues. </span><a class="btn btn-secondary" title="Cancel email notification" href="/cgi-bin/koha/opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Cancel email notification</a>
>                                             [% ELSE %]
>-                                                <a style="color:#000;" class="btn" title="Subscribe to email notification on new issues" href="/cgi-bin/koha/opac-alert-subscribe.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Subscribe to email notification on new issues</a>
>+                                                <a class="btn btn-secondary" title="Subscribe to email notification on new issues" href="/cgi-bin/koha/opac-alert-subscribe.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Subscribe to email notification on new issues</a>
>                                             [% END %]
>                                         [% ELSE %]
>                                             <span>You must log in if you want to subscribe to email notification on new issues</span>
>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 e67f3d815c..7843add315 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -177,7 +177,6 @@
>                                         </div>
>                                         [% UNLESS tag %]
>                                             <div class="sort_by col-sm-auto">
>-                                                <div class="text-right">
>                                                 <select id="sort_by" class="resort form-control form-control-sm" name="sort_by">
>                                                     [% INCLUDE 'resort_form.inc' %]
>                                                 </select>
>@@ -199,9 +198,9 @@
>                                                         [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
>                                                     </select>
>                                                 [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %]
>-
>-                                                <input type="submit" class="btn btn-sm clearfix" id="sortsubmit" value="Go" />
>-                                                </div>
>+                                            </div> 
>+                                            <div id="sortsubmit" class="sort_by col-auto">
>+                                                <input type="submit" class="btn btn-primary btn-sm clearfix" value="Go" />
>                                             </div> 
>                                         [% END # /UNLESS tag %]
>                                     </div> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index 16e2359156..e28a9a26a4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -313,7 +313,7 @@
>                                             </optgroup>
>                                         </select>
> 
>-                                        <input type="submit" class="btn btn-sm" id="sort-submit" value="Resort list" />
>+                                        <input type="submit" class="btn btn-primary btn-sm" id="sort-submit" value="Resort list" />
>                                     </form> 
> 
>                                 </div> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26519: 110658 | 110900 | 111460