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

Sponsored-by: Catalyst IT --- .../prog/en/modules/authorities/authorities-home.tt | 2 ++ .../intranet-tmpl/prog/en/modules/authorities/detail.tt | 3 ++- .../intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt | 12 +++++++----- .../intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt | 4 ++-- .../prog/en/modules/clubs/templates-add-modify.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- .../prog/en/modules/course_reserves/add_items-step1.tt | 1 + .../prog/en/modules/course_reserves/add_items-step2.tt | 3 +++ .../prog/en/modules/course_reserves/batch_add_items.tt | 3 ++- .../prog/en/modules/course_reserves/batch_rm_items.tt | 3 ++- .../intranet-tmpl/prog/en/modules/course_reserves/course.tt | 3 ++- .../prog/en/modules/course_reserves/invalid-course.tt | 2 +- 12 files changed, 27 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt index 3a9867d5df..2576abd94b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt @@ -16,6 +16,8 @@ [% INCLUDE 'authorities-toolbar.inc' %] +

Authorities

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index 62f05615c6..fb9889cd8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -39,9 +39,10 @@ [% IF ( unknownauthid ) %] +

Authority does not exist

The authority record you requested does not exist ([% errauthid | html %]).
[% ELSE %] -

Authority #[% authid | html %] ([% authtypetext | html %])

+

Authority #[% authid | html %] ([% authtypetext | html %])

[% IF count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt index cdfd13830a..f0dada2165 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -36,11 +36,13 @@
- [% IF club %] - Modify club [% club.name | html %] - [% ELSE %] - Create a new [% club_template.name | html %] club - [% END %] +

+ [% IF club %] + Modify club [% club.name | html %] + [% ELSE %] + Create a new [% club_template.name | html %] club + [% END %] +

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt index 21ff9056b0..13f209ba46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt @@ -1,9 +1,9 @@ [% USE AuthorisedValues %] [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] -

    +

    Enroll in [% club.name | html %] -

    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt index 13aa40c195..250fc098a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt @@ -36,13 +36,13 @@ -

    +

    [% IF club_template %] Modify club template [% club_template.name | html %] [% ELSE %] Create a new club template [% END %] -

    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt index 1772d97f3e..66843a3127 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt @@ -15,7 +15,7 @@
    -

    Search for patron

    +

    Search for patron

    1. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt index 428e293713..d2fbc161d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -12,6 +12,7 @@
      +

      Add reserves for [% course.course_name | html %]

      [% IF ERROR_ITEM_NOT_FOUND %] [% IF UNKNOWN_BARCODE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 9c12bc05db..5a1740dc7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -15,6 +15,9 @@
      +

      +i [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %][% biblio.title | html %] for [% course.course_name | html %] +

      [% IF course_reserve && !is_edit%]
      This course already has this item on reserve.
      [% END %] [% IF course_item %]
      Number of courses reserving this item: [% course_item.course_reserves.count | html %]
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt index 1da830054d..1a3d268c0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt @@ -18,6 +18,7 @@
      +

      Add reserves for [% course.course_name | html %]

      [% IF action == 'invalid_course' %]
      Invalid course!
      [% END %] @@ -118,7 +119,7 @@ [% END %] [% IF action == 'display_results' %] -

      Results

      +

      Results

      Items added

      [% IF items_added.size > 0 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt index d39db41914..12cff1c67a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt @@ -15,6 +15,7 @@
      +

      Batch remove reserves

      [% IF action == 'display_form' %] @@ -36,7 +37,7 @@ [% END %] [% IF action == 'display_results' %] -

      Results

      +

      Results

      Items removed

      [% IF item_and_count > 0 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index 1f5886fefb..2b30d07d55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -24,6 +24,7 @@
      +

      [% IF course_name %] Edit [% course_name | html %] [% ELSE %] New course [% END %]

      [% IF course_id %][% END %] @@ -142,8 +143,8 @@ [% ELSE %]
      +

      No DEPARTMENT authorized values found!

      - No DEPARTMENT authorized values found! [% IF ( CAN_user_parameters ) %] Please create one or more authorized values with the category DEPARTMENT. [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt index eb12031abf..071aba6713 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt @@ -13,7 +13,7 @@

      -

      Invalid course!

      +

      Invalid course!

      -- 2.11.0