From d005e3ab6f8f0f19c2f1d84d2d6f21780360a891 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 18 Apr 2023 13:16:26 +0000 Subject: [PATCH] Bug 33558: Use template wrapper for breadcrumbs: Serials part 1 This patch updates several serials 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. - Serials -> - Claims - Claims for a vendor - Check expiration - Subscription details -> - Serial collection - Create routing list - Edit routing list - Preview routing list Signed-off-by: Matt Blenkinsop Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 75f30ebd51d77955572dcc0636bdc5eb3ab10177) Signed-off-by: Jacob O'Mara --- .../en/modules/serials/checkexpiration.tt | 24 ++++----- .../prog/en/modules/serials/claims.tt | 34 ++++++------- .../en/modules/serials/routing-preview.tt | 28 ++++------- .../prog/en/modules/serials/routing.tt | 50 +++++++------------ .../en/modules/serials/serials-collection.tt | 29 +++++------ 5 files changed, 65 insertions(+), 100 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt index 2bae139623..7d2f737961 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Branches %] [% USE KohaDates %] [% SET footerjs = 1 %] @@ -12,22 +13,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Check expiration + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index 7d161effd3..d1cecc3d03 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -13,34 +13,28 @@ [% WRAPPER 'header.inc' %] [% INCLUDE 'serials-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/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt index d3cc0a8992..c44d66271f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Preview routing list › Serials › Koha @@ -10,25 +11,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Preview routing list + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index 3e611bcfe4..fe0cbe6cba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE KohaDates %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -10,39 +11,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% UNLESS ( blocking_error ) %] + [% WRAPPER breadcrumb_item %] + [% title | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( op ) %] + Create routing list + [% ELSE %] + Edit routing list + [% END %] + [% END %] + [% END # UNLESS blocking_error %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 19cc576664..a4f955b4c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE AuthorisedValues %] [% USE Branches %] +[% USE HtmlTags %] [% USE KohaDates %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -15,22 +16,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] + Serials + [% END %] + [% WRAPPER breadcrumb_item %] + [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Serial collection information + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5