From 33f14126a15e6bc4f1c1b1bda93713d494a07fe3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 Mar 2023 15:33:35 +0000 Subject: [PATCH] Bug 33384: Use template wrapper for breadcrumbs: Labels This patch updates label creator 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. - Cataloging -> - Barcode image generator - Quick spine label creator - Label creator -> - Label creator home - New -> - Label batch - Layout - Label template - Printer profile - Barcode range - Manage -> - Label batches - Edit batch - Layouts - Edit layout - Label templates - Edit template - Printer profiles Signed-off-by: Andrew Auld Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/labels/barcode-print.tt | 23 +++----- .../en/modules/labels/label-edit-batch.tt | 54 +++++++------------ .../en/modules/labels/label-edit-layout.tt | 46 ++++++---------- .../en/modules/labels/label-edit-profile.tt | 46 +++++++--------- .../en/modules/labels/label-edit-range.tt | 34 +++++------- .../en/modules/labels/label-edit-template.tt | 47 +++++++--------- .../prog/en/modules/labels/label-home.tt | 27 ++++------ .../prog/en/modules/labels/label-manage.tt | 33 +++++------- .../prog/en/modules/labels/spinelabel-home.tt | 23 +++----- 9 files changed, 127 insertions(+), 206 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt index 94674bb557..e2e7d0ebb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt @@ -45,22 +45,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Barcode image generator + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 4e7d98d776..70ae8778cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -12,46 +12,28 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt index 05b21f4bf7..6dbf2d8031 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -26,38 +26,26 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt index f19e46869e..9be72df403 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt @@ -10,34 +10,26 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( profile_id ) %] + Edit printer profile [% profile_id | html %] + [% ELSE %] + New printer profile + [% END%] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt index 8ad27f8f21..e15fe31d4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Print barcode range › Label creator › Cataloging › Koha @@ -9,26 +10,19 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] +[% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Cataloging + [% END %] + [% WRAPPER breadcrumb_item %] + Label creator + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Print barcode range + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt index c4e7b6d172..5ee5b03c7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt @@ -10,33 +10,26 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] +[% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Cataloging + [% END %] + [% WRAPPER breadcrumb_item %] + Label creator + [% END %] + [% WRAPPER breadcrumb_item %] + Templates + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( template_id ) %] + Edit label template [% template_id | html %] + [% ELSE %] + New label template + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index a2173b6c5c..57a77ee233 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -10,23 +10,16 @@ [% 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 %] + Label creator + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index 0b2ac46f1d..5243811b61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -24,26 +24,19 @@ [% INCLUDE 'cat-search.inc' %] [% END %] - [% WRAPPER 'sub-header.inc' %] - - [% END %] +[% WRAPPER 'sub-header.inc' %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Cataloging + [% END %] + [% WRAPPER breadcrumb_item %] + Label creator + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% PROCESS translate_label_element element=label_element_title %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt index eeed2bd99d..f77d25f339 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -11,22 +11,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Quick spine label creator + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5