From 6ba19d40b6d095b0f6cefce9493f666e8700b8ef 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 Signed-off-by: Owen Leonard --- .../prog/en/modules/offline_circ/enqueue_koc.tt | 2 +- .../intranet-tmpl/prog/en/modules/offline_circ/list.tt | 2 +- .../prog/en/modules/offline_circ/process_koc.tt | 4 ++-- .../prog/en/modules/patroncards/edit-batch.tt | 2 ++ .../prog/en/modules/patroncards/edit-layout.tt | 2 ++ .../prog/en/modules/patroncards/edit-profile.tt | 2 +- .../prog/en/modules/patroncards/edit-template.tt | 2 +- .../intranet-tmpl/prog/en/modules/patroncards/home.tt | 1 + .../prog/en/modules/patroncards/image-manage.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/patroncards/manage.tt | 3 +++ .../intranet-tmpl/prog/en/modules/patroncards/print.tt | 1 + .../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 | 7 ++++--- .../prog/en/modules/rotating_collections/addItems.tt | 3 ++- 15 files changed, 27 insertions(+), 13 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 2a75a3e053..9c7563be11 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 d80c6ab15f..1f2d749fa0 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 20e95365d4..f82e6e6f80 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 23a66e22c8..51e89baca9 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 f27402b8f4..16d698fb0f 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 7b5ec5b053..740cc3d1fa 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 b2cce29e12..c9bdbf73b5 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 c039137870..c37ff366c3 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 5ccdfa89d3..0616f0bca8 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 aca3aa02c4..838768d225 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 2020ec302b..f612641ac8 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 55ff28663a..103f84f216 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 243c0baaae..ec480688d7 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 c97c7991e5..507a88b8ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -86,6 +86,7 @@ [% END %]

+

Holds

[% IF ( nobiblio ) %]
@@ -118,9 +119,9 @@ [% END %] [% UNLESS ( multi_hold ) %] -

Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]

+

Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]

[% ELSE %] -

+

[% IF ( patron ) %] Place holds [% ELSE %] @@ -130,7 +131,7 @@ Search patrons [% END %] [% END %] -

+

[% END %] [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %] 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 42966bd55c..d09366f527 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.20.1