From 37592e9cbf61dc0c9cc003c864bb0291984d9fb0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 19 Apr 2023 18:17:46 +0000 Subject: [PATCH] Bug 33564: Use template wrapper for breadcrumbs: Serials part 3 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 -> - Manage frequencies - New frequency - Edit frequency - Manage numbering patterns - New numbering pattern - Edit numbering pattern - Search subscriptions -> View subscription details - If necessary, edit the subscription to enable "Manual history" - Under the "Planning" tab of the detail page, click "Edit history" - If necessary, edit the subscription and select a notice under "Patron notification." - Under the "Information" tab of the subscription detail page, click "subscribers" Signed-off-by: Andrew Auld Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9d683d4e32f9c490868fa83a03ce308209e75059) Signed-off-by: Martin Renvoize --- .../en/modules/serials/subscription-detail.tt | 37 +++++--------- .../serials/subscription-frequencies.tt | 22 ++++---- .../modules/serials/subscription-history.tt | 27 +++++----- .../serials/subscription-numberpatterns.tt | 51 +++++++------------ .../prog/en/modules/serials/viewalerts.tt | 28 +++++----- 5 files changed, 65 insertions(+), 100 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 353a9b877b..c5eaafdf56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -19,31 +19,20 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% UNLESS ( blocking_error ) %] + [% WRAPPER breadcrumb_item %] + [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Subscription details + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt index 5cfe13bde1..03eabba09f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Frequencies › Serials › Koha @@ -19,20 +20,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Frequencies + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt index c7cafef83b..5507a38c44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE KohaDates %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -11,22 +12,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% title | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Subscription history + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index 79f22ccc19..1d0a60ce75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -12,43 +12,30 @@ [% 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/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt index e8e8c1f8c5..cf2d4e0f53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -1,4 +1,4 @@ - +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] Alert subscribers for [% bibliotitle | html %] › Serials › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -9,22 +9,18 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Alert subscribers + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.39.5