From 680c85e1ed3f25b510ea748a2cfb27776926fd82 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Roman Dolny --- .../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 @@ [% IF Koha.Preference( 'RoutingSerials' ) %]
  • - - +
  • [% 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 @@ [% END %]
  • - - - [% IF ( show_mine ) %] - - [% ELSE %] - - [% END %] +
  • - +
    [% 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 @@
    Date due:
    1. - - [% IF ( showall ) %] +
    2. 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 ece937647a..da3d7a66f8 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 @@
      1. - - [% IF filter_archived %] - - [% ELSE %] - - [% END %] +
      -- 2.39.5