From 84f0b36dd35f32cd2029b3e1be4e2b50ba458454 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 f329fcad64..dbd4e7a5f4 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 @@ -24,7 +24,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 2423b28cc5..1c6871f295 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 @@ -30,7 +30,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 e302d2b1c1..77d8e053ba 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 @@ -43,7 +43,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 ) %] @@ -58,7 +58,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 1a6f355a59..7a74ad94ee 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 @@ -45,6 +45,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 0a41e1b8b6..d821df71d1 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 @@ -41,6 +41,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 4335b36832..1503e9f547 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 @@ -41,7 +41,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 d2a61068cb..8e63d890b8 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 @@ -42,8 +42,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 061b14fcf6..3ea33eb72c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt @@ -28,6 +28,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 ae9e6e138b..a8beec4d09 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 @@ -32,10 +32,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.

@@ -74,7 +75,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 a4c393e0b3..41fc63615e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -56,6 +56,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 33f50f5014..9a779c4f0e 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 @@ -31,6 +31,7 @@
+

Plugins

@@ -67,7 +68,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 a7f35bfc64..7fa3fd4088 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -33,6 +33,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 963889cc68..8de544e15d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -70,6 +70,7 @@ [% END %]

+

Holds

[% IF ( noitems ) %]
@@ -93,9 +94,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 7491f5ac8b..b0d4886025 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 @@ -36,6 +36,7 @@
+

Add/remove items from collection

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

Collection [% colTitle | html %]

+

Collection [% colTitle | html %]

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