From c7c07045e295e97ef94ff6263c3e0609713b0d28 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 29 Oct 2024 11:00:06 +0000 Subject: [PATCH] Bug 38285: Replace instances of obsolete Bootstrap class "pull-right" This patch fixes instances where the pre-Bootstrap-5 class "pull-right" was missed during the upgrade. Most cases were on dropdown menus, and in all of these cases the class can be removed because Bootstrap 5 menus have better responsive behavior. Other changes: Added "dropdown-item" classes to some menu items which lacked it; Added some custom style for the "Filter" form in the patron permissions toolbar. To test, apply the patch and rebuild the staff interface CSS. Test that the following menus look correct and work correctly: - Catalog -> Bibliographic details page -> Holdings table: The "Edit" secondary menu shown for each item (requires that the LocalCoverImages system preference be enabled. - Administration -> Z39.50 servers: The "Actions" menu for each server in the list of servers. - Circulation -> Article requests: The "Actions" menu for each title and under each tab (New, Pending, and Processing). - Tools -> Patron lists: "Actions" menu. - Administration -> Plugins: "Actions" menu (requires that you have at least one plugin installed). - Reports -> Saved SQL reports: The secondary menu on each saved report's "Run" button . - Cataloging -> Rotating collections: "Actions" menu. - Serials -> Subscription search results: In the "Open" tab, the secondary menu on the "Serial receive" button on each subscription. In the "Closed" tab, the "Actions" menu. - Acquistions -> Suggestions: The secondary menu on each title's "Edit" button. - Tools -> HTML customizations: The secondary menu on the "New entry" button; The secondary menu on each entry's "Edit" button; Edit entry -> The secondary menu on the "Save" button. - Cataloging -> Stock rotation: The "Manage" menu on each rota. A non-menu change: - Patrons -> Patron details -> More -> Set permissions: CSS has been added to correctly align the "Filter" menu. Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind --- koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss | 4 ++++ .../html_helpers/tables/items/catalogue_detail.inc | 4 ++-- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 4 ++-- .../prog/en/modules/members/member-flags.tt | 4 ++-- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/patron_lists/patron-lists-tab.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 10 +++++----- .../rotating_collections/rotatingCollections.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 8 ++++---- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../prog/en/modules/tools/additional-contents.tt | 6 +++--- .../prog/en/modules/tools/stockrotation.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- 18 files changed, 33 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss index 83d0836685..3232832aea 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss @@ -97,4 +97,8 @@ padding: 0 .5em; } } + + .toolbar-filter-form { + padding: $input-btn-padding-y $input-btn-padding-x; + } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc index 9fa81b87f7..8113c4f753 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc @@ -792,9 +792,9 @@ let nodes = ''; if ( can_edit_items_from.includes(row.home_library_id) || !can_edit_items_from.length ){ [% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %] - nodes += '
'; + nodes += '
'; nodes += ' %s'.format(row.biblio_id, row.item_id, _("Edit")); - nodes += '
    '; + nodes += '
      '; nodes += '
    • %s
      • '.format(row.item_id, _("Upload image")); nodes += '
    '; nodes += '
'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 3ba997b0cf..3f087a1d48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -242,7 +242,7 @@ Actions -
- + Display supplier metadata - + ILL request log diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt index 545db193af..0a68e78a22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt @@ -69,8 +69,8 @@ Paste permissions -
- Filter: +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index d876423de6..04b801a840 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -80,7 +80,7 @@ Actions -