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 Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
51ceac07df
commit
4535efa4aa
10 changed files with 126 additions and 194 deletions
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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>
|
||||
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
|
||||
</li>
|
||||
|
||||
[% IF ( ordernumber ) %]
|
||||
<li>
|
||||
<a href="#" aria-current="page">
|
||||
Modify order details (line #[% ordernumber | html %])
|
||||
</a>
|
||||
</li>
|
||||
[% ELSE %]
|
||||
<li>
|
||||
<a href="#" aria-current="page">
|
||||
New order
|
||||
</a>
|
||||
</li>
|
||||
[% END %]
|
||||
</ol>
|
||||
</nav>
|
||||
[% END %]
|
||||
[% WRAPPER breadcrumb_item %]
|
||||
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
|
||||
[% END %]
|
||||
[% WRAPPER breadcrumb_item %]
|
||||
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
|
||||
[% END %]
|
||||
[% IF ( ordernumber ) %]
|
||||
[% WRAPPER breadcrumb_item bc_active= 1 %]
|
||||
Modify order details (line #[% ordernumber | html %])
|
||||
[% END %]
|
||||
[% ELSE %]
|
||||
[% WRAPPER breadcrumb_item bc_active= 1 %]
|
||||
New order
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END #/ WRAPPER breadcrumbs %]
|
||||
[% END #/ WRAPPER sub-header.inc %]
|
||||
|
||||
[% INCLUDE 'blocking_errors.inc' %]
|
||||
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in a new issue