From f04fd5f97e23ee3b96e8ddc31bb97e2f1fbcee91 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 --- 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 +- koha-tmpl/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 +++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt | 2 +- koha-tmpl/intranet-tmpl/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 +-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 1 + koha-tmpl/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 99480f6765..d3f36c6cf6 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 bfe850ebc6..2dfd24157e 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 cfa362278c..a2baba0279 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 a75fdc0485..fccd68a0ae 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 @@ Basket [% basket.basketno | html %] › Duplicate existing orders

+

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 20df882ed8..2e6b09206e 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 5a6528a866..26ca9c2015 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 7c4d2c3f1d..89a2848416 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 da26c692dd..3b2638ccda 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 aa9847bb46..b2c7656b82 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 771740d504..9de83d69ff 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 c4c0dec3d1..25090aee6e 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 74b1ac576f..fbac96aa3c 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) %]