Attachment 115263 Details for Bug 27437 – Bug 27437: Improve hint labels on library creation form

[patch] Bug 27437: Improve hint labels on library creation form

Bug-27437-Improve-hint-labels-on-library-creation-.patch (text/plain), 8.36 KB, created by Katrin Fischer on 2021-01-18 23:32:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2021-01-18 23:32:17 UTC

Size: 8.36 KB

patch

obsolete

>From 8c9a57c12217dc9c6624b7838717612cab4812d6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 14 Jan 2021 16:56:00 +0000
>Subject: [PATCH] Bug 27437: Improve hint labels on library creation form
>
>This patch makes a few minor template changes to the form for creating
>and editing libraries:
>
>- <br /><span class="hint"> changed to <div class="hint">
>- References to system preferences are linked directly to that
>  preference if the user has permission.
>- The MARC organization code label has been corrected so that it works
>  now.
>
>To test, apply the patch and go to Administration -> Libraries -> New
>library.
>
>- Confirm that the hints for Ill staff email, Reply-to, Return-path, and
>  MARC organization code look correct, including aligning with the input
>  field above them.
>- Confirm that clicking the "MARC organization code" label moves focus
>  to the correct field.
>- View the page as a user who both does and does not have permission to
>  access system preferences, confirming that system preferences are
>  linked correctly if the user has the correct permission.
>
>Signed-off-by: Mazen Khallaf <mazen.i.khallaf@gamil.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/admin/branches.tt              | 57 +++++++++++++++++++---
> 1 file changed, 51 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 535d2e5c6b..7b3a49d99d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -122,7 +122,7 @@
>                             [% ELSE %]
>                                 <input type="checkbox" id="[% category.categorycode | html %]" name="selected_categorycode_[% category.categorycode | html %]" />
>                             [% END %]
>-                            <span class="hint">[% category.codedescription | html %]</span>
>+                            <div class="hint">[% category.codedescription | html %]</div>
>                         </li>
>                     [% END %]
>                 </ol>
>@@ -141,10 +141,40 @@
>                 <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax | html %]" /></li>
>                 <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% library.branchemail | html %]" /></li>
>                 [% IF (Koha.Preference('ILLModule')) %]
>-                <li><label for="branchillemail">ILL staff email: </label><input type="text" name="branchillemail" id="branchillemail" class="email"  size="80" value="[% library.branchillemail | html %]" /><br /><span class="hint">Default: ILLDefaultStaffEmail system preference</span></li>
>+                <li>
>+                    <label for="branchillemail">ILL staff email: </label>
>+                    <input type="text" name="branchillemail" id="branchillemail" class="email"  size="80" value="[% library.branchillemail | html %]" />
>+                    <div class="hint">
>+                        [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>+                            Default: <a target="_blank" href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ILLDefaultStaffEmail">ILLDefaultStaffEmail</a> system preference
>+                        [% ELSE %]
>+                            Default: ILLDefaultStaffEmail system preference
>+                        [% END %]
>+                    </div>
>+                </li>
>                 [% END %]
>-                <li><label for="branchreplyto">Reply-To: </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% library.branchreplyto | html %]" /><br /><span class="hint">Default: ReplyToDefault system preference</span></li>
>-                <li><label for="branchreturnpath">Return-Path: </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% library.branchreturnpath | html %]" /><br /><span class="hint">Default: ReturnpathDefault system preference</span></li>
>+                <li>
>+                    <label for="branchreplyto">Reply-To: </label>
>+                     <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% library.branchreplyto | html %]" />
>+                    <div class="hint">
>+                         [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>+                            Default: <a target="_blank" href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ReplyToDefault">ReplyToDefault</a> system preference
>+                        [% ELSE %]
>+                            Default: ReplyToDefault system preference
>+                        [% END %]
>+                    </div>
>+                </li>
>+                <li>
>+                    <label for="branchreturnpath">Return-Path: </label>
>+                     <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% library.branchreturnpath | html %]" />
>+                    <div class="hint">
>+                         [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>+                            Default: <a target="_blank" href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ReturnpathDefault">ReturnpathDefault</a> system preference
>+                        [% ELSE %]
>+                            Default: ReturnpathDefault system preference
>+                        [% END %]
>+                    </div>
>+                </li>
>                 <li><label for="smtp_server">SMTP server: </label>
>                     <select name="smtp_server" id="smtp_server">
>                     [% IF selected_smtp_server.is_system_default %]
>@@ -163,8 +193,23 @@
>                 </li>
>                 <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% library.branchurl | html %]" class="url" /></li>
>                 <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info | $raw %]</textarea></li>
>-                <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip | html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
>-                <li><label for="marcorgccode">MARC organization code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode | html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.</span>
>+                <li>
>+                    <label for="branchip">IP: </label>
>+                    <input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip | html %]" />
>+                    <div class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</div>
>+                </li>
>+                <li>
>+                    <label for="marcorgcode">MARC organization code</label>
>+                    <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode | html %]" />
>+                    <div class="hint">
>+                        [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>+                            If not filled in defaults to system preference <a target="_blank" href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=MARCOrgCode">MARCOrgCode</a>.
>+                        [% ELSE %]
>+                            If not filled in defaults to system preference MARCOrgCode.
>+                        [% END %]
>+                        You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.
>+                    </div>
>+                </li>
>                 <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes | html %]" /></li>
>                 <li><label for="pickup_location">Pickup location: </label>
>                     <select name="pickup_location" id="pickup_location">
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27437: 115181 | 115251 | 115263 | 115415