Attachment #159547 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 489-495 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
489	('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),	489	('OPACLocalCoverImages','0','1','Display local cover images on OPAC search and details pages.','YesNo'),
490	('OpacLocationBranchToDisplay','holding','holding\|home\|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),	490	('OpacLocationBranchToDisplay','holding','holding\|home\|both','In the OPAC, under location show which branch for Location in the record details.','Choice'),
491	('OpacLocationOnDetail','holding','holding\|home\|both\|column','In the OPAC detail, display the shelving location on its own column or under a library columns.', 'Choice'),	491	('OpacLocationOnDetail','holding','holding\|home\|both\|column','In the OPAC detail, display the shelving location on its own column or under a library columns.', 'Choice'),
492	('OPACLoginLabelTextContent','Cardnumber',NULL,NULL,NULL),	492	('OPACLoginLabelTextContent','cardnumber',NULL,NULL,NULL),
493	('OPACMandatoryHoldDates', '', '\|start\|end\|both', 'Define which hold dates are required on OPAC reserve form', 'Choice'),	493	('OPACMandatoryHoldDates', '', '\|start\|end\|both', 'Define which hold dates are required on OPAC reserve form', 'Choice'),
494	('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),	494	('OpacMaintenance','0','','If ON, enables maintenance warning in OPAC','YesNo'),
495	('OpacMaxItemsToDisplay','50','','Max items to display at the OPAC on a biblio detail','Integer'),	495	('OpacMaxItemsToDisplay','50','','Max items to display at the OPAC on a biblio detail','Integer'),




            - 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




        </li>
    [% 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 426-432 Link Here

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

Lines 218-224 Link Here

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

Lines 197-203 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
197	<p>If you do not have an external account, but do have a local account, you can still log in: </p>	197	<p>If you do not have an external account, but do have a local account, you can still log in: </p>
198	[% END # /IF identity_providers.size %]	198	[% END # /IF identity_providers.size %]
199	<div class="local-login">	199	<div class="local-login">
200	<label for="userid">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	200	[% PROCESS login_label for='userid' %]
201	<input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />	201	<input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
202	<label for="password">Password:</label>	202	<label for="password">Password:</label>
203	<input class="form-control" type="password" id="password" name="password" autocomplete="off" />	203	<input class="form-control" type="password" id="password" name="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 121-127 Link Here
121	<p>To reset your password, enter your login or your email address.</p>	122	<p>To reset your password, enter your login or your email address.</p>
122	<fieldset class="brief">	123	<fieldset class="brief">
123	<div class="form-group">	124	<div class="form-group">
124	<label for="username">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	125	[% PROCESS login_label for="username" %]
125	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />	126	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />
126	</div>	127	</div>
127		128

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

Lines 74-80 Link Here

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




[% USE AudioAlerts %]
[% USE To %]
[% USE Price %]
[% PROCESS 'html_helpers.inc' %]
[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Self checkout &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

                                    <fieldset>
                                        [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
                                            <legend>Log in to your account</legend>
                                            [% 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"/>
- 

Return to bug 33766

Lines 170-178 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-4 / +3 lines)
170	- pref: OPACLoginLabelTextContent	170	- pref: OPACLoginLabelTextContent
171	default: Cardnumber	171	default: Cardnumber
172	choices:	172	choices:
173	Cardnumber: Cardnumber	173	cardnumber: Cardnumber
174	Username: Username	174	username: Username
175	"Cardnumber or Username": Cardnumber or Username	175	cardnumberorusername: Cardnumber or Username
176	- "as the text content of the userid input field's label."	176	- "as the text content of the userid input field's label."
177	-	177	-
178	- pref: OPACShowMusicalInscripts	178	- pref: OPACShowMusicalInscripts
Lines 526-532 OPAC: Link Here
526	type: textarea	526	type: textarea
527	syntax: text/html	527	syntax: text/html
528	class: code	528	class: code
529
530	-	529	-
531	- pref: OpacBrowseSearch	530	- pref: OpacBrowseSearch
532	default: 0	531	default: 0

Lines 168-170 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc (+11 lines)
168	</li>	168	</li>
169	[% END %]	169	[% END %]
170	[% END %]	170	[% END %]
		171
		172	[% BLOCK login_label %]
		173	[%- SET preference_value = Koha.Preference('OPACLoginLabelTextContent') %]
		174	[%- SET label = "Cardnumber" %]
		175	[%- IF preference_value == "username" %]
		176	[%- SET label = "Username" %]
		177	[%- ELSIF preference_value == "cardnumberorusername" %]
		178	[%- SET label = "Cardnumber or Username" %]
		179	[%- END %]
		180	<label for="[% for \| html %]">[% label \| html %]:</label>
		181	[% END %]

Lines 5-12 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-4 / +2 lines)
5	[% USE AudioAlerts %]	5	[% USE AudioAlerts %]
6	[% USE To %]	6	[% USE To %]
7	[% USE Price %]	7	[% USE Price %]
8	[% USE AdditionalContents %]	8	[% PROCESS 'html_helpers.inc' %]
9	[% SET SCOMainUserBlock = AdditionalContents.get( location => "SCOMainUserBlock", lang => lang, library => logged_in_user.branchcode \|\| default_branch, blocktitle => 0 ) %]
10	[% INCLUDE 'doc-head-open.inc' %]	9	[% INCLUDE 'doc-head-open.inc' %]
11	<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>
12	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	11	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 448-454 Link Here
448	<fieldset>	447	<fieldset>
449	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]	448	[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %]
450	<legend>Log in to your account</legend>	449	<legend>Log in to your account</legend>
451	<label for="patronlogin">[% Koha.Preference('OPACLoginLabelTextContent') \| html %]:</label>	450	[% PROCESS login_label for="patronlogin" %]
452	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>	451	<input type="text" id="patronlogin" class="focus noEnterSubmit" size="20" name="patronlogin" autocomplete="off"/>
453	<label for="patronpw">Password:</label>	452	<label for="patronpw">Password:</label>
454	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>	453	<input type="password" id="patronpw" size="20" name="patronpw" autocomplete="off"/>
455	-