Bugzilla – Attachment 149345 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 33001: Use template wrapper for breadcrumbs: Acquisitions part 2
Bug-33001-Use-template-wrapper-for-breadcrumbs-Acq.patch (text/plain), 17.31 KB, created by
Katrin Fischer
on 2023-04-09 11:21:20 UTC
(
hide
)
Description:
Bug 33001: Use template wrapper for breadcrumbs: Acquisitions part 2
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-09 11:21:20 UTC
Size:
17.31 KB
patch
obsolete
>From ba025b14d70f998d8b172e4343d66ce2c10dbb04 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 6 Jan 2023 11:49:32 +0000 >Subject: [PATCH] Bug 33001: Use template wrapper for breadcrumbs: Acquisitions > part 2 > >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 -> > - Late orders, > - moddeliverydate.tt > - modordernotes.tt > -- These two templates aren't linked to from anywhere, but > you can navigate directly to: > http://127.0.0.1:8081/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=X and > http://127.0.0.1:8081/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=1 > > - Order search, order search results > - Invoice search, > - Invoice details, > - Invoice files > - Vendor -> Basket -> Add to basket -> > - From a new (empty) record > - From existing orders (copy) > - From a subscription > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> > >https://bugs.koha-community.org/show_bug.cgi?id=33005 >--- > .../prog/en/modules/acqui/histsearch.tt | 44 +++++++------------ > .../prog/en/modules/acqui/invoice-files.tt | 30 +++++-------- > .../prog/en/modules/acqui/invoice.tt | 29 +++++------- > .../prog/en/modules/acqui/invoices.tt | 22 ++++------ > .../prog/en/modules/acqui/lateorders.tt | 22 ++++------ > .../prog/en/modules/acqui/moddeliverydate.tt | 30 ++++++------- > .../prog/en/modules/acqui/modordernotes.tt | 33 ++++++-------- > .../prog/en/modules/acqui/neworderempty.tt | 40 +++++++---------- > .../modules/acqui/neworderempty_duplicate.tt | 31 +++++-------- > .../en/modules/acqui/newordersubscription.tt | 31 +++++-------- > 10 files changed, 122 insertions(+), 190 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index f9818a1c8b..4865bec71c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -15,34 +15,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> >- >- [% IF ( order_loop ) %] >- <li> >- <a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Search results >- </a> >- </li> >- [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Order search >- </a> >- </li> >- [% END %] >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% IF ( order_loop ) %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Search results >+ [% END %] >+ [% ELSE %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Order search >+ [% 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/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index 4e89f0facf..dfc829b1a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -12,28 +12,22 @@ > [% 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> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">[% invoicenumber | html %]</a> >- </li> >- <li> >- <a href="#" aria-current="page">Files</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Files >+ [% 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/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index ba6ff30f0d..3edab4d332 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -28,23 +28,18 @@ > [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] > > [% 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/acqui/acqui-home.pl">Acquisitions</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> >- </li> >- <li> >- <a href="#" aria-current="page">[% invoicenumber | html %]</a> >- </li> >- </ol> >- </nav> >-[% END %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] >+ <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active=1 %] >+ [% invoicenumber | 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/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 57aa5336d4..160ea96563 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -15,22 +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">Invoices</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Invoices >+ [% 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/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index ad78d32dbf..0700170fb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -15,22 +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">Late orders</a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Late orders >+ [% 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/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >index d7512ccaf6..1c718647cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -8,25 +9,22 @@ > <body id="acq_moddeliverydate" class="acq"> > [% INCLUDE 'header.inc' %] > >-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> >- <ol> >- <li> >- <a href="/cgi-bin/koha/mainpage.pl">Home</a> >- </li> >- <li> >+[% WRAPPER 'sub-header.inc' %] >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> >- </li> >- <li> >- <a href="#" aria-current="page">Change estimated delivery date</a> >- </li> >- </ol> >-</nav> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Change estimated delivery date >+ [% 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/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >index 6398034ed3..98e6742a63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[%- IF (type == "vendor") -%] > Change order vendor note >@@ -11,30 +12,22 @@ > <body id="acq_modordernotes" class="acq"> > [% 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> >+ [% WRAPPER breadcrumbs %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> >- </li> >- <li> >+ [% END %] >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active=1 %] >+ Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note >+ [% 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/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 451d55f1f3..4e35ed156a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -44,37 +44,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> >- <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 ( ordernumber ) %] >- <li> >- <a href="#" aria-current="page"> >- Modify order details (line #[% ordernumber | html %]) >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Modify order details (line #[% ordernumber | html %]) >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- New order >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ New order >+ [% END %] > [% END %] >- </ol> >-</nav> >-[% END %] >+ [% END #/ WRAPPER breadcrumbs %] >+[% END #/ WRAPPER sub-header.inc %] > > [% INCLUDE 'blocking_errors.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >index 123508b660..2a87fe78ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt >@@ -1,5 +1,4 @@ >- >- >+[% USE raw %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Duplicate warning › Basket [% basketno | html %] › Acquisitions › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -10,27 +9,19 @@ > [% 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> >+ [% 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"> >- Duplicate warning >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Duplicate warning >+ [% 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/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 875921d799..86db364bba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -16,28 +16,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 %]">[% booksellername | 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 subscription >- </a> >- </li> >- </ol> >-</nav> >-[% END %] >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Add order from a subscription >+ [% 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 33005
:
146922
|
147323
|
149241
|
149242
|
149340
|
149341
|
149342
|
149343
|
149344
|
149345
|
149346