Bugzilla – Attachment 150153 Details for
Bug 33598
Use template wrapper for breadcrumbs: Tools, part 5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33598: Use template wrapper for breadcrumbs: Tools, part 5
Bug-33598-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 8.12 KB, created by
Owen Leonard
on 2023-04-24 11:54:16 UTC
(
hide
)
Description:
Bug 33598: Use template wrapper for breadcrumbs: Tools, part 5
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-04-24 11:54:16 UTC
Size:
8.12 KB
patch
obsolete
>From 5bf1a4e872a35794da4873373bd56d4e57413ad5 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 24 Apr 2023 11:21:42 +0000 >Subject: [PATCH] Bug 33598: Use template wrapper for breadcrumbs: Tools, part > 5 > >This patch updates several templates in the tools directory 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. > >- Tools -> > - Pages -> > - View a page in the staff interface > - Upload patron images > - Upload results > - Quote editor > - Quotes upload > - OPAC problem reports (must have OPACReportProblem enabled) >--- > .../prog/en/modules/tools/page.tt | 30 ++++++++------- > .../prog/en/modules/tools/picture-upload.tt | 37 +++++++------------ > .../prog/en/modules/tools/problem-reports.tt | 23 ++++-------- > .../prog/en/modules/tools/quotes-upload.tt | 27 +++++--------- > .../prog/en/modules/tools/quotes.tt | 26 +++++-------- > 5 files changed, 57 insertions(+), 86 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt >index 93d5d7d2eb..634ce415a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt >@@ -7,22 +7,24 @@ > </head> > > <body id="tools_page_[% page.idnew | html %]" class="tools"> >- [% INCLUDE 'header.inc' %] >+[% WRAPPER 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >+[% END %] > >- <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >- </li> >- <li> >- <a href="#" aria-current="page">[% IF page %][% page.title | html %][% ELSE %]Page error[% END %]</a> >- </li> >- </ol> >- </nav> >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF page %] >+ [% page.title | html %] >+ [% ELSE %] >+ <span>Page error</span> >+ [% 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/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 8533d932ee..91d7264f02 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -13,33 +13,24 @@ > [% 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="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >- </li> >+ [% END %] > [% IF ( TOTAL ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Results >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Results</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Upload patron images >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload patron images</span> >+ [% END %] >+ [% END # /IF TOTAL %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > [% INCLUDE 'blocking_errors.inc' %] > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >index 25577c63df..10947347ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >@@ -15,22 +15,15 @@ > [% 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="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- OPAC problem reports >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>OPAC problem reports</span> >+ [% 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/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index 8a49b0acc9..6beffac461 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -14,25 +14,18 @@ > [% 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="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Quote uploader >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Quote uploader</span> >+ [% 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/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index b96a596ecd..160ed40ef7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,6 +1,5 @@ > [% USE raw %] > [% USE Asset %] >-[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Quote editor › Tools › Koha</title> >@@ -14,22 +13,15 @@ > [% 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="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Quote editor >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Quote editor</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >@@ -105,7 +97,7 @@ > [% END %] > > [% IF op == 'list' %] >- <h1>[% tp('citations', 'Quotes') | html %]</h1> >+ <h1>Quotes</h1> > [% IF quotes_count > 0 %] > <div class="page-section"> > <table id="quotes"> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33598
:
150153
|
150157
|
150428