Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 33001: Use template wrapper for breadcrumbs: Acquisitions part 2

Browse source 
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:
Owen Leonard 2023-01-06 11:49:32 +00:00 committed by Tomas Cohen Arazi
parent 51ceac07df
commit 4535efa4aa
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
10 changed files with 126 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
View file

@ -15,34 +15,24 @@
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <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 %] [% END %]
</ol> [% IF ( order_loop ) %]
</nav> [% WRAPPER breadcrumb_item %]
[% END %] <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="main container-fluid">
<div class="row"> <div class="row">

30
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
View file

@ -12,28 +12,22 @@
[% INCLUDE 'acquisitions-search.inc' %] [% INCLUDE 'acquisitions-search.inc' %]
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">[% invoicenumber | html %]</a> <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">[% invoicenumber | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">Files</a> Files
</li> [% END %]
</ol> [% END #/ WRAPPER breadcrumbs %]
</nav> [% END #/ WRAPPER sub-header.inc %]
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

25
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
View file

@ -28,23 +28,18 @@
[% SET readonly = NOT CAN_user_acquisition_edit_invoices %] [% SET readonly = NOT CAN_user_acquisition_edit_invoices %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active=1 %]
<a href="#" aria-current="page">[% invoicenumber | html %]</a> [% invoicenumber | html %]
</li> [% END %]
</ol> [% END #/ WRAPPER breadcrumbs %]
</nav> [% END #/ WRAPPER sub-header.inc %]
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
View file

@ -15,22 +15,16 @@
[% INCLUDE 'acquisitions-search.inc' %] [% INCLUDE 'acquisitions-search.inc' %]
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">Invoices</a> Invoices
</li> [% END %]
</ol> [% END #/ WRAPPER breadcrumbs %]
</nav> [% END #/ WRAPPER sub-header.inc %]
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
View file

@ -15,22 +15,16 @@
[% INCLUDE 'acquisitions-search.inc' %] [% INCLUDE 'acquisitions-search.inc' %]
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">Late orders</a> Late orders
</li> [% END %]
</ol> [% END #/ WRAPPER breadcrumbs %]
</nav> [% END #/ WRAPPER sub-header.inc %]
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

30
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
View file

@ -1,3 +1,4 @@
[% USE raw %]
[% USE KohaDates %] [% USE KohaDates %]
[% SET footerjs = 1 %] [% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'doc-head-open.inc' %]
@ -8,25 +9,22 @@
<body id="acq_moddeliverydate" class="acq"> <body id="acq_moddeliverydate" class="acq">
[% INCLUDE 'header.inc' %] [% INCLUDE 'header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER 'sub-header.inc' %]
<ol> [% WRAPPER breadcrumbs %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">Change estimated delivery date</a> Change estimated delivery date
</li> [% END %]
</ol> [% END #/ WRAPPER breadcrumbs %]
</nav> [% END #/ WRAPPER sub-header.inc %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

31
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
View file

@ -1,3 +1,4 @@
[% USE raw %]
[% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'doc-head-open.inc' %]
<title>[%- IF (type == "vendor") -%] <title>[%- IF (type == "vendor") -%]
Change order vendor note Change order vendor note
@ -11,30 +12,22 @@
<body id="acq_modordernotes" class="acq"> <body id="acq_modordernotes" class="acq">
[% INCLUDE 'header.inc' %] [% INCLUDE 'header.inc' %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active=1 %]
<a href="#" aria-current="page">
Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note
</a> [% END %]
</li> [% END #/ WRAPPER breadcrumbs %]
</ol> [% END #/ WRAPPER sub-header.inc %]
</nav>
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

48
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
View file

@ -44,37 +44,27 @@
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <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 %] [% END %]
</ol> [% WRAPPER breadcrumb_item %]
</nav> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
[% END %] [% 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' %] [% INCLUDE 'blocking_errors.inc' %]

29
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
View file

@ -1,5 +1,4 @@
[% USE raw %]
[% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'doc-head-open.inc' %]
<title>Duplicate warning &rsaquo; Basket [% basketno | html %] &rsaquo; Acquisitions &rsaquo; Koha</title> <title>Duplicate warning &rsaquo; Basket [% basketno | html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
[% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'doc-head-close.inc' %]
@ -10,27 +9,19 @@
[% INCLUDE 'acquisitions-search.inc' %] [% INCLUDE 'acquisitions-search.inc' %]
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">
Duplicate warning Duplicate warning
</a> [% END %]
</li> [% END #/ WRAPPER breadcrumbs %]
</ol> [% END #/ WRAPPER sub-header.inc %]
</nav>
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">

29
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
View file

@ -16,28 +16,21 @@
[% END %] [% END %]
[% WRAPPER 'sub-header.inc' %] [% WRAPPER 'sub-header.inc' %]
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb"> [% WRAPPER breadcrumbs %]
<ol> [% WRAPPER breadcrumb_item %]
<li>
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
</li>
<li>
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
</li> [% END %]
<li> [% WRAPPER breadcrumb_item bc_active= 1 %]
<a href="#" aria-current="page">
Add order from a subscription Add order from a subscription
</a> [% END %]
</li> [% END #/ WRAPPER breadcrumbs %]
</ol> [% END #/ WRAPPER sub-header.inc %]
</nav>
[% END %]
<div class="main container-fluid"> <div class="main container-fluid">
<div class="row"> <div class="row">