Attachment 173927 Details for Bug 38346 – Bug 38346: Make sidebar checkboxes consistent

[patch] Bug 38346: Make sidebar checkboxes consistent

Bug-38346-Make-sidebar-checkboxes-consistent.patch (text/plain), 7.57 KB, created by Owen Leonard on 2024-11-04 14:50:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-11-04 14:50:13 UTC

Size: 7.57 KB

patch

obsolete

>From 5cf134d8c1072315d0c739093a7cf4e1d8c296d5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 4 Nov 2024 14:44:46 +0000
>Subject: [PATCH] Bug 38346: Make sidebar checkboxes consistent
>
>This patch makes some changes to markup and CSS in order to make
>checkboxes in sidebars more consistent with each other and better
>styled.
>
>To test apply the patch and rebuild the staff interface CSS. Check the
>sidebar forms on these pages and verify that the checkbox inputs look
>correct. The label should be on the same line as the checkbox.
>
>- Serials -> Search serials -> Results: The "Has routing list" line.
>- Administration -> Funds: The "Show my funds only" checkbox.
>- Circulation -> Overdues: "Show any items currently checked out."
>- Suggestions: "Include archived."
>
>Sponsored-by: Athens County Public Libraries
>---
> .../prog/css/src/staff-global.scss              |  9 ++++++++-
> .../prog/en/includes/serials-advsearch.inc      |  6 ++++--
> .../prog/en/modules/admin/aqbudgets.tt          | 17 +++++++++--------
> .../prog/en/modules/circ/overdue.tt             | 12 +++++++-----
> .../prog/en/modules/suggestion/suggestion.tt    | 14 ++++++++------
> 5 files changed, 36 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 40deeaf44d..b43fe29c30 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -336,6 +336,14 @@ aside {
>                 color: #696969;
>                 display: block;
>                 margin: .5em 0;
>+
>+                input {
>+                    &[type="checkbox"],
>+                    &[type="radio"] {
>+                        display: inline-block;
>+                        margin-left: 0;
>+                    }
>+                }
>             }
> 
>             li {
>@@ -344,7 +352,6 @@ aside {
> 
>                 &.checkbox {
>                     label {
>-                        display: inline;
>                         margin-left: 0;
>                     }
>                 }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
>index e25dabb998..1f1ef451ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc
>@@ -53,8 +53,10 @@
>                 </li>
>                 [% IF Koha.Preference( 'RoutingSerials' ) %]
>                     <li class="local">
>-                        <label for="routinglist">Has routing list:</label>
>-                        <input type="checkbox" id="routinglist" name="routinglist" />
>+                        <label for="routinglist">
>+                            <input type="checkbox" id="routinglist" name="routinglist" />
>+                            Has routing list
>+                        </label>
>                     </li>
>                 [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index 11b61995f7..7b3e16d696 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -521,19 +521,20 @@
>           </li>
>         [% END %]
>         <li class="radio">
>-
>-        <label for="show_mine">Show my funds only:</label>
>-            [% IF ( show_mine ) %]
>-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
>-            [% ELSE %]
>-                <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
>-        [% END %]
>+            <label for="show_mine">
>+                [% IF ( show_mine ) %]
>+                    <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
>+                [% ELSE %]
>+                    <input type="checkbox" id="show_mine"  name="show_mine" value="1" />
>+                [% END %]
>+                Show my funds only
>+            </label>
>         </li>
>         </ol>
>     </fieldset>
>     <fieldset class="action">
>         <input type="hidden" name="op" value="list" />
>-        <input type="submit" class="submit" name="filter" value="Go" />
>+        <input type="submit" class="btn btn-primary" name="filter" value="Go" />
>     </fieldset>
> </form>[% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index b78a0c302c..8a985c11e9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -172,12 +172,14 @@
>     <fieldset><legend>Date due:</legend>
>         <ol>
>             <li class="radio">
>-                <label for="showall">Show any items currently checked out:</label>
>-                [% IF ( showall ) %]
>+                <label for="showall">
>+                    [% IF ( showall ) %]
>                         <input type="checkbox" id="showall" name="showall" value="show" checked="checked" />
>-                [% ELSE %]
>-                    <input type="checkbox" id="showall" name="showall" value="show" />
>-                [% END %]
>+                    [% ELSE %]
>+                        <input type="checkbox" id="showall" name="showall" value="show" />
>+                    [% END %]
>+                    Show any items currently checked out
>+                </label>
>             </li>
> 
>             <li class="date_due_filter">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index a37d78c111..0d6ea75b40 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -1245,12 +1245,14 @@
>                                     <div id="filter_archived_information">
>                                         <ol>
>                                             <li>
>-                                                <label for="archived" style="display: inline;">Include archived:</label>
>-                                                [% IF filter_archived %]
>-                                                    <input type="checkbox" id="archived" value="1" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />
>-                                                [% ELSE %]
>-                                                    <input type="checkbox" id="archived" value="1" name="filter_archived" title="Include archived suggestions in the search" />
>-                                                [% END %]
>+                                                <label for="archived">
>+                                                    [% IF filter_archived %]
>+                                                        <input type="checkbox" id="archived" value="1" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />
>+                                                    [% ELSE %]
>+                                                        <input type="checkbox" id="archived" value="1" name="filter_archived" title="Include archived suggestions in the search" />
>+                                                    [% END %]
>+                                                    Include archived
>+                                                </label>
>                                             </li>
>                                         </ol>
>                                     </div>
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 38346: 173927 | 174083 | 174466