From f3c38ed240b706595b8ac5bbd834668dc3f6e080 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 28 Jun 2024 17:24:41 +0000 Subject: [PATCH] Bug 37222: Standardize markup for sidebar menus This patch updates sidebar menu markup so that it's consistent, with a common class (".sidebar_menu") and a unique ID. The style is tied to the class rather than the ID, simplifying the CSS. Note: This patch contains indentation changes so ignore whitespace when viewing the diff. The updated patch contains corrections to JavaScript which needed selectors to be changed to match the new markup. To test, apply the patch and rebuild the staff interface CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client) Check pages which contain each modified menu: - Circulation -> Check out to a patron - Catalog -> View a bibliographic record - Administration -> View system preferences - Acquisitions -> Acquisitions home - Cataloging -> Stock rotation -> Manage stages and manage items for a rotation - Cataloging -> Stage MARC records for import - Reports -> Acquisitions statistics - Reports -> View dictionary - Point of sale - E-resource management - Preservation - Serials - Tools -> Patron lists Sponsored-by: Athens County Public Libraries Signed-off-by: Lucas Gass Signed-off-by: David Nind --- koha-tmpl/intranet-tmpl/prog/css/print.css | 4 +- .../prog/css/src/staff-global.scss | 18 +- .../prog/en/includes/acquisitions-menu.inc | 111 +++--- .../prog/en/includes/admin-menu.inc | 361 +++++++++--------- .../prog/en/includes/biblio-view-menu.inc | 3 +- .../prog/en/includes/cat-menu.inc | 243 ++++++------ .../prog/en/includes/circ-menu.inc | 6 +- .../prog/en/includes/circ-nav.inc | 242 ++++++------ .../prog/en/includes/guided-reports-view.inc | 41 +- .../prog/en/includes/pos-menu.inc | 47 ++- .../prog/en/includes/prefs-menu.inc | 3 +- .../prog/en/includes/preservation-menu.inc | 17 +- .../prog/en/includes/reports-menu.inc | 94 +++-- .../prog/en/includes/serials-menu.inc | 77 ++-- .../prog/en/includes/tools-menu.inc | 185 +++++---- .../prog/en/includes/vendor-menu.inc | 3 +- .../en/modules/labels/label-edit-batch.tt | 2 +- .../en/modules/labels/label-edit-layout.tt | 2 +- .../en/modules/labels/label-edit-profile.tt | 2 +- .../en/modules/labels/label-edit-range.tt | 2 +- .../en/modules/labels/label-edit-template.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/patroncards/edit-batch.tt | 1 + .../en/modules/patroncards/edit-layout.tt | 1 + .../en/modules/patroncards/edit-profile.tt | 1 + .../en/modules/patroncards/image-manage.tt | 1 + .../prog/en/modules/patroncards/manage.tt | 1 + .../prog/en/modules/serials/serials-edit.tt | 2 +- .../prog/en/modules/tags/list.tt | 4 +- .../prog/en/modules/tags/review.tt | 1 + .../prog/en/modules/tools/stockrotation.tt | 3 +- .../prog/js/acquisitions-menu.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 10 +- .../intranet-tmpl/prog/js/staff-global.js | 10 +- koha-tmpl/intranet-tmpl/prog/js/tools-menu.js | 28 +- .../prog/js/vue/components/ERM/Main.vue | 6 +- .../prog/js/vue/components/LeftMenu.vue | 29 +- .../js/vue/components/Preservation/Main.vue | 6 +- members/accountline-details.pl | 1 + members/paycollect.pl | 1 + t/cypress/integration/ERM/Agreements_spec.ts | 2 +- .../integration/ERM/DataProviders_spec.ts | 2 +- t/cypress/integration/ERM/Dialog_spec.ts | 8 +- t/cypress/integration/ERM/Licenses_spec.ts | 2 +- t/cypress/integration/ERM/Packages_spec.ts | 2 +- t/cypress/integration/ERM/Titles_spec.ts | 2 +- .../integration/Preservation/Settings.ts | 2 +- t/cypress/integration/Preservation/Trains.ts | 2 +- .../integration/Preservation/WaitingList.ts | 4 +- t/cypress/support/e2e.js | 2 +- 50 files changed, 795 insertions(+), 808 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css index 78ba3d57269..dae73e14213 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -317,7 +317,7 @@ td.debit { #menu, #limitselect, #batchModify, -#navmenu, +.sidebar_menu, .gradient, .noprint, form#sortbyform, @@ -379,4 +379,4 @@ p#upload_image { #catalog_detail .col-sm-push-2 { left: 0; -} +} \ No newline at end of file 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 878634a08a4..30aef6b29ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -441,9 +441,7 @@ aside { } } -#menu, -#navmenulist, -#serialmenu { +.sidebar_menu { background-color: #E6E6E6; display: block; padding: 1em 0 1em 0; @@ -461,7 +459,8 @@ aside { padding-left: 0; ul { - font-size: 75%; + background-color: #F3F4F4; + font-size: 85%; } li { @@ -498,15 +497,6 @@ aside { } } -#admin_preferences #menu { - ul { - ul { - background-color: #F3F4F4; - font-size: 85%; - } - } -} - div { &.mainmenu { display: inline; @@ -4895,4 +4885,4 @@ div .suggestion_note { display: block; } } -} +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 819be190c7b..39684340df0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -1,62 +1,61 @@ [% USE Koha %] -