Attachment #154570 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

Lines 473-479 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
473	('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),	473	('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),
474	('OpacLocationBranchToDisplay','holding','holding\|home\|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),	474	('OpacLocationBranchToDisplay','holding','holding\|home\|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),
475	('OpacLocationOnDetail','holding','holding\|home\|both\|column','In the OPAC detail, display the shelving location on its own column or under a library columns.', 'Choice'),	475	('OpacLocationOnDetail','holding','holding\|home\|both\|column','In the OPAC detail, display the shelving location on its own column or under a library columns.', 'Choice'),
476	('OPACLoginLabelTextContent','Cardnumber',NULL,NULL,NULL),	476	('OPACLoginLabelTextContent','cardnumber',NULL,NULL,NULL),
477	('OPACMandatoryHoldDates', '', '\|start\|end\|both', 'Define which hold dates are required on OPAC reserve form', 'Choice'),	477	('OPACMandatoryHoldDates', '', '\|start\|end\|both', 'Define which hold dates are required on OPAC reserve form', 'Choice'),
478	('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),	478	('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),
479	('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'),	479	('OpacMaintenanceNotice','','','A user-defined block of HTML to appear on screen when OpacMaintenace is enabled','Textarea'),




            - 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




        [% 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 %]

Lines 412-418 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +1 lines)
412	<input type="hidden" name="koha_login_context" value="opac" />	412	<input type="hidden" name="koha_login_context" value="opac" />
413	<fieldset class="brief">	413	<fieldset class="brief">
414	<div class="local-login">	414	<div class="local-login">
415	<label for="muserid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label><input type="text" id="muserid" name="userid" autocomplete="off" />	415	[% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="userid" autocomplete="off" />
416	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />	416	<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
417	<fieldset class="action">	417	<fieldset class="action">
418	<input type="submit" class="btn btn-primary" value="Log in" />	418	<input type="submit" class="btn btn-primary" value="Log in" />

Lines 223-229 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-1 / +1 lines)
223	<input type="hidden" name="[% INPUT.name \| html %]" value="[% INPUT.value \| html %]" />	223	<input type="hidden" name="[% INPUT.name \| html %]" value="[% INPUT.value \| html %]" />
224	[% END %]	224	[% END %]
225	<div class="form-group">	225	<div class="form-group">
226	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	226	[% PROCESS login_label for="userid" %]
227	<input class="form-control" type="text" size="25" id="userid" name="userid" autocomplete="off" />	227	<input class="form-control" type="text" size="25" id="userid" name="userid" autocomplete="off" />
228	</div>	228	</div>
229	<div class="form-group">	229	<div class="form-group">

Lines 205-211 Link Here

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

Lines 1-6 Link Here

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

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 86-92 Link Here
86	<input type="hidden" name="koha_login_context" value="opac" />	87	<input type="hidden" name="koha_login_context" value="opac" />
87	<fieldset class="brief">	88	<fieldset class="brief">
88	<legend>Log in to your account:</legend>	89	<legend>Log in to your account:</legend>
89	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	90	[% PROCESS login_label for="userid" %]
90	[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]	91	[% IF Koha.Preference('PatronSelfRegistrationPrefillForm') %]
91	<input class="form-control" type="text" id="userid" size="10" name="userid" value="[% borrower.userid \| html %]" autocomplete="off" />	92	<input class="form-control" type="text" id="userid" size="10" name="userid" value="[% borrower.userid \| html %]" autocomplete="off" />
92	[% ELSE %]	93	[% ELSE %]

Lines 79-85 Link Here

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

Lines 5-10 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-2 / +2 lines)
5	[% USE AudioAlerts %]	5	[% USE AudioAlerts %]
6	[% USE To %]	6	[% USE To %]
7	[% USE Price %]	7	[% USE Price %]
		8	[% PROCESS 'html_helpers.inc' %]
8	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
9	<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha [% END %]</title>	10	<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha [% END %]</title>
10	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	11	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 406-412 Link Here
406	<fieldset>	407	<fieldset>
407	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]	408	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
408	<legend>Log in to your account</legend>	409	<legend>Log in to your account</legend>
409	<label for="patronlogin">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	410	[% PROCESS login_label for="patronlogin" %]
410	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>	411	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>
411	<label for="patronpw">Password:</label>	412	<label for="patronpw">Password:</label>
412	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>	413	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>
413	-

Return to bug 33766

Lines 176-184 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-4 / +3 lines)
176	- pref: OPACLoginLabelTextContent	176	- pref: OPACLoginLabelTextContent
177	default: Cardnumber	177	default: Cardnumber
178	choices:	178	choices:
179	Cardnumber: Cardnumber	179	cardnumber: Cardnumber
180	Username: Username	180	username: Username
181	"Cardnumber or Username": Cardnumber or Username	181	cardnumberorusername: Cardnumber or Username
182	- "as the text content of the userid input field's label."	182	- "as the text content of the userid input field's label."
183	-	183	-
184	- pref: OPACShowMusicalInscripts	184	- pref: OPACShowMusicalInscripts
Lines 537-543 OPAC: Link Here
537	type: textarea	537	type: textarea
538	syntax: text/html	538	syntax: text/html
539	class: code	539	class: code
540
541	-	540	-
542	- pref: OpacBrowseSearch	541	- pref: OpacBrowseSearch
543	default: 0	542	default: 0

Lines 103-105 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc (+11 lines)
103	[% content\| $raw %]	103	[% content\| $raw %]
104	</div>	104	</div>
105	[% END %]	105	[% END %]
		106
		107	[% BLOCK login_label %]
		108	[%- SET preference_value = Koha.Preference('OPACLoginLabelTextContent') %]
		109	[%- SET label = "Cardnumber" %]
		110	[%- IF preference_value == "username" %]
		111	[%- SET label = "Username" %]
		112	[%- ELSIF preference_value == "cardnumberorusername" %]
		113	[%- SET label = "Cardnumber or Username" %]
		114	[%- END %]
		115	<label for="[% for \| html %]">[% label \| html %]:</label>
		116	[% END %]