Bugzilla – Attachment 149329 Details for
Bug 33130
Use template wrapper for breadcrumbs: Authorities
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33130: Use template wrapper for breadcrumbs: Authorities
Bug-33130-Use-template-wrapper-for-breadcrumbs-Aut.patch (text/plain), 7.90 KB, created by
Katrin Fischer
on 2023-04-08 22:23:29 UTC
(
hide
)
Description:
Bug 33130: Use template wrapper for breadcrumbs: Authorities
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-08 22:23:29 UTC
Size:
7.90 KB
patch
obsolete
>From dc957768bfb4540fa4ed0b6ebb08d7e275c726c3 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 1 Mar 2023 20:06:31 +0000 >Subject: [PATCH] Bug 33130: Use template wrapper for breadcrumbs: Authorities > >This patch updates several administration 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. > >- Authorities home page > - Authority search results > - Authority detail > - Authority add/edit > - Authority merge > >Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../modules/authorities/authorities-home.tt | 18 +++----- > .../en/modules/authorities/authorities.tt | 43 ++++++++----------- > .../prog/en/modules/authorities/detail.tt | 33 ++++++-------- > .../prog/en/modules/authorities/merge.tt | 23 ++++------ > .../modules/authorities/searchresultlist.tt | 23 ++++------ > 5 files changed, 52 insertions(+), 88 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >index 0898c00299..9703ee9ecd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Authorities › Koha</title> >@@ -10,18 +11,11 @@ > [% 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"> >- Authorities >- </a> >- </li> >- </ol> >-</nav> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Authorities</span> >+ [% END %] >+ [% END %] > [% END %] > > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 06a3e0549f..71b8eb3ef6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -262,34 +262,25 @@ > > [% INCLUDE 'header.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> >- <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >- </li> >- >- [% IF ( authid ) %] >- <li> >- <a href="#" aria-current="page"> >- Modify authority #[% authid | html %] ([% authtypetext | html %]) >- </a> >- </li> >- >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Adding authority [% authtypetext | html %] >- </a> >- </li> >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> >+ [% END %] > >+ [% IF ( authid ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Modify authority #[% authid | html %] ([% authtypetext | html %]) > [% END %] >- </ol> >- </nav> <!-- /#breadcrumbs --> >- [% END %] >+ >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Adding authority [% authtypetext | html %] >+ [% 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/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index 83a1e0623e..6f75b37798 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -23,27 +23,20 @@ > [% 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/authorities/authorities-home.pl">Authorities</a> >- </li> >- >- <li> >- <a href="#" aria-current="page"> >- [% IF ( unknownauthid ) %] >- Unknown authority record >- [% ELSE %] >- Details for authority #[% authid | html %] ([% authtypetext | html %]) >- [% END %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% IF ( unknownauthid ) %] >+ <span>Unknown authority record</span> >+ [% ELSE %] >+ <span>Details for authority #[% authid | html %] ([% authtypetext | html %])</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/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 1389e676c8..d2fb80baff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -18,22 +18,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/authorities/authorities-home.pl">Authorities</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/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index ab8c19b986..42826d7928 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -24,22 +24,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/authorities/authorities-home.pl">Authorities</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Authority search results >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Authority search results</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 33130
:
147723
|
147816
| 149329