From 195c30124f4cc1582013030da579a895780c12d0 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 Signed-off-by: Owen Leonard --- .../automatic_item_modification_by_age.tt | 4 ++-- .../prog/en/modules/tools/csv-profiles.tt | 4 ++-- .../prog/en/modules/tools/export.tt | 2 ++ .../prog/en/modules/tools/holidays.tt | 2 +- .../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 +- .../prog/en/modules/tools/quotes.tt | 6 +++--- .../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 + .../virtualshelves/addbybiblionumber.tt | 1 + .../modules/virtualshelves/downloadshelf.tt | 2 +- .../modules/virtualshelves/sendshelfform.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 9 ++++----- 17 files changed, 39 insertions(+), 32 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 a6711c15af..31ab9093f3 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 d68696d0ab..70c27de5f6 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 fee9ea6132..32d720420f 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 ac728fe74d..a35f8cbf15 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/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index f2337e39e9..946518210e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -535,7 +535,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 d2d2d38d4c..c360e54f42 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 1b9013fe11..5173d7635e 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 f2b3461ffb..5284e0b457 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 2ffd7b0868..918ed0ce56 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 9e05c55cd5..2b0df0daaf 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 0deccf65ce..20e5123d2a 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 %]