From ab467d7c32ef50dc18664f6b1f1bcb76f9d4d4e9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 30 Mar 2023 18:34:08 +0000 Subject: [PATCH] Bug 33372: Use template wrapper for breadcrumbs: Circulation part 2 This patch updates several circulation templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Circulation - Check out - Check out to patron - Curbside pickups - Built-in offline circulation - Pending on-site checkouts - Overdues - Holds to pull - Renew Signed-off-by: Philip Orr Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/circ/circulation.tt | 36 +++++++------------ .../prog/en/modules/circ/curbside_pickups.tt | 23 +++++------- .../prog/en/modules/circ/offline.tt | 16 +++------ .../prog/en/modules/circ/on-site_checkouts.tt | 23 +++++------- .../prog/en/modules/circ/overdue.tt | 23 +++++------- .../prog/en/modules/circ/pendingreserves.tt | 24 +++++-------- .../prog/en/modules/circ/renew.tt | 23 +++++------- 7 files changed, 59 insertions(+), 109 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index ffb0a930d8..881b75c54d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -30,34 +30,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index cd79451dc8..87ba7e7d8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -42,21 +42,16 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - - - + [% END %] + [% WRAPPER breadcrumb_item bc_active = 1 %] + Curbside pickups + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %] [% BLOCK waiting_holds %] [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index 55c98ca511..5016d005c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -23,19 +23,13 @@
Downloading records, please wait...
- [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 1124ce92e8..06620173cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -16,22 +16,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Pending on-site checkouts + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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 27d7dfb269..2ce96dcef0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -36,22 +36,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Overdues as of [% todaysdate | $KohaDates %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 5d44bf09e7..4f265aaa7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -17,24 +17,16 @@ [% INCLUDE 'circ-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Holds to pull + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index efcebc45f3..a6f121eb73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -16,22 +16,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Renew + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5