From c20ac373c559c7e06352f4f680c8b41c3ad512c8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 20 Apr 2023 13:15:29 +0000 Subject: [PATCH] Bug 33571: Use template wrapper for breadcrumbs: Tools, part 2 This patch updates several templates in the tools directory 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. - Tools -> - Batch patron deletion and anonymization - Confirmation - Results - Cataloging -> - Batch item modification - Batch item deletion - Batch record modification - Results Signed-off-by: Barbara Johnson Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 750279f47963a06d616135268536d0d223803468) Signed-off-by: Jacob O'Mara --- .../prog/en/modules/tools/batchMod-del.tt | 21 ++++----- .../prog/en/modules/tools/batchMod-edit.tt | 29 ++++++------- .../prog/en/modules/tools/batchMod.tt | 31 +++++-------- .../tools/batch_record_modification.tt | 35 +++++++-------- .../prog/en/modules/tools/cleanborrowers.tt | 43 +++++++------------ 5 files changed, 62 insertions(+), 97 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index 48fe33da09..79908a3a0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -18,20 +18,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Batch item deletion + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 0b5299a7e9..392e8eaae4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -14,24 +14,19 @@ [% WRAPPER 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] -[% END %] + [% INCLUDE 'cat-search.inc' %] + [% END %] -[% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Cataloging + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Batch item modification + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt index 3bca0ad225..df5a93df6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt @@ -11,31 +11,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/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index ae80e0946b..1f31be64ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -10,33 +10,28 @@ [% WRAPPER 'header.inc' %] - [% INCLUDE 'cat-search.inc' %] -[% END %] + [% INCLUDE 'cat-search.inc' %] + [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt index f90a017e64..3f7607347e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt @@ -21,45 +21,34 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.2