From 5aad58d1336ccac4c57203a1870a47cc6d9f6cec Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 5 Apr 2021 09:46:17 +0000 Subject: [PATCH] Bug 27631: tools and virtualshelves folders Changed each of the pages in the tools and virtualshelves 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 tools and virtualshelves folders and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is

Sponsored-by: Catalyst IT --- .../tools/automatic_item_modification_by_age.tt | 4 ++-- .../prog/en/modules/tools/csv-profiles.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 ++ .../intranet-tmpl/prog/en/modules/tools/holidays.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/picture-upload.tt | 6 +++--- .../prog/en/modules/tools/preview_letter.tt | 1 + .../prog/en/modules/tools/quotes-upload.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/scheduler.tt | 2 ++ .../prog/en/modules/tools/showdiffmarc.tt | 5 +++-- .../prog/en/modules/tools/stockrotation.tt | 20 ++++++++++---------- .../prog/en/modules/tools/tools-home.tt | 1 + .../en/modules/virtualshelves/addbybiblionumber.tt | 1 + .../prog/en/modules/virtualshelves/downloadshelf.tt | 2 +- .../prog/en/modules/virtualshelves/sendshelfform.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 9 ++++----- 18 files changed, 40 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt index dc1cd1d35e..a2633de357 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt @@ -45,7 +45,7 @@ [% IF ( op == 'edit_form' ) %]
-

Rules for automatic item modifications by age

+

Rules for automatic item modifications by age

@@ -58,7 +58,7 @@
[% ELSE %] -

Automatic item modifications by age

+

Automatic item modifications by age

[% IF ( rules ) %]
Edit rules diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt index fbd0e616a7..c9d0d1b305 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -269,7 +269,7 @@ [% IF op == 'delete_confirm' %]
[% IF csv_profile %] -

Delete CSV Profile "[% csv_profile.profile | html %]?"

+

Delete CSV Profile "[% csv_profile.profile | html %]?"

@@ -290,7 +290,7 @@ New CSV profile
-

CSV profiles

+

CSV profiles

[% IF csv_profiles %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt index ecd4ffc04a..61ff1b451b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -37,6 +37,8 @@
+

Export data

+ [% FOR m IN messages %]
[% SWITCH m.code %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt index c473112ade..c67634dc69 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -32,7 +32,7 @@
-

[% Branches.GetName( branch ) | html %] calendar

+

[% Branches.GetName( branch ) | html %] calendar

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index b9dff09cc1..2fd0d22453 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -68,11 +68,11 @@ [% END %]
+

News

[% UNLESS ( add_form ) %] [% IF error_message == 'title_missing' %]
Error: Required news title missing!
[% END %] -

News

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index ba2a5f426a..081899610e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -536,7 +536,7 @@ [% IF ( delete_confirm ) %]
-

Delete notice?

+

Delete notice?

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt index 7614a5cfb7..8c04fd66d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -48,16 +48,16 @@ [% IF ( ERRORS ) %] [% IF ( TCOUNTS ) %]
-

Patron image(s) uploaded with some errors

+

Patron image(s) uploaded with some errors

[% ELSE %]
-

Patron image failed to upload

+

Patron image failed to upload

[% END %] [% ELSE %]
-

Patron image(s) successfully uploaded

+

Patron image(s) successfully uploaded

[% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt index 73c32ee4b4..e5fd21cc4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt @@ -4,6 +4,7 @@
    +

    Preview notice template

    [% FOR m IN messages %] [%# FIXME The message block does not appear at the top of the modal! %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index 97be5a4200..80cc862b65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -40,7 +40,7 @@
    -

    Quote uploader

    +

    Quote uploader

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt index 75d02d3283..0d646abd5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt @@ -31,6 +31,8 @@
+

Task scheduler

+ [% IF ( job_add_failed ) %]
Failed to add scheduled task
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt index 85426069c7..5f8db34b99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt @@ -41,9 +41,10 @@
+

Compare matched records

-

Original

+

Original

[% IF ( ERROR_FORMATTED1 ) %]

The record id [% RECORDID | html %] doesn't match any existing record.

@@ -54,7 +55,7 @@ [% END %]
-

Imported

+

Imported

[% IF ( ERROR_FORMATTED2 ) %]

The import id number [% IMPORTID | html %] doesn't match any existing record.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt index 4092ea492b..c6c70f6e15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -95,7 +95,7 @@ [% INCLUDE 'stockrotation-toolbar.inc' %] -

Stock rotation

+

Stock rotation

[% IF existing_rotas.size > 0 %]
@@ -152,9 +152,9 @@ [% ELSIF (op == 'create_edit_rota') %] [% IF rota.rota_id %] -

Edit "[% rota.title | html %]"

+

Edit "[% rota.title | html %]"

[% ELSE %] -

Create new rota

+

Create new rota

[% END %] [% IF error == 'invalid_form' %] @@ -209,7 +209,7 @@ [% END %] -

Manage [% rota.title | html %] stages

+

Manage [% rota.title | html %] stages

Edit "[% Branches.GetName(stage.branchcode_id) | html %]" +

Edit "[% Branches.GetName(stage.branchcode_id) | html %]"

[% ELSE %] -

Create new stage

+

Create new stage

[% END %] [% IF error == 'invalid_form' %] @@ -357,7 +357,7 @@ [% ELSIF (op == 'confirm_remove_from_rota') %]
-

Are you sure you wish to remove this item from it's rota

+

Are you sure you wish to remove this item from it's rota

Yes No @@ -366,7 +366,7 @@ [% ELSIF (op == 'confirm_delete_stage') %]

-

Are you sure you want to delete this stage?

+

Are you sure you want to delete this stage?

[% IF stage.stockrotationitems.count > 0 %]

This stage contains the following item(s):

    @@ -394,7 +394,7 @@
[% END %] -

Manage items assigned to [% rota.title | html %]

+

Manage items assigned to [% rota.title | html %]