From 084ebdecf2c9b5bacc79233e9caa2496f9c4f4fe Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 5 Apr 2021 21:50:20 +0000 Subject: [PATCH] Bug 27631: acqui folder Changed each of the pages in the acqui folder to have one

tag showing that describes the page, rather than the

describing the logo. The hierarchy of heading tags may be broken in many pages, but this will be dealt with in an additional bug. To test: 1) Go to the Staff Client 2) Apply patch 3) Go to each of the pages in the acqui folder and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is

Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 3 +++ .../intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 4 ++-- .../prog/en/modules/acqui/neworderempty_duplicate.tt | 2 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 3 +-- .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 1 + .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 2 +- 19 files changed, 22 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 1914c5545b..8e6a78878c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -184,7 +184,7 @@ [% END %] [% IF ( NO_BOOKSELLER ) %] -

Vendor not found

+

Vendor not found

[% ELSE %] [% IF ( delete_confirmed ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 7a35a24842..774ae71874 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -39,6 +39,7 @@
[% INCLUDE 'acquisitions-toolbar.inc' %] +

Search for vendor

[% UNLESS ( count == 1 ) %] [% UNLESS count %]

Your search returned no results.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index b8d6a35861..7c70c1200e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -32,7 +32,7 @@ [% UNLESS ( confirmcancel ) %]
-

Are you sure you want to cancel this order ([% ordernumber | html %])

+

Are you sure you want to cancel this order ([% ordernumber | html %])

[% IF (del_biblio) %] Bibliographic record will be deleted too. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index 30fdf74cac..f70b33a1ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -50,10 +50,9 @@ Acquisitions › Koha

+

Duplicate existing orders

[% INCLUDE 'blocking_errors.inc' %] -

Duplicate existing orders

- [% IF op == 'search' || op == 'select' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index a4a6082b9b..b05d6418a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -26,7 +26,7 @@
-

Select the library account submitting the EDI order

+

Select the library account submitting the EDI order


Select ordering library account:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index 24d481ff55..4af2fb2a2e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -25,6 +25,7 @@
+

EDIFACT message display

[% IF no_message %]
The requested message cannot be displayed
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 4bb0e1bb7c..e560fe3d34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -45,6 +45,9 @@
+ +

Order search

+ [% IF !order_loop && search_done %]
Your search returned no results. 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 d90c1b01ad..906fa3c016 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 @@ -37,7 +37,7 @@
-

Files for invoice: [% invoicenumber | html %]

+

Files for invoice: [% invoicenumber | html %]

Vendor: [% suppliername | html %]


[% IF errors %] 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 ce0a059b87..2afa7d690b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -40,6 +40,7 @@
+

Invoice: [% invoicenumber | html %]

[% INCLUDE 'blocking_errors.inc' %] [% IF ( modified ) %] @@ -47,7 +48,6 @@

Invoice has been modified

[% END %] -

Invoice: [% invoicenumber | html %]

Vendor: [% suppliername | html %]

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 288b2f5f43..08a5581e5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -53,13 +53,13 @@
-

+

[% IF ( ordernumber ) %] Modify order line [% ELSE %] New order [% END %] -

+

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 cd2beae0ce..59677d6036 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 @@ -33,7 +33,7 @@
-

Duplicate warning

+

Duplicate warning

You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %] [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] [% ELSIF ( BiblioDefaultViewisbd ) %] 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 055c3cef5e..2986089b95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -41,7 +41,7 @@

-

Serials subscriptions

+

Serials subscriptions

[% IF (done_searched) %]