Bugzilla – Attachment 149342 Details for
Bug 33005
Use template wrapper for breadcrumbs: Acquisitions part 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3
Bug-33005-Use-template-wrapper-for-breadcrumbs-Acq.patch (text/plain), 15.99 KB, created by
Katrin Fischer
on 2023-04-09 11:19:58 UTC
(
hide
)
Description:
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-09 11:19:58 UTC
Size:
15.99 KB
patch
obsolete
>From f4e40c8aee5b73b701e83337278ad0ee74acd491 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 6 Jan 2023 11:50:00 +0000 >Subject: [PATCH] Bug 33005: Use template wrapper for breadcrumbs: Acquisitions > part 3 > >This patch updates several acquisitions-related 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. > >- Acquisitions -> > -> All available funds table > -> Ordered > -> Spent > -> Vendor > -> Vendor details > -> Uncertain prices > -> Receive shipments (must have at least one open basket) > -> If necessary, receive a new shipment. Or click an > invoice number to reach the "receive orders" page. > -> Click "Receive" in the table listing baskets. > -> Basket -> Add to basket > -> From a suggestion > -> From an external source > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >--- > .../en/modules/acqui/newordersuggestion.tt | 31 +++++-------- > .../prog/en/modules/acqui/ordered.tt | 24 ++++------ > .../prog/en/modules/acqui/orderreceive.tt | 31 +++++-------- > .../prog/en/modules/acqui/parcel.tt | 28 +++++------- > .../prog/en/modules/acqui/parcels.tt | 27 +++++------ > .../prog/en/modules/acqui/spent.tt | 24 ++++------ > .../prog/en/modules/acqui/supplier.tt | 45 +++++++------------ > .../prog/en/modules/acqui/uncertainprice.tt | 33 +++++--------- > .../prog/en/modules/acqui/z3950_search.tt | 45 ++++++++----------- > 9 files changed, 108 insertions(+), 180 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 3b1cc6e5f9..6dfaadc510 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -15,28 +15,21 @@ > [% 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> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Add order from a suggestion >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Add order from a suggestion >+ [% 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/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index a324b42db7..ade84344d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -15,24 +15,16 @@ > [% INCLUDE 'acquisitions-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> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Ordered - [% fund_code | html %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Ordered - [% fund_code | 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/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 5315d99ead..80136acb7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -18,27 +18,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/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.basket.booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Receive items from : [% name | html %] [% IF ( invoice ) %] >- [[% invoice | html %]] >- [% END %] (order #[% order.ordernumber | html %]) >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Receive items from : [% name | html %] [% IF ( invoice ) %] >+ [[% invoice | html %]] >+ [% END %] (order #[% order.ordernumber | 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/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index ebda2f0014..268c309a04 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -23,33 +23,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> >- <li> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >- </li> >+ [% END %] > [% IF invoiceclosedate %] >- <li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] > Receipt summary for <em>[% name | html %]</em> > [% IF ( invoice ) %] > <em>[ [% invoice | html %] ]</em> > [% END %] >- </li> >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] > Receive orders from [% name | html %] >- </li> >+ [% 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/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 06271286d6..f0a6e0356b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -13,25 +13,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/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Receive shipment from vendor [% name | html %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Receive shipment from vendor [% name | 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/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 3e9b043603..9c64849bc6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -15,24 +15,16 @@ > [% INCLUDE 'acquisitions-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> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Spent - [% fund_code | html %] >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Spent - [% fund_code | 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/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 9dd49954e9..6b98eb307b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -100,41 +100,30 @@ > [% 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 ( enter ) %] > [% IF ( booksellerid ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Update: [% name | html %] >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Update: [% name | html %] >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Add vendor >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Add vendor >+ [% END %] > [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- [% name | html %] >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ [% name | html %] >+ [% END %] >+ [% END # /IF (enter) %] >+ [% 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/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 64d7076fce..fc8ce39773 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -14,33 +14,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/acqui/acqui-home.pl">Acquisitions</a> >- </li> >+ [% END %] > [% IF ( booksellername ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] > Uncertain prices for vendor [% booksellername | html %] >- </a> >- </li> >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Uncertain prices >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Uncertain prices >+ [% 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/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index 774e452fdd..94e068518e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -45,39 +45,30 @@ tr.selected td { > [% 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> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >- </li> >+ [% END %] > [% IF ( opsearch ) %] >- <li> >- <a href="#" aria-current="page"> >- Order from external source >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Order from external source >+ [% END %] > [% ELSE %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order from external source</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Search results >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Search results >+ [% END %] >+ [% END # /IF opsearch %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> > [% IF ( opsearch ) %] >-- >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 33005
:
146922
|
147323
|
149241
|
149242
|
149340
|
149341
| 149342 |
149343
|
149344
|
149345
|
149346