From 26e38d4990a96f0fb6398f3a732b75a1b9f56ee0 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 19 Apr 2021 05:51:05 +0000 Subject: [PATCH] Bug 27631: labels and members folders Changed each of the pages in the labels and members 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 labels and members 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 Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers --- .../prog/en/modules/labels/label-home.tt | 1 + .../prog/en/modules/labels/label-manage.tt | 1 + .../prog/en/modules/labels/label-print.tt | 1 + .../prog/en/modules/labels/spinelabel-home.tt | 2 +- .../en/modules/members/accountline-details.tt | 8 ++++++++ .../prog/en/modules/members/boraccount.tt | 1 + .../prog/en/modules/members/deletemem.tt | 5 +++-- .../prog/en/modules/members/discharges.tt | 4 ++-- .../prog/en/modules/members/files.tt | 4 ++-- .../prog/en/modules/members/housebound.tt | 6 +++--- .../prog/en/modules/members/ill-requests.tt | 2 +- .../prog/en/modules/members/mancredit.tt | 2 ++ .../prog/en/modules/members/maninvoice.tt | 2 ++ .../en/modules/members/member-password.tt | 2 +- .../prog/en/modules/members/members-update.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../en/modules/members/moremember-brief.tt | 2 +- .../prog/en/modules/members/moremember.tt | 6 ++++++ .../prog/en/modules/members/pay.tt | 2 ++ .../prog/en/modules/members/paycollect.tt | 19 ++++++++++++++++++- .../modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 3 ++- .../prog/en/modules/members/routing-lists.tt | 7 ++++--- .../prog/en/modules/members/update-child.tt | 2 +- 24 files changed, 66 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index 347d0b1544..0cf9deaa62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -30,6 +30,7 @@
[% INCLUDE 'labels-toolbar.inc' %] +

Label creator

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index a376713171..a1d66abdd7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -47,6 +47,7 @@
[% INCLUDE 'labels-toolbar.inc' %] +

Manage labels

[% IF ( error ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt index 3b1640d910..d8bda80551 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt @@ -8,6 +8,7 @@
+

Label printing/exporting

[% IF ( batches ) %]

Click on the following links to download the exported batch(es).

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt index 04536f3f4b..42f87e3470 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -30,7 +30,7 @@
-

Quick spine label creator

+

Quick spine label creator

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index b12cc4a4a0..b6677ce9c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -60,6 +60,14 @@
    +

    + [% IF type == 'credit' %] + Details of payment + [% ELSIF type == 'debit' %] + Details of fee + [% END %] +

    + [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] [% IF accountline %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 2542ce0c08..4c095259ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -44,6 +44,7 @@
    [% INCLUDE 'members-toolbar.inc' %] +

    Account for [% INCLUDE 'patron-title.inc' %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt index b7fe9a029f..fb65d243cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -35,7 +35,7 @@ [% INCLUDE 'members-toolbar.inc' %] [% IF ItemsOnIssues || debits || is_guarantor %]
    -

    Cannot delete patron

    +

    Cannot delete patron

      [% IF ( ItemsOnIssues ) %]
    • Patron has [% ItemsOnIssues | html %] item(s) checked out.
      • @@ -64,7 +64,8 @@ [% END %]
    [% END %] -

    Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]? This cannot be undone.

    +

    Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]?

    +

    This cannot be undone.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt index 4b535f89f2..37f267c1e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -32,7 +32,7 @@
    [% IF pending_discharges %] -

    Pending discharge requests

    +

    Pending discharge requests

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

    There are no pending discharge requests.

    +

    There are no pending discharge requests.

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index 541128e4ee..08eecc6c0c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -34,10 +34,10 @@
    - [% INCLUDE 'members-toolbar.inc' %] -

    Files

    + [% INCLUDE 'members-toolbar.inc' %] + [% IF errors %]
    [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 2724a51e47..47148ba687 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -79,10 +79,10 @@
    - [% INCLUDE 'members-toolbar.inc' %] + +

    Housebound details for [% INCLUDE 'patron-title.inc' %]

    - -

    Housebound details for [% INCLUDE 'patron-title.inc' %]

    + [% INCLUDE 'members-toolbar.inc' %] [% FOR m IN messages %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt index 0f41827757..af796f1c23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -37,8 +37,8 @@
    - [% INCLUDE 'members-toolbar.inc' %]

    ILL requests history

    + [% INCLUDE 'members-toolbar.inc' %] [% INCLUDE 'ill-list-table.inc' %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index b62c4e42bf..c81c45e55d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -36,6 +36,8 @@
    +

    Manual credit

    + [% INCLUDE 'members-toolbar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 4e02554aa7..a3ea7f9275 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -37,6 +37,8 @@
    +

    Manual invoice

    + [% INCLUDE 'members-toolbar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index 4ac2922ef0..f4990e4e3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -82,7 +82,7 @@ [% END %] -
    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %] +

    Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]
      2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt index 93bb308d9d..b269c15ae2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -108,8 +108,8 @@
      +

      Update patron records

      [% IF PendingModifications %] -

      Update patron records

      [% FOREACH pm IN PendingModifications %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt index 3e260361f8..0461c5a862 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -96,7 +96,7 @@
      -

      Merge patron records

      +

      Merge patron records

      [% IF action == 'show' %] [% IF patrons.count > 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 79933fca73..96b724eee5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -12,7 +12,7 @@
      -

      [% INCLUDE 'patron-title.inc' %]

      +

      [% INCLUDE 'patron-title.inc' %]

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 400a6978b3..c225bb862d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -102,6 +102,12 @@ [% INCLUDE 'patron_messages.inc' %]
      +

      + [% UNLESS ( I ) %] + [% patron.title | html %] [% patron.firstname | html %] + [% END %] + [% patron.surname | html %] ([% patron.cardnumber | html %]) +

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index c88c4b6eea..b89f0445f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -38,6 +38,8 @@
      +

      Make a payment

      + [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index cc6dc7bc5d..3b493c20b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -73,8 +73,25 @@
      -[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] +

      + [% IF ( pay_individual ) %] + Pay an individual fine + [% ELSIF ( writeoff_individual ) %] + Write off an individual fine + [% ELSE %] + [% IF ( selected_accts ) %] + [% IF type == 'WRITEOFF' %] + Write off an amount toward selected fines + [% ELSE %] + Pay an amount toward selected fines + [% END %] + [% ELSE %] + Pay an amount toward all fines + [% END %] + [% END %] +

      +[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index fdfbbb143a..e7c5d08bb0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -35,8 +35,8 @@
      - [% INCLUDE 'members-toolbar.inc' %]

      Purchase suggestions

      + [% INCLUDE 'members-toolbar.inc' %]
      New purchase suggestion diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 3acc84e067..bdcd5fe155 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -36,9 +36,10 @@
      -[% INCLUDE 'members-toolbar.inc' %]

      Circulation history

      +[% INCLUDE 'members-toolbar.inc' %] + [% UNLESS Koha.Preference('intranetreadinghistory') %]
      Staff members are not allowed to access patron's checkout history
      [% ELSIF is_anonymous %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt index d4eb1f5155..81c7c03a3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -34,8 +34,9 @@
      -[% INCLUDE 'members-toolbar.inc' %] + [% INCLUDE 'members-toolbar.inc' %] +

      Subscription routing lists for [% INCLUDE 'patron-title.inc' %]

      Search subscriptions:

      [% IF ( routing ) %][% END %] @@ -43,7 +44,7 @@ [% SET routinglists = patron.get_routing_lists %] -

      +

      [% UNLESS ( routinglists ) %] 0 subscription routing lists [% ELSIF ( routinglists.count == 1 ) %] @@ -51,7 +52,7 @@ [% ELSE %] [% routinglists.count | html %] subscription routing lists [% END %] -

      +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt index 72c9b988de..460ee2d190 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -11,7 +11,7 @@ [% IF ( MULTI ) %] -

      Choose adult category

      +

      Choose adult category

      [% IF patron_categories %] -- 2.39.5