From 73635659bcc6314fe9212f61971a0b851b0935c0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 3 Apr 2023 16:08:56 +0000 Subject: [PATCH] Bug 33387: Use template wrapper for breadcrumbs: Patrons part 3 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 home page - Patron detail page -> - Change password - Set permissions - Accounting -> - Create manual invoice - Create manual credit Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer --- .../prog/en/modules/members/mancredit.tt | 26 ++++++------- .../prog/en/modules/members/maninvoice.tt | 26 ++++++------- .../prog/en/modules/members/member-flags.tt | 26 ++++++------- .../en/modules/members/member-password.tt | 37 ++++++++----------- .../prog/en/modules/members/member.tt | 28 +++----------- 5 files changed, 53 insertions(+), 90 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index 71479bd2a0..74395fff92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -19,22 +19,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% INCLUDE 'patron-title.inc' %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Manual credit + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 876ca88c22..3eeb822c53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -18,22 +18,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% INCLUDE 'patron-title.inc' %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Manual invoice + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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 f6a1ac1a66..562fa0d293 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 @@ -16,22 +16,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% INCLUDE 'patron-title.inc' %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Set permissions + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index 999d58c680..8680830857 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -16,29 +16,22 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% INCLUDE 'patron-title.inc' %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( newpassword ) %] + Password updated + [% ELSE %] + Change username and/or password + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index 923ecd1074..66b04a6449 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -21,30 +21,12 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.30.2