Attachment #174038 for bug #33766

View | Details | Raw Unified | Return to bug 33766
Collapse All | Expand All

Lines 9-15 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_33766-a11y_fix_ambiguous_form-field_in_opac-auth.tt (-1 / +1 lines)
9		9
10	# Do you stuffs here	10	# Do you stuffs here
11	$dbh->do(	11	$dbh->do(
12	q{INSERT IGNORE INTO systempreferences (variable,value) VALUES ('OPACLoginLabelTextContent','Cardnumber') }	12	q{INSERT IGNORE INTO systempreferences (variable,value) VALUES ('OPACLoginLabelTextContent','cardnumber') }
13	);	13	);
14		14
15	# sysprefs	15	# sysprefs




            - pref: OPACLoginLabelTextContent
              default: Cardnumber
              choices:
                  cardnumber: Cardnumber
                  username: Username
                  cardnumberorusername: Cardnumber or Username
            - "as the text content of the userid input field's label."
        -
            - pref: OPACShowMusicalInscripts

              type: textarea
              syntax: text/html
              class: code

        -
            - pref: OpacBrowseSearch
              default: 0




        [% t("Koha online catalog") | html %]
    [% END %]
[% 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 %]

Lines 438-444 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +1 lines)
438	<input type="hidden" name="koha_login_context" value="opac" />	438	<input type="hidden" name="koha_login_context" value="opac" />
439	<fieldset class="brief">	439	<fieldset class="brief">
440	<div class="local-login">	440	<div class="local-login">
441	<label for="muserid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label><input type="text" id="muserid" name="login_userid" autocomplete="off" />	441	[% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="login_userid" autocomplete="off" />
442	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="login_password" autocomplete="off" />	442	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="login_password" autocomplete="off" />
443	<fieldset class="action">	443	<fieldset class="action">
444	<input type="hidden" name="op" value="cud-login" />	444	<input type="hidden" name="op" value="cud-login" />

Lines 242-248 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-1 / +1 lines)
242	<input type="hidden" name="[% INPUT.name \| html %]" value="[% INPUT.value \| html %]" />	242	<input type="hidden" name="[% INPUT.name \| html %]" value="[% INPUT.value \| html %]" />
243	[% END %]	243	[% END %]
244	<div class="form-group">	244	<div class="form-group">
245	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	245	[% PROCESS login_label for="userid" %]
246	<input class="form-control" type="text" size="25" id="userid" name="login_userid" autocomplete="off" />	246	<input class="form-control" type="text" size="25" id="userid" name="login_userid" autocomplete="off" />
247	</div>	247	</div>
248	<div class="form-group">	248	<div class="form-group">

Lines 200-206 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
200	<p>If you do not have an external account, but do have a local account, you can still log in: </p>	200	<p>If you do not have an external account, but do have a local account, you can still log in: </p>
201	[% END # /IF identity_providers.size %]	201	[% END # /IF identity_providers.size %]
202	<div class="local-login">	202	<div class="local-login">
203	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	203	[% PROCESS login_label for='userid' %]
204	<input class="form-control" type="text" id="userid" name="login_userid" autocomplete="off" />	204	<input class="form-control" type="text" id="userid" name="login_userid" autocomplete="off" />
205	<label for="password">Password:</label>	205	<label for="password">Password:</label>
206	<input class="form-control" type="password" id="password" name="login_password" autocomplete="off" />	206	<input class="form-control" type="password" id="password" name="login_password" autocomplete="off" />

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-1 / +2 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE Categories %]	3	[% USE Categories %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
		5	[% PROCESS 'html_helpers.inc' %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]	7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
Lines 132-138 Link Here
132	<p>To reset your password, enter your login or your email address.</p>	133	<p>To reset your password, enter your login or your email address.</p>
133	<fieldset class="brief">	134	<fieldset class="brief">
134	<div class="form-group">	135	<div class="form-group">
135	<label for="username">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	136	[% PROCESS login_label for="username" %]
136	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />	137	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />
137	</div>	138	</div>
138		139

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt (-1 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
		4	[% PROCESS 'html_helpers.inc' %]
4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => logged_in_user.branchcode \|\| default_branch ) %]	5	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => logged_in_user.branchcode \|\| default_branch ) %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]	7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
Lines 109-115 Link Here
109	<input type="hidden" name="op" value="cud-login">	110	<input type="hidden" name="op" value="cud-login">
110	<fieldset class="brief">	111	<fieldset class="brief">
111	<legend>Log in to your account:</legend>	112	<legend>Log in to your account:</legend>
112	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	113	[% PROCESS login_label for="userid" %]
113	[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]	114	[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
114	<input class="form-control" type="text" id="userid" size="10" name="login_userid" value="[% borrower.userid \| html %]" autocomplete="off" />	115	<input class="form-control" type="text" id="userid" size="10" name="login_userid" value="[% borrower.userid \| html %]" autocomplete="off" />
115	[% ELSE %]	116	[% ELSE %]

Lines 75-81 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt (-1 / +1 lines)
75		75
76	<fieldset class="brief">	76	<fieldset class="brief">
77	<div class="form-group">	77	<div class="form-group">
78	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	78	[% PROCESS login_label for="userid" %]
79	<input class="form-control" autocomplete="off" type="text" size="25" id="userid" name="userid" />	79	<input class="form-control" autocomplete="off" type="text" size="25" id="userid" name="userid" />
80	</div>	80	</div>
81	<div class="form-group">	81	<div class="form-group">

Lines 8-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-2 / +2 lines)
8	[% USE AdditionalContents %]	8	[% USE AdditionalContents %]
9	[% USE Branches %]	9	[% USE Branches %]
10	[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]	10	[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
		11	[% PROCESS 'html_helpers.inc' %]
11	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha [% END %]</title>	13	<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha [% END %]</title>
13	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	14	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 466-472 Link Here
466	<fieldset>	467	<fieldset>
467	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]	468	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
468	<legend>Log in to your account</legend>	469	<legend>Log in to your account</legend>
469	<label for="patronlogin">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	470	[% PROCESS login_label for="patronlogin" %]
470	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>	471	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>
471	<label for="patronpw">Password:</label>	472	<label for="patronpw">Password:</label>
472	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>	473	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>
473	-

Return to bug 33766

Lines 186-194 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-4 / +3 lines)
186	- pref: OPACLoginLabelTextContent	186	- pref: OPACLoginLabelTextContent
187	default: Cardnumber	187	default: Cardnumber
188	choices:	188	choices:
189	Cardnumber: Cardnumber	189	cardnumber: Cardnumber
190	Username: Username	190	username: Username
191	"Cardnumber or Username": Cardnumber or Username	191	cardnumberorusername: Cardnumber or Username
192	- "as the text content of the userid input field's label."	192	- "as the text content of the userid input field's label."
193	-	193	-
194	- pref: OPACShowMusicalInscripts	194	- pref: OPACShowMusicalInscripts
Lines 542-548 OPAC: Link Here
542	type: textarea	542	type: textarea
543	syntax: text/html	543	syntax: text/html
544	class: code	544	class: code
545
546	-	545	-
547	- pref: OpacBrowseSearch	546	- pref: OpacBrowseSearch
548	default: 0	547	default: 0

Lines 176-178 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc (+11 lines)
176	[% t("Koha online catalog") \| html %]	176	[% t("Koha online catalog") \| html %]
177	[% END %]	177	[% END %]
178	[% END %]	178	[% END %]
		179
		180	[% BLOCK login_label %]
		181	[%- SET preference_value = Koha.Preference('OPACLoginLabelTextContent') %]
		182	[%- SET label = "Cardnumber" %]
		183	[%- IF preference_value == "username" %]
		184	[%- SET label = "Username" %]
		185	[%- ELSIF preference_value == "cardnumberorusername" %]
		186	[%- SET label = "Cardnumber or Username" %]
		187	[%- END %]
		188	<label for="[% for \| html %]">[% label \| html %]:</label>
		189	[% END %]