Bugzilla – Attachment 151316 Details for
Bug 33599
Use template wrapper for breadcrumbs: Various
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33599: Use template wrapper for breadcrumbs: Various
Bug-33599-Use-template-wrapper-for-breadcrumbs-Var.patch (text/plain), 15.23 KB, created by
Tomás Cohen Arazi (tcohen)
on 2023-05-16 18:00:02 UTC
(
hide
)
Description:
Bug 33599: Use template wrapper for breadcrumbs: Various
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2023-05-16 18:00:02 UTC
Size:
15.23 KB
patch
obsolete
>From 54320c38f39639e67c2dd0c94a3aab0c3df0420d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 24 Apr 2023 11:25:21 +0000 >Subject: [PATCH] Bug 33599: Use template wrapper for breadcrumbs: Various > >This patch updates various 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. > >- ILL requests > - New ill request > - Manage ill request >- Bibliographic record -> > - Place hold > - Place multiple holds >- Tools -> > - Comments awaiting moderation > - Approved comments >- Suggestions > - New suggestion > - View suggestion > - Edit suggestion >- Lists > - Public Lists > - Private lists > - New list > - Edit list > - Transfer list > - View list contents > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../prog/en/modules/ill/ill-requests.tt | 44 ++++------- > .../prog/en/modules/reserve/request.tt | 71 +++++++---------- > .../prog/en/modules/reviews/reviewswaiting.tt | 37 ++++----- > .../prog/en/modules/suggestion/suggestion.tt | 62 ++++++--------- > .../prog/en/modules/virtualshelves/shelves.tt | 78 +++++++------------ > 5 files changed, 110 insertions(+), 182 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index d26e6277309..4064f35d9d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -19,40 +19,28 @@ > [% 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> >- >+ [% WRAPPER breadcrumbs %] > [% IF query_type == 'create' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- New request >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>New request</span> >+ [% END %] > [% ELSIF query_type == 'illview' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Manage request [% request.id_prefix _ request.illrequest_id | html %] >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Manage request [% request.id_prefix _ request.illrequest_id | html %]</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- ILL requests >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>ILL requests</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/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index ea02bf293fe..87f43d90c1d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -98,55 +98,36 @@ > [% END %] > > [% WRAPPER 'sub-header.inc' %] >-[% UNLESS ( multi_hold ) %] >- <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> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >+ [% END %] >+ [% UNLESS ( multi_hold ) %] >+ [% WRAPPER breadcrumb_item %] > [% INCLUDE 'biblio-title.inc' link =1 %] >- </li> >- <li> >- <a href="#" aria-current="page"> >- Place a hold >- </a> >- </li> >- </ol> >- </nav> >-[% ELSE %] >- <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> >- [% IF ( patron ) %] >- <a href="#" aria-current="page"> >- Place holds >- </a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Place a hold</span> >+ [% END %] >+ [% ELSE %] >+ [% IF ( patron ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Place holds</span> >+ [% END %] >+ [% ELSE %] >+ [% IF clubcount %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Search patrons or clubs</span> >+ [% END %] > [% ELSE %] >- [% IF clubcount %] >- <a href="#" aria-current="page"> >- Search patrons or clubs >- </a> >- [% ELSE %] >- <a href="#" aria-current="page"> >- Search patrons >- </a> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Search patrons</span> > [% END %] > [% END %] >- </li> >- </ol> >- </nav> >-[% END # UNLESS multi_hold %] >-[% END %] >+ [% END %] >+ [% END # UNLESS multi_hold %] >+ [% 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/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index 8b0b54a19b5..c0b44da8b4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -11,29 +11,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> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- [% IF ( status ) %] >- <span>Approved comments</span> >- [% ELSE %] >- <span>Comments awaiting moderation</span> >- [% END %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% IF ( status ) %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Approved comments</span> >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Comments awaiting moderation</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/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index cfbb831d694..3d0372d5375 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -59,54 +59,36 @@ > [% 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/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- >+ [% END %] >+ [% IF ( op == 'save' || op == 'show' ) %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> >+ [% END %] >+ [% END %] > [% IF op == 'save' %] > [% IF ( suggestionid ) %] >- <li> >- <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Edit suggestion #[% suggestionid | html %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit suggestion #[% suggestionid | html %]</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Add suggestion >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Add suggestion</span> >+ [% END %] > [% END %] > [% ELSIF ( op == 'show' ) %] >- <li> >- <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Show suggestion #[% suggestionid | html %] >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Show suggestion #[% suggestionid | html %]</span> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Suggestions management >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Suggestions management</span> >+ [% END %] > [% END %] >- </ol> >- </nav> <!-- /.breadcrumbs --> >- [% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+ [% END #/ WRAPPER sub-header.inc %] > > [% IF ( op == 'show' ) %] > <div class="main container-fluid"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index adef582af43..99eb6127c80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -68,83 +68,65 @@ > [% 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> >- >+ [% WRAPPER breadcrumbs %] > [% IF op != 'list' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a> >- </li> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Lists >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Lists</span> >+ [% END %] > [% END %] > > [% IF shelf AND shelf.is_private %] > [% IF op == 'view' OR op == 'edit_form' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&public=0">Your lists</a> >- </li> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Your lists >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Your lists</span> >+ [% END %] > [% END %] > > [% ELSIF shelf AND shelf.is_public %] > [% IF op == 'view' %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&public=1">Public lists</a> >- </li> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Public lists >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Public lists</span> >+ [% END %] > [% END %] > [% END %] > > [% IF op == 'view' %] >- <li> >- <a href="#" aria-current="page"> >- Contents of <em>[% shelf.shelfname | html %]</em> >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Contents of <em>[% shelf.shelfname | html %]</em></span> >+ [% END %] > [% END %] > > [% IF op == 'add_form' %] >- <li> >- <a href="#" aria-current="page"> >- Create new list >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Create new list</span> >+ [% END %] > [% END %] > > [% IF op == 'edit_form' %] >- <li> >- <a href="#" aria-current="page"> >- Edit list <em>[% shelf.shelfname | html %]</em> >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Edit list <em>[% shelf.shelfname | html %]</em></span> >+ [% END %] > [% END %] > > [% IF op == 'transfer' %] >- <li> >- <a href="#" aria-current="page">Transfer list <em>[% shelf.shelfname | html %]</em></a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Transfer list <em>[% shelf.shelfname | html %]</em></span> >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > <div class="row"> >-- >2.40.1
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 33599
:
150170
|
150186
|
150192
| 151316