From 10381d24be3975311ff7ce34c837ada3f963115a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 18 Apr 2023 16:18:24 +0000 Subject: [PATCH] Bug 33559: Use template wrapper for breadcrumbs: Serials part 2 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 -> - Serials home page - New subscription - Serials search results - Subscription details -> Edit subscription - Subscription details -> Serial collection -> Edit serials - Select one or more seach results and click the "Edit selected serials" to test the batch edit page Signed-off-by: Andrew Auld Signed-off-by: Nick Clemens --- .../prog/en/modules/serials/serials-edit.tt | 26 ++++----- .../prog/en/modules/serials/serials-home.tt | 19 +++---- .../prog/en/modules/serials/serials-search.tt | 31 ++++------- .../en/modules/serials/subscription-add.tt | 54 +++++++------------ .../modules/serials/subscription-batchedit.tt | 24 ++++----- 5 files changed, 56 insertions(+), 98 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index fdea3ee1be..b22dce74ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -83,22 +83,18 @@ $(document).ready(function() { [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item %] + [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Serial edition [% IF ( callnumber ) %]([% callnumber | html %])[% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt index 23cbc62e7c..9f5080736b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt @@ -14,19 +14,12 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Serials + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 50a21dc9a5..4e0f736027 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -18,30 +18,21 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %] [% url_params = [] %] [% FOREACH param IN CGI.params.pairs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index e6918de53f..6a79892621 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -24,43 +24,27 @@ fieldset.rows table { clear: none; margin: 0; } [% INCLUDE 'serials-search.inc' %] [% END %] -[% WRAPPER 'sub-header.inc' %] - -[% END %] + [% UNLESS ( blocking_error ) %] + [% IF ( modify ) %] + [% WRAPPER breadcrumb_item %] + [% bibliotitle | html %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Modify subscription + [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + New subscription + [% END %] + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %] [% INCLUDE 'blocking_errors.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index 6b38351a52..1f9050e60f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE AuthorisedValues %] [% USE Branches %] [% USE ItemTypes %] @@ -13,22 +14,15 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Batch edit + [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %]
-- 2.30.2