From b48ec8d8ba84543ffb5de5619246be85aed9bd25 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) --- .../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 3e72c521b48..b2bf8247552 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -13,16 +13,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 7cd01e8f00c..0d5e45b90ed 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 75f5cfc6dea..4f4440e4ae4 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.30.2