From 4beb9e291a3e93bc2736cf358c5a380bbaa00ab5 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> 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 <lucas@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> --- .../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 dd45dae2c6..2e7a18be90 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' %] -<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> - <ol> - <li> - <a href="/cgi-bin/koha/mainpage.pl">Home</a> - </li> - <li> + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] <a href="#" aria-current="page">About Koha</a> - </li> - </ol> -</nav> + [% END %] + [% END %] [% END %] <div class="main container-fluid"> 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' %] <title>Error [% errno | html %] › Koha</title> [% INCLUDE 'doc-head-close.inc' %] @@ -10,19 +10,14 @@ [% END %] [% WRAPPER 'sub-header.inc' %] -<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> - <ol> - <li> - <a href="/cgi-bin/koha/mainpage.pl">Home</a> - </li> - <li> + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item %] <a href="#" aria-current="page"> Error [% errno | html %] </a> - </li> - </ol> -</nav> -[% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %] <div class="main container-fluid"> <div class="row"> 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' %] - <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> - <ol> - <li> - <a href="/cgi-bin/koha/mainpage.pl" aria-current="page">Home</a> - </li> - </ol> - </nav> + [% WRAPPER breadcrumbs %] + [% END #/ WRAPPER breadcrumbs %] [% END %] <div id="container-main" class="container-fluid"> -- 2.30.2