From a75b0315fd787d8c8602ab7c68a1b9fd57b60ee3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 14 Jan 2021 17:53:49 +0000
Subject: [PATCH] Bug 27439: Improve hint labels on patron attribute type entry
 form

This patch makes some minor changes to the patron attribute type
template in order make corrections and improve consistency:

- Change some generic <span>s to <div class="hint">
- Correct terminology: Branch -> Library
- Improve hint text:
  Before: "Select All if this attribute type must to be displayed all
  the time."
  After: "Select "All libraries" if this attribute type should always
  be displayed"
- Link reference to authorized values "PA_CLASS" directly to that page
  for users with permission.

To test, apply the patch and go to Administration -> Patron attribute
types -> New patron attribute type.

 - Confirm that the hints on these fields are properly styled:
   Authorized value category, Library limitation, Category, and Class.
 - Confirm that the text uses the term "library" instead of "branch."
 - Confirm that the hint on the "Class" field links directly to
   authorized values if you are logged in with a user with permission.

Signed-off-by: Victoria Faafia <vfaafia29@gmail.com>
---
 .../prog/en/modules/admin/patron-attr-types.tt     | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 227daf7137..638d8a5894 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -161,17 +161,15 @@
                 <option value=""></option>
                 [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => attribute_type.authorised_value_category ) %]
             </select>
-            <span>Authorized value category; if one is selected, the patron record input page will only allow values 
-                  to be chosen from the authorized value list.  However, an authorized value list is not 
-                  enforced during batch patron import.</span>
+            <div class="hint">Authorized value category; if one is selected, the patron record input page will only allow values to be chosen from the authorized value list.  However, an authorized value list is not enforced during batch patron import.</div>
         </li>
-        <li><label for="branches">Branches limitation: </label>
+        <li><label for="branches">Library limitation: </label>
             <select id="branches" name="branches" multiple size="10">
-                <option value="">All branches</option>
+                <option value="">All libraries</option>
                 [% PROCESS options_for_libraries libraries => Branches.all( selecteds => attribute_type.library_limits ) %]
             </select>
-            <span>Select All if this attribute type must to be displayed all the time. Otherwise select libraries you want to associate with this value.
-            </span>
+            <div class="hint">Select "All libraries" if this attribute type should always be displayed. Otherwise select libraries you want to associate with this value.
+            </div>
         </li>
         <li>
             <label for="category">Category: </label>
@@ -181,12 +179,18 @@
                     [% IF ( cat.categorycode == attribute_type.category_code ) %]<option value="[% cat.categorycode | html %]" selected="selected">[% cat.description |html %]</option>[% ELSE %]<option value="[% cat.categorycode | html %]">[% cat.description |html %]</option>[% END %]
                 [% END %]
             </select>
-            <span>Choose one to limit this attribute to one patron type. Please leave blank if you want these attributes to be available for all types of patrons.</span>
+            <div class="hint">Choose one to limit this attribute to one patron type. Please leave blank if you want these attributes to be available for all types of patrons.</div>
         </li>
         <li>
             <label for="class">Class: </label>
             [% PROCESS 'av-build-dropbox.inc' name="class", category="PA_CLASS" default=attribute_type.class %]
-            <span>Group attributes types with a block title (based on authorized values category 'PA_CLASS')</span>
+            <div class="hint">
+                [% IF ( CAN_user_parameters_manage_auth_values ) %]
+                    Group attributes types with a block title (based on <a target="_blank" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=PA_CLASS">authorized values category 'PA_CLASS'</a>)
+                [% ELSE %]
+                    Group attributes types with a block title (based on authorized values category 'PA_CLASS')
+                [% END %]
+            </div>
         </li>
     </ol>
   </fieldset>
-- 
2.11.0