From 09097fe101d613310d6760b9f7c72820e86d073a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 4 Apr 2023 11:51:22 +0000 Subject: [PATCH] Bug 33388: Use template wrapper for breadcrumbs: Patrons part 4 This patch updates several patron 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. - Patrons -> - Patron details - Notices - Accounting - Edit patron - Add patron - Patrons requesting modification (submit patron update via the OPAC) Signed-off-by: Andrew Auld Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit da5715135265b3653d0359bb3bc9ee233ca9c3ff) Signed-off-by: Jacob O'Mara --- .../prog/en/modules/members/memberentrygen.tt | 62 +++++++------------ .../prog/en/modules/members/members-update.tt | 23 +++---- .../prog/en/modules/members/merge-patrons.tt | 21 +++---- .../prog/en/modules/members/moremember.tt | 37 +++++------ .../prog/en/modules/members/notices.tt | 26 ++++---- .../prog/en/modules/members/pay.tt | 26 ++++---- 6 files changed, 78 insertions(+), 117 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 998ac693b5..dd03c7fe0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -15,8 +15,6 @@ [% UNLESS blocking_error %] [% IF ( opadd ) %] Add patron - [% ELSIF ( opduplicate ) %] - Duplicate patron [% ELSE %] Modify patron [% END %] @@ -38,45 +36,33 @@ legend:hover { [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( opadd ) %] + Add patron + [% ELSE %] + Modify patron + [% END %] + [% IF patron_category %] + ([% patron_category.description | html %]) + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt index caf4cf1cc3..cb2ede695e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -92,22 +92,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Update patron records + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt index 16bb9ac1e5..65cf0f3781 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -81,20 +81,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Merge patron records + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 9cadcd5709..8413709f27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -27,31 +27,22 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index a68cabeef5..71cf92dda8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -19,22 +19,20 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Sent notices + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 6c809b1498..9dfd317c8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -19,22 +19,20 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Make a payment + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5