Bugzilla – Attachment 147728 Details for
Bug 33131
Use template wrapper for breadcrumbs: Catalog part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33131: Use template wrapper for breadcrumbs: Catalog part 1
Bug-33131-Use-template-wrapper-for-breadcrumbs-Cat.patch (text/plain), 13.93 KB, created by
Owen Leonard
on 2023-03-03 19:18:40 UTC
(
hide
)
Description:
Bug 33131: Use template wrapper for breadcrumbs: Catalog part 1
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-03-03 19:18:40 UTC
Size:
13.93 KB
patch
obsolete
>From 97cb20d4d7c58163c8969b1c0a8b2b4d6b008eb0 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 3 Mar 2023 19:13:18 +0000 >Subject: [PATCH] Bug 33131: Use template wrapper for breadcrumbs: Catalog part > 1 > >This patch updates several catalog 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. > >- Advanced search >- Bibliographic detail page >- Labeled MARC detail page >- MARC detail page >- ISBD detail page >- Item detail page >- Image detail view (with LocalCoverImages enabled and a custom cover > added) >- Checkout history >- Item search >--- > .../prog/en/modules/catalogue/ISBDdetail.tt | 35 +++++++------------ > .../prog/en/modules/catalogue/MARCdetail.tt | 35 +++++++------------ > .../prog/en/modules/catalogue/advsearch.tt | 19 ++++------ > .../prog/en/modules/catalogue/detail.tt | 35 +++++++------------ > .../prog/en/modules/catalogue/imageviewer.tt | 27 ++++++-------- > .../prog/en/modules/catalogue/issuehistory.tt | 27 ++++++-------- > .../prog/en/modules/catalogue/itemsearch.tt | 23 +++++------- > .../en/modules/catalogue/labeledMARCdetail.tt | 35 ++++++++----------- > .../prog/en/modules/catalogue/moredetail.tt | 31 +++++++--------- > 9 files changed, 99 insertions(+), 168 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index c22c79d679..ecb8f685af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -19,34 +19,25 @@ > [% 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/catalogue/search.pl">Catalog</a> >- </li> >+ [% END %] > > [% IF ( unknownbiblionumber ) %] >- <li> >- <a href="#" aria-current="page"> >- Unknown record >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Unknown record</span> >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- ISBD details >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>ISBD details</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% 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/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 8a0adef125..b0c1d71b38 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -20,34 +20,25 @@ > [% 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/catalogue/search.pl">Catalog</a> >- </li> >+ [% END %] > > [% IF ( unknownbiblionumber ) %] >- <li> >- <a href="#" aria-current="page"> >- Unknown record >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Unknown record</span> >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- MARC details >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>MARC details</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% 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/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index f966029aa6..0a5248461e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -31,19 +31,12 @@ > [% 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> >- <a href="#" aria-current="page"> >- Advanced search >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Advanced search >+ [% 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/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 9ce41038aa..913242bf4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -51,34 +51,25 @@ > [% 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/catalogue/search.pl">Catalog</a> >- </li> >+ [% END %] > > [% IF ( unknownbiblionumber ) %] >- <li> >- <a href="#" aria-current="page"> >- Unknown record >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Unknown record</span> >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- Details >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Details</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% 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/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index c2e11e7154..96b2ffae14 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -29,25 +29,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/catalogue/search.pl">Catalog</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- Images >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Images</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/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 5b0d1c3787..80c04a69e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -17,25 +17,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/catalogue/search.pl">Catalog</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- Checkout history >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Checkout history</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/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index b5e11dbb0c..c49f9227e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -153,22 +153,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/catalogue/search.pl">Catalog</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Item search >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Item search</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/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 8f68bff3fc..94c12c3e60 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -20,27 +20,20 @@ > [% INCLUDE 'cat-search.inc' %] > [% 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> >- <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( unknownbiblionumber ) %] >- Unknown record >- [% ELSE %] >- MARC details for <em>[% bibliotitle | html %]</em> >- [% END %] >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( unknownbiblionumber ) %] >+ Unknown record >+ [% ELSE %] >+ MARC details for <em>[% bibliotitle | html %]</em> >+ [% 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/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 945a1b0e20..0652454394 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -17,25 +17,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> >- <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >- </li> >- <li> >- [% INCLUDE 'biblio-title.inc' link = 1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- Item details >- </a> >- </li> >- </ol> >- </nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ [% INCLUDE 'biblio-title.inc' link = 1 %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Item details</span> >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >-- >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 33131
:
147728
|
148893
|
149328