From 603f3f8263429a14645a666e0a34b9c5a45160e6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 5 Jan 2023 17:16:30 +0000 Subject: [PATCH] Bug 32973: Use template wrapper for breadcrumbs: about, main, and error page This patch updates the staff interface home page, the about page, and the error page template so that they use the new template WRAPPER for breadcrumbs. To test, apply the patch and view each page to confirm that the breadcrumbs are correct: - Staff interface home page - About page - Error page (the easiest example is a 404 error) Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1a200cc25e8ed977425b6045c2e85231e0fca781) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/en/modules/about.tt | 13 ++++--------- .../prog/en/modules/errors/errorpage.tt | 17 ++++++----------- .../prog/en/modules/intranet-main.tt | 9 ++------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index b5a66270a4..0c306bf5df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -12,16 +12,11 @@ [% PROCESS 'about-team.inc' %] [% WRAPPER 'sub-header.inc' %] - + [% END %] + [% END %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt index 7cd01e8f00..0d5e45b90e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt @@ -1,4 +1,4 @@ - +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] Error [% errno | html %] › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -10,19 +10,14 @@ [% 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/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 75f5cfc6de..4f4440e4ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -16,13 +16,8 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - + [% WRAPPER breadcrumbs %] + [% END #/ WRAPPER breadcrumbs %] [% END %]
-- 2.39.2