From 394ac77bb678ee844eeabaf26cd616569cb9caa9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 23 May 2024 12:32:01 +0000 Subject: [PATCH] Bug 36945: Fix several missed instance of breadcrumb WRAPPER use This patch corrects some templates which never got the breadcrumb WRAPPER update. Some breadcrumbs and page titles have been updated to be more consistent with page headings. To test, apply the patch and enable the "CatalogConcerns" system preference if necessary. Check the following pages to confirm that the breadcrumbs menu looks correct and that breadcrumbs are consistent with page titles and page headings. - Circulation -> Upload offline circulation file (.koc) - Upload file -> Add to offline circulation queue - View pending offline circulation actions - Cataloging -> Cataloging concerns - Reports -> Cash register stats Sponsored-By: Athens County Public Libraries --- .../prog/en/modules/cataloguing/concerns.tt | 25 +++++-------- .../en/modules/offline_circ/enqueue_koc.tt | 21 ++++------- .../prog/en/modules/offline_circ/list.tt | 27 +++++--------- .../en/modules/offline_circ/process_koc.tt | 37 +++++++------------ .../en/modules/reports/cash_register_stats.tt | 35 +++++++----------- 5 files changed, 55 insertions(+), 90 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt index c5d09a2213..270782a34c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt @@ -18,28 +18,23 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cataloging-search.inc' %] - + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Catalog concerns + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
[% INCLUDE 'messages.inc' %] -

Concerns

+

Catalog concerns

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt index eac6c230ff..15ab7af037 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt @@ -14,20 +14,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Add offline circulations to queue + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index f1df1f6170..2710d0429d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -17,23 +17,16 @@ [% INCLUDE 'circ-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] +[% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Circulation + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Offline circulation + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 272c51081b..3c6cd47f3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -17,34 +17,25 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Offline circulation file upload + [% END %] + [% END # /IF transactions_loaded %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index b1faf8f09a..e2d6fb831e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -27,34 +27,25 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.2