From 83bec65d9d7c77166d272cf47e89efa78e5a3121 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 56462c51d5..111554642d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -162,7 +162,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 1adb7f0be9..26c2214d28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -25,6 +25,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 9023f7123f..e8d70a4bec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -21,7 +21,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 1ed05775ef..0a630ba14b 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 @@ -36,10 +36,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 e8b1dfef5e..ac0d93176c 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 @@ -14,7 +14,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 4e8ed58c60..f6d2838c5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -15,6 +15,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 e43000df35..84567d08f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -19,6 +19,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 f28cfd6c17..6c97f2c8ad 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 @@ -18,7 +18,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 6638449a4b..0949b00da8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -24,6 +24,7 @@
+

Invoice: [% invoicenumber | html %]

[% INCLUDE 'blocking_errors.inc' %] [% IF ( modified ) %] @@ -31,7 +32,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 377fdfd5a6..226227b7b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -24,13 +24,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 b59c05da86..29da008273 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 @@ -15,7 +15,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 dba4e4d814..6c15653ff6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -21,7 +21,7 @@

-

Serials subscriptions

+

Serials subscriptions

[% IF (done_searched) %]