From 7b008ced7daf3664f784bc03f04218cd4ee114c4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 Mar 2022 15:22:55 +0000 Subject: [PATCH] Bug 27631: (follow-up) Various corrections This patch addresses issues found during QA: - Double headings (patron details page) - Inconsistent heading position (check out, patron accounting) - Missing headings when there is no data (Library EANs, Item search fields, MARC modification templates). - Typo: Z19.50 => Z39.50 - Reword "Classification sources" heading: "Classification configuration" --- .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/classsources.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/housebound.tt | 3 +-- .../intranet-tmpl/prog/en/modules/members/mancredit.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/maninvoice.tt | 3 ++- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 7 ------- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 4 ++-- .../prog/en/modules/tools/marc_modification_templates.tt | 1 + 12 files changed, 15 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 6ec128e569..d592a1bc58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -173,7 +173,7 @@
Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions)
[% END %] [% IF ( CAN_user_parameters_manage_classifications ) %] -
Classification sources
+
Classification configuration
Define classification sources (i.e. call number schemes) used by your collection. Also define filing rules used for sorting call numbers and splitting rules for splitting them
[% END %] [% IF ( CAN_user_parameters_manage_matching_rules ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index d1970ec646..d7e6e9a59a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -340,7 +340,7 @@ Classification sources › Administration › Koha New filing rule New splitting rule -

Classification sources

+

Classification configuration

Classification sources

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index 0b1630ba69..53e94fa47f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -158,8 +158,8 @@ Library EANs › Administration › Koha [% END %] [% IF display %] -[% IF ( eans ) %]

Library EANs

+[% IF ( eans ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index de96abcbbc..15787ac7b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -97,6 +97,7 @@
Library
[% ELSE %] +

Item search fields

There are no item search fields defined.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 2341282c2a..25c4bce99f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -207,7 +207,7 @@ New Z39.50 server New SRU server -

Z19.50/SRU servers administration

+

Z39.50/SRU servers administration

[% IF id %] You searched for record [% id | html %] [% ELSIF searchfield %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 5cc7836014..88a415f30c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -60,12 +60,12 @@
-

Checkouts

- [% IF patron %] [% INCLUDE 'members-toolbar.inc' %] [% END %] +

Checkouts

+ [% IF ( was_renewed ) %]
Patron's account has been renewed until [% expiry | $KohaDates %]
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 5b0dfe0a07..d9636392a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -115,7 +115,6 @@ [% IF ( method == 'update_or_create' ) %] -

Manage housebound profile

@@ -125,7 +124,7 @@ [% END %]
- Housebound details + Manage housebound profile
  1. 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 d0e17266d8..9052257697 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -36,10 +36,10 @@
    -

    Manual credit

    - [% INCLUDE 'members-toolbar.inc' %] +

    Manual credit

    +
      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 df050d8595..8d41ea71a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -37,10 +37,11 @@
      -

      Manual invoice

      [% INCLUDE 'members-toolbar.inc' %] +

      Manual invoice

      +
        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 2b9debdf6d..7c890b447e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -85,13 +85,6 @@
        -

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

        - [% IF ( was_renewed ) %]
        Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] 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 3e8838f59f..3f29a4078e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -38,10 +38,10 @@
        -

        Make a payment

        - [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] +

        Make a payment

        +
          diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt index 880ffc12c0..2c0222b80f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt @@ -300,6 +300,7 @@ [% END %] [% ELSE %] +

          MARC modification templates

          There are no defined templates. Please create a template first.

          [% END # /IF TemplatesLoop %] -- 2.20.1