Bugzilla – Attachment 147791 Details for
Bug 33148
Use template wrapper for breadcrumbs: Cataloging
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33148: Use template wrapper for breadcrumbs: Cataloging
Bug-33148-Use-template-wrapper-for-breadcrumbs-Cat.patch (text/plain), 15.19 KB, created by
Owen Leonard
on 2023-03-06 14:59:22 UTC
(
hide
)
Description:
Bug 33148: Use template wrapper for breadcrumbs: Cataloging
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-03-06 14:59:22 UTC
Size:
15.19 KB
patch
obsolete
>From ecdec3cc5ea7b17cf52ab3717b3d0ac0de4da940 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 6 Mar 2023 14:50:35 +0000 >Subject: [PATCH] Bug 33148: Use template wrapper for breadcrumbs: Cataloging > >This patch updates several cataloging 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. > >- Cataloging -> Home page > - Cataloging search results > - Select two results and 'Merge selected' > - Basic MARC editor > - Advanced MARC editor > - Item edit page > - Catalog -> Search -> Bibliographic record details > - Edit -> Attach item > - Edit -> Link to host record (must have EasyAnalyticalRecords > preference enabled) >--- > .../prog/en/modules/cataloguing/addbiblio.tt | 53 ++++++++++--------- > .../prog/en/modules/cataloguing/addbooks.tt | 42 ++++++--------- > .../prog/en/modules/cataloguing/additem.tt | 34 ++++++------ > .../en/modules/cataloguing/cataloging-home.tt | 19 +++---- > .../prog/en/modules/cataloguing/editor.tt | 23 +++----- > .../prog/en/modules/cataloguing/linkitem.tt | 26 ++++----- > .../prog/en/modules/cataloguing/merge.tt | 23 +++----- > .../prog/en/modules/cataloguing/moveitem.tt | 28 ++++------ > 8 files changed, 107 insertions(+), 141 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 27f0754625..4b79737401 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% USE HtmlTags %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( biblionumber ) %]Editing [% title | html %] (Record number [% biblionumber | html %])[% ELSE %]Add MARC record[% END %] › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -796,28 +797,28 @@ function PopupMARCFieldDoc(field) { > <div>Loading, please wait...</div> > </div> > >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cataloging-search.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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( biblionumber ) %] >- Editing <em>[% title | html %]</em> (Record number [% biblionumber | html %]) >- [% ELSE %] >- Add MARC record >- [% END %] >- </a> >- </li> >- </ol> >- </nav> >+ [% WRAPPER 'header.inc' %] >+ [% INCLUDE 'cataloging-search.inc' %] >+ [% END %] >+ >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( biblionumber ) %] >+ <span>[% tp('Editing MARC record titled:', "Editing") | html %] [% title | html %] (Record number [% biblionumber | html %])</span> >+ [% ELSE %] >+ [% IF ( circborrowernumber ) %] >+ <span>Add MARC record (fast cataloging)</span> >+ [% ELSE %] >+ <span>Add MARC record</span> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >@@ -827,9 +828,13 @@ function PopupMARCFieldDoc(field) { > > <h1> > [% IF ( biblionumber ) %] >- Editing <em>[% title | html %]</em> (Record number [% biblionumber | html %]) >+ Editing [% title | $HtmlTags tag="em" %] (Record number [% biblionumber | html %]) > [% ELSE %] >- Add MARC record [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %] >+ [% IF (circborrowernumber) %] >+ <span>Add MARC record (fast cataloging)</span> >+ [% ELSE %] >+ <span>Add MARC record</span> >+ [% END %] > [% END %] > </h1> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index ce30a2fc1c..09289a375f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -14,35 +14,27 @@ > [% 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> >- [% IF ( total || breeding_loop ) %] >- <li> >+ [% WRAPPER breadcrumbs %] >+ [% IF ( total || breeding_loop || query ) %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page">Search results</a> >- </li> >+ [% END %] >+ [% END %] >+ [% IF ( total || breeding_loop ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Search results</span> >+ [% END %] > [% ELSIF ( query ) %] >- <li> >- <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page">No results found</a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>No results found</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Cataloging >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Cataloging</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/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 38fdd8995a..127d2bf303 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -5,6 +5,7 @@ > [% USE KohaDates %] > [% USE Price %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Items › [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %]) › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -35,25 +36,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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblio.biblionumber | uri %]">Edit <em>[% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])</em></a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Items >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblio.biblionumber | uri %]"> >+ [% IF ( biblio.author ) %] >+ [% tx('Edit {title} by {author}', { title = biblio.title, author = biblio.author }) | html %] ([% tp('Bibliographic record number', 'Record #') | html %] [% biblio.biblionumber | html %]) >+ [% ELSE %] >+ [% tx('Edit {title}', title = biblio.title) | html %] ([% tp('Bibliographic record number', 'Record #') | html %] [% biblio.biblionumber | html %]) >+ [% END %] > </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% tp('Items attached to a bibliographic record', 'Items') | html %] >+ [% 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/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >index 70c1a82214..2067e1887f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt >@@ -12,18 +12,13 @@ > [% INCLUDE 'cataloging-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="#" aria-current="page">Cataloging</a> >- </li> >- </ol> >- </nav> >- [% END %] >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Cataloging</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/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index 0af94ebde8..6519def77b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -21,22 +21,15 @@ > [% PROCESS 'keyboard_shortcuts.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="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Editor >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Editor</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/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >index aee929ba8c..78927bc3f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >@@ -1,4 +1,5 @@ >- >+[% USE raw %] >+[% USE HtmlTags %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Link to host record › Cataloging › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -9,22 +10,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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Link a host record to <em>[% bibliotitle | html %]</em> >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Link a host record to [% bibliotitle | html %] >+ [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index c19fd7fb63..9007793d57 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -20,22 +20,15 @@ div#result { margin-top: 1em; } > [% 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/cataloguing/cataloging-home.pl">Cataloging</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Merging records >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Merging records</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/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >index d9d01d074e..1882c3dea7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Attach an item to [% INCLUDE 'biblio-title-head.inc' %] › Cataloging › Koha</title> >@@ -9,25 +10,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"> >- Attach an item >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Attach an item</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 33148
:
147791
|
148883
|
149070