From 51221a56cb783c016a5fb994a10a8d9c0c4c6a99 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 24 Apr 2023 11:25:21 +0000 Subject: [PATCH] Bug 33599: Use template wrapper for breadcrumbs: Various This patch updates various 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. - ILL requests - New ill request - Manage ill request - Bibliographic record -> - Place hold - Place multiple holds - Tools -> - Comments awaiting moderation - Approved comments - Suggestions - New suggestion - View suggestion - Edit suggestion - Lists - Public Lists - Private lists - New list - Edit list - Transfer list - View list contents Signed-off-by: David Nind --- .../prog/en/modules/ill/ill-requests.tt | 44 ++++------- .../prog/en/modules/reserve/request.tt | 71 +++++++---------- .../prog/en/modules/reviews/reviewswaiting.tt | 37 ++++----- .../prog/en/modules/suggestion/suggestion.tt | 62 ++++++--------- .../prog/en/modules/virtualshelves/shelves.tt | 78 +++++++------------ 5 files changed, 110 insertions(+), 182 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 23c6c33f12..e7b1d8735d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -19,40 +19,28 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index fb095ed66c..9fc3ccad31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -98,55 +98,36 @@ [% END %] [% WRAPPER 'sub-header.inc' %] -[% UNLESS ( multi_hold ) %] - -[% ELSE %] - -[% END # UNLESS multi_hold %] -[% END %] + [% END %] + [% END # UNLESS multi_hold %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt index 8b0b54a19b..c0b44da8b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -11,29 +11,24 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% IF ( status ) %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Approved comments + [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Comments awaiting moderation + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index cfbb831d69..3d0372d537 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -59,54 +59,36 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - - [% END %] + [% END #/ WRAPPER breadcrumbs %] + [% END #/ WRAPPER sub-header.inc %] [% IF ( op == 'show' ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 09ec20c821..7425240b6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -61,83 +61,65 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.30.2