Bugzilla – Attachment 155018 Details for
Bug 33766
Fix ambiguous form field in OPAC login form
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33766: (follow-up) Fix ambiguous "Login" field
Bug-33766-follow-up-Fix-ambiguous-Login-field.patch (text/plain), 14.49 KB, created by
Matt Blenkinsop
on 2023-08-31 15:26:02 UTC
(
hide
)
Description:
Bug 33766: (follow-up) Fix ambiguous "Login" field
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2023-08-31 15:26:02 UTC
Size:
14.49 KB
patch
obsolete
>From 51561f725ce94ac4782e3d5ca571cb1dadb416ee Mon Sep 17 00:00:00 2001 >From: Paul Derscheid <paul.derscheid@lmscloud.de> >Date: Thu, 17 Aug 2023 14:48:33 +0000 >Subject: [PATCH] Bug 33766: (follow-up) Fix ambiguous "Login" field > >This follow-up fixes some problems w/ the unconventional >parts of the first commit. We now use conditionals in >a BLOCK to map the selected value from the preference >to string representations which should now be easily >translatable. > >To test: >- Check that the label for > - The masthead inc > - The opac-auth template > - The opac-main template > - The opac-password-recovery template > - The opac-registration-confirmation template > - The opac-reset-password template > - The sco-main template > reflect the changes you made to the syspref > >Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >--- > ...-a11y_fix_ambiguous_form-field_in_opac-auth.tt.pl} | 2 +- > installer/data/mysql/mandatory/sysprefs.sql | 2 +- > .../prog/en/modules/admin/preferences/opac.pref | 7 +++---- > .../opac-tmpl/bootstrap/en/includes/html_helpers.inc | 11 +++++++++++ > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- > .../bootstrap/en/modules/opac-password-recovery.tt | 3 ++- > .../en/modules/opac-registration-confirmation.tt | 3 ++- > .../bootstrap/en/modules/opac-reset-password.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 ++- > 11 files changed, 26 insertions(+), 13 deletions(-) > rename installer/data/mysql/atomicupdate/{bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt => bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt.pl} (89%) > >diff --git a/installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt b/installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt.pl >similarity index 89% >rename from installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt >rename to installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt.pl >index 3bb5322875..290103bd97 100755 >--- a/installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt >+++ b/installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt.pl >@@ -9,7 +9,7 @@ return { > > # Do you stuffs here > $dbh->do( >- q{INSERT IGNORE INTO systempreferences (variable,value) VALUES ('OPACLoginLabelTextContent','Cardnumber') } >+ q{INSERT IGNORE INTO systempreferences (variable,value) VALUES ('OPACLoginLabelTextContent','cardnumber') } > ); > > # sysprefs >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 33defae080..640812477a 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -473,7 +473,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'), > ('OpacLocationBranchToDisplay','holding','holding|home|both','In the OPAC, under location show which branch for Location in the record details.','Choice'), > ('OpacLocationOnDetail','holding','holding|home|both|column','In the OPAC detail, display the shelving location on its own column or under a library columns.', 'Choice'), >-('OPACLoginLabelTextContent','Cardnumber',NULL,NULL,NULL), >+('OPACLoginLabelTextContent','cardnumber',NULL,NULL,NULL), > ('OPACMandatoryHoldDates', '', '|start|end|both', 'Define which hold dates are required on OPAC reserve form', 'Choice'), > ('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'), > ('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index 433f078468..3f76a76550 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -176,9 +176,9 @@ OPAC: > - pref: OPACLoginLabelTextContent > default: Cardnumber > choices: >- Cardnumber: Cardnumber >- Username: Username >- "Cardnumber or Username": Cardnumber or Username >+ cardnumber: Cardnumber >+ username: Username >+ cardnumberorusername: Cardnumber or Username > - "as the text content of the userid input field's label." > - > - pref: OPACShowMusicalInscripts >@@ -537,7 +537,6 @@ OPAC: > type: textarea > syntax: text/html > class: code >- > - > - pref: OpacBrowseSearch > default: 0 >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc >index e0b7a8edd4..a1eb43885f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc >@@ -103,3 +103,14 @@ > [% content| $raw %] > </div> > [% END %] >+ >+[% BLOCK login_label %] >+ [%- SET preference_value = Koha.Preference('OPACLoginLabelTextContent') %] >+ [%- SET label = "Cardnumber" %] >+ [%- IF preference_value == "username" %] >+ [%- SET label = "Username" %] >+ [%- ELSIF preference_value == "cardnumberorusername" %] >+ [%- SET label = "Cardnumber or Username" %] >+ [%- END %] >+ <label for="[% for | html %]">[% label | html %]:</label> >+[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 63074fd184..c88e952fbd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -412,7 +412,7 @@ > <input type="hidden" name="koha_login_context" value="opac" /> > <fieldset class="brief"> > <div class="local-login"> >- <label for="muserid">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label><input type="text" id="muserid" name="userid" autocomplete="off" /> >+ [% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="userid" autocomplete="off" /> > <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" /> > <fieldset class="action"> > <input type="submit" class="btn btn-primary" value="Log in" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index 1e3c056bca..1745ec60e1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -223,7 +223,7 @@ > <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" /> > [% END %] > <div class="form-group"> >- <label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for="userid" %] > <input class="form-control" type="text" size="25" id="userid" name="userid" autocomplete="off" /> > </div> > <div class="form-group"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index fe18a7fb87..4a7221b67a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -205,7 +205,7 @@ > <p>If you do not have an external account, but do have a local account, you can still log in: </p> > [% END # /IF identity_providers.size %] > <div class="local-login"> >- <label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for='userid' %] > <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" /> > <label for="password">Password:</label> > <input class="form-control" type="password" id="password" name="password" autocomplete="off" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >index 7be362e0f0..5d143b79bf 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >@@ -1,6 +1,7 @@ > [% USE Koha %] > [% USE Categories %] > [% USE AdditionalContents %] >+[% PROCESS 'html_helpers.inc' %] > [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] > [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -125,7 +126,7 @@ > <p>To reset your password, enter your login or your email address.</p> > <fieldset class="brief"> > <div class="form-group"> >- <label for="username">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for="username" %] > <input class="form-control" type="text" id="username" size="40" name="username" value="[% username | html %]" /> > </div> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >index 652f65c2e0..ada0492aec 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Koha %] > [% USE AdditionalContents %] >+[% PROCESS 'html_helpers.inc' %] > [% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => logged_in_user.branchcode || default_branch ) %] > [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] > [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] >@@ -86,7 +87,7 @@ > <input type="hidden" name="koha_login_context" value="opac" /> > <fieldset class="brief"> > <legend>Log in to your account:</legend> >- <label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for="userid" %] > [% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %] > <input class="form-control" type="text" id="userid" size="10" name="userid" value="[% borrower.userid | html %]" autocomplete="off" /> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt >index ea74b7d162..a086366206 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt >@@ -79,7 +79,7 @@ > > <fieldset class="brief"> > <div class="form-group"> >- <label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for="userid" %] > <input class="form-control" autocomplete="off" type="text" size="25" id="userid" name="userid" /> > </div> > <div class="form-group"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index e75dc30405..66d7bfe34e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -5,6 +5,7 @@ > [% USE AudioAlerts %] > [% USE To %] > [% USE Price %] >+[% PROCESS 'html_helpers.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Self checkout › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >@@ -406,7 +407,7 @@ > <fieldset> > [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] > <legend>Log in to your account</legend> >- <label for="patronlogin">[% Koha.Preference('OPACLoginLabelTextContent') | html %]:</label> >+ [% PROCESS login_label for="patronlogin" %] > <input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/> > <label for="patronpw">Password:</label> > <input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/> >-- >2.37.1 (Apple Git-137.1)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=155018">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33766
:
151416
|
151427
|
154566
|
154567
|
154570
|
155017
|
155018
|
155019
|
155022
|
155023
|
155024
|
155025
|
155026
|
157854
|
157855
|
157856
|
157857
|
157858
|
159342
|
159546
|
159547
|
159548
|
159549
|
159550
|
168600
|
168601
|
168602
|
168603
|
168604
|
168605
|
173757
|
173758
|
173759
|
173760
|
173761
|
173762
|
173972
|
173973
|
173974
|
173975
|
173976
|
173977
|
174037
|
174038
|
174039
|
174040
|
174041
|
174042