Bugzilla – Attachment 150859 Details for
Bug 33601
Use template wrapper for breadcrumbs: Tools, part 8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33601: Use template wrapper for breadcrumbs: Tools, part 8
Bug-33601-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 9.52 KB, created by
Katrin Fischer
on 2023-05-09 11:58:47 UTC
(
hide
)
Description:
Bug 33601: Use template wrapper for breadcrumbs: Tools, part 8
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-05-09 11:58:47 UTC
Size:
9.52 KB
patch
obsolete
>From 4aeea41229367b056cafc0e4bebaecb0770d011e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 24 Apr 2023 11:22:32 +0000 >Subject: [PATCH] Bug 33601: Use template wrapper for breadcrumbs: Tools, part > 8 > >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 -> > - Tools home page > - Log viewer > - Search result > - Uploads > - Upload results >- Cataloging -> > - Upload local cover image > - Upload result > - Test uploading an biblio-level image from the bibliographic detail > page > - Test uploading an item-level image from the bibliograhpic detail > page's holdings table > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >--- > .../prog/en/modules/tools/tools-home.tt | 20 ++---- > .../prog/en/modules/tools/upload-images.tt | 65 +++++++------------ > .../prog/en/modules/tools/upload.tt | 52 +++++++-------- > .../prog/en/modules/tools/viewlog.tt | 35 ++++------ > 4 files changed, 67 insertions(+), 105 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 73508b2c64..c2638ace0b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% USE Koha %] > [% USE Branches %] > [% USE Registers %] >@@ -12,19 +13,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"> >- Tools >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Tools</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/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 0faecc1c4b..c66a23a910 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -82,59 +82,44 @@ > [% 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> >+ [% END %] > [% IF uploadimage || biblio || itemnumber || biblionumber %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a> >- </li> >+ [% END %] > [% END %] > > [% IF ( uploadimage ) %] >- <li> >- <a href="#" aria-current="page"> >- Upload results >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload results</span> >+ [% END %] > [% IF ( biblionumber ) %] >- <li> >- <a href="#" aria-current="page"><em>[% INCLUDE 'biblio-title.inc' %]</em></a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <em>[% INCLUDE 'biblio-title.inc' %]</em> >+ [% END %] > [% END %] > [% ELSIF biblio %] >- <li> >- <a href="#" aria-current="page"> >- Upload cover for <em>[% INCLUDE 'biblio-title.inc' %]</em> >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload cover for <em>[% INCLUDE 'biblio-title.inc' %]</em></span> >+ [% END %] > [% ELSIF itemnumber %] >- <li> >- <a href="#" aria-current="page"> >- Upload cover for itemnumber: [% itemnumber | html %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload cover for itemnumber: [% itemnumber | html %]</span> >+ [% END %] > [% ELSIF biblionumber %] >- <li> >- <a href="#" aria-current="page"> >- Upload cover for biblionumber: [% biblionumber | html %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload cover for biblionumber: [% biblionumber | html %]</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Upload local cover image >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Upload local cover image</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/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 8f4952148f..b0a2902bdb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -21,33 +21,6 @@ > [% END %] > [% END %] > >-[% BLOCK breadcrumbs %] >- [% 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/tools/tools-home.pl">Tools</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/tools/upload.pl">Upload</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF mode=='new' || mode =='deleted'%] >- Add new upload or search >- [% ELSE %] >- Results >- [% END %] >- </a> >- </li> >- </ol> >- </nav> >- [% END %] >-[% END %] >- > [% BLOCK form_new %] > <form method="post" action="/cgi-bin/koha/tools/upload.pl" id="uploadfile" enctype="multipart/form-data"> > [% PROCESS plugin_pars %] >@@ -268,9 +241,28 @@ > <main> > [% ELSE %] > <body id="tools_upload" class="tools"> >- [% INCLUDE 'header.inc' %] >- [% INCLUDE 'cat-search.inc' %] >- [% PROCESS breadcrumbs %] >+ [% WRAPPER 'header.inc' %] >+ [% INCLUDE 'cat-search.inc' %] >+ [% END %] >+ [% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/tools/upload.pl">Upload</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="#" aria-current="page"> >+ [% IF mode=='new' || mode =='deleted'%] >+ <span>Add new upload or search</span> >+ [% ELSE %] >+ <span>Results</span> >+ [% END %] >+ </a> >+ [% 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/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 7682adb029..531d6f2d63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -168,33 +168,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 ( do_it ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/tools/viewlog.pl">Logs</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"> >- Logs >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Logs</span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% 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 33601
:
150168
|
150173
| 150859