From 6846b40ca415e4b66ae494a535028159792bfe2a 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 78063a20e1..ec1e71646f 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 @@ -27,7 +27,7 @@ [% IF ( op == 'edit_form' ) %]
-

Rules for automatic item modifications by age

+

Rules for automatic item modifications by age

@@ -40,7 +40,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 56d67652fe..be90761439 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 @@ -233,7 +233,7 @@ [% IF op == 'delete_confirm' %]
[% IF csv_profile %] -

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

+

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

@@ -254,7 +254,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 4e9a992c04..91c842486b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -23,6 +23,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 8aefa2458f..bc5743fa81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -36,7 +36,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl
-

[% 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 d609997a40..287a35c5c8 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 @@ -39,11 +39,11 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]
[% 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 9bc75fc4ef..ada1abffa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -501,7 +501,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 29fd108ad3..e4ddc82664 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 @@ -23,16 +23,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 867a3628c3..d2dbc01537 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 @@ -23,7 +23,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 bf968fdaec..3ececd1ca0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt @@ -17,6 +17,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 b884a960ee..c255307b42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt @@ -23,9 +23,10 @@
+

Compare matched records

-

Original

+

Original

[% IF ( ERROR_FORMATTED1 ) %]

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

@@ -36,7 +37,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 754e833e26..b58937f123 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -53,7 +53,7 @@ [% INCLUDE 'stockrotation-toolbar.inc' %] -

Stock rotation

+

Stock rotation

[% IF existing_rotas.size > 0 %]
@@ -110,9 +110,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' %] @@ -167,7 +167,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' %] @@ -315,7 +315,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 @@ -324,7 +324,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):

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

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

+

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