From 4e4cecbbac82f8445c6457117d3f99175783ff73 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 5 Apr 2021 09:30:06 +0000 Subject: [PATCH] Bug 27631: offline_circ, patroncards, plugins, pos, reserve, rotating_collections folders Changed each of the pages in the offline_circ, patroncards, plugins, pos, reserve, rotating_collections folders 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 offline_circ, patroncards, plugins, pos, reserve, rotating_collections folders 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/offline_circ/enqueue_koc.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt | 3 ++- 15 files changed, 26 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt index 69bfcc65dd..2aa85babdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt @@ -12,7 +12,7 @@
-

Koha offline circulation

+

Koha offline circulation

Your file was uploaded. Once all files are uploaded, please process them in pending offline circulation actions.

[% FOREACH message IN messages %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index 65d1ff4c87..cf33992342 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -16,7 +16,7 @@
-

Offline circulation

+

Offline circulation

[% IF ( pending_operations ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 02e3d11b3d..be5bc238db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -17,7 +17,7 @@
[% IF ( transactions_loaded ) %] -

Koha offline circulation

+

Koha offline circulation

Your data was processed. Here are the results:

[% FOREACH message IN messages %] [% IF ( message.message ) %] @@ -32,7 +32,7 @@ [% IF ( message.payment ) %]

Accepted payment ([% message.amount | html %]) from [% message.firstname | html %] [% message.surname | html %] ([% message.cardnumber | html %]): [% message.datetime | html %]

[% END %] [% END %] [% ELSE %] -

Upload offline circulation data

+

Upload offline circulation data

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index c7f3d2ca1b..883943c2d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -30,6 +30,8 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches

+ [% IF ( duplicate_message ) %]
Duplicate patrons removed from batch number [% batch_id | html %]: [% duplicate_count | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 8a5c487d53..afe4885463 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -22,6 +22,8 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt index d6ee17c379..9636e3fa94 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt @@ -22,7 +22,7 @@ [% INCLUDE 'patroncards-toolbar.inc' %] -

[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]

+

[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]

Profile settings
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt index 87ee53775b..a6f139de41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt @@ -23,8 +23,8 @@
    [% INCLUDE 'patroncards-toolbar.inc' %] +

    [% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]

    -

    [% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt index a87f5978d0..f1da287c51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt @@ -18,6 +18,7 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

    Patron card creator

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt index 22fcf76cb6..c0829e2172 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt @@ -20,10 +20,11 @@
[% INCLUDE 'patroncards-toolbar.inc' %] +

Image manager

[% INCLUDE 'patroncards-errors.inc' %]
-

Upload additional images for patron cards

+

Upload additional images for patron cards

Manage additional images to use as logo, decoration or background on a patron card layout.

@@ -62,7 +63,7 @@
-

Delete Images

+

Delete Images

[% IF ( TABLE ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index e624273593..821b706290 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -43,6 +43,9 @@
[% INCLUDE 'patroncards-toolbar.inc' %] + +

Patron card templates

+ [% INCLUDE 'patroncards-errors.inc' %]
[% IF ( table_loop ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt index 9d9e6b031f..07bc969110 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt @@ -7,6 +7,7 @@
+

Patron card printing/exporting

[% IF ( batches ) %]

Click on the following link(s) to download the exported batch(es).

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt index a5d8073c17..1ce30a86ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -21,6 +21,7 @@
+

Plugins

@@ -57,7 +58,6 @@ [% END %]
[% END %] -

Plugins

[% IF search_results %]

Search results

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt index 5e35eadee2..895a9434b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -23,6 +23,8 @@
+

Point of sale

+ [% IF ( registers.size == 0 ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 5dfff18595..4335386de6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -48,6 +48,7 @@ [% END %]

+

Holds

[% IF ( noitems ) %]
@@ -71,9 +72,9 @@ [% END %] [% UNLESS ( multi_hold ) %] -

Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]

+

Place a hold on [% INCLUDE 'biblio-title.inc' link = 2 %]

[% ELSE %] -

Confirm holds

+

Confirm holds

[% END %] [% UNLESS club OR patron OR patron.borrowernumber OR noitems %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt index 673c5c0e55..861e414f2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -16,6 +16,7 @@
+

Add/remove items from collection

[% IF ( ! colId ) %]
@@ -24,7 +25,7 @@
[% ELSE %] [% INCLUDE 'rotating-collections-toolbar.inc' %] -

Collection [% colTitle | html %]

+

Collection [% colTitle | html %]

[% IF ( previousActionAdd ) %] [% IF ( addSuccess ) %] -- 2.11.0