From c81ab2e78d0074c2740f764410c048ba0fe7c9e4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 4 Apr 2023 15:32:08 +0000 Subject: [PATCH] Bug 33409: Use template wrapper for breadcrumbs: Patrons lists This patch updates several patron lists templates so that they use the new WRAPPER for displaying breadcrumbs. Unrelated minor change: I added around a few other strings in add-modify.tt in order to improve translatability. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Tools -> - Patron lists - Main page - Patron list contents view - Add patron list - Edit patron list Signed-off-by: Andrew Auld Signed-off-by: Katrin Fischer --- .../en/modules/patron_lists/add-modify.tt | 44 ++++++++----------- .../prog/en/modules/patron_lists/list.tt | 31 +++++-------- .../prog/en/modules/patron_lists/lists.tt | 23 ++++------ 3 files changed, 38 insertions(+), 60 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt index 265c817fa3..85fabb0c84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt @@ -17,40 +17,32 @@ [% INCLUDE 'cat-search.inc' %] [% END %] -[% WRAPPER 'sub-header.inc' %] - -[% END %] - + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]

[% IF list.patron_list_id %] - Modify patron list + Modify patron list [% ELSE %] - New patron list + New patron list [% END %]

@@ -59,9 +51,9 @@ [% IF list.patron_list_id %] - Modify patron list + Modify patron list [% ELSE %] - Create a new patron list + Create a new patron list [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt index 49ce23cc11..f51e614410 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt @@ -30,28 +30,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Add patrons + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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 229d97c8bd..45fa62f19b 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 @@ -13,22 +13,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Patron lists + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.30.2