Attachment #171803 for bug #30088

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

Lines 794-800 th { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (-3 / +19 lines)
794	color: #C00;	794	color: #C00;
795	display: block;	795	display: block;
796	font-size: 95%;	796	font-size: 95%;
797	margin-left: 10rem;
798	margin-top: 3px;	797	margin-top: 3px;
799	}	798	}
800	}	799	}
Lines 1018-1023 fieldset { Link Here
1018	display: block;	1017	display: block;
1019	margin-left: 10rem;	1018	margin-left: 10rem;
1020	}	1019	}
		1020
		1021	.required_label {
		1022	&.required {
		1023	margin-left: 10rem;
		1024	}
		1025	}
1021	}	1026	}
1022		1027
1023	div {	1028	div {
Lines 1680-1685 nav { Link Here
1680	margin-bottom: 1rem;	1685	margin-bottom: 1rem;
1681	}	1686	}
1682		1687
		1688	#password_recovery_login,
		1689	#password_recovery_email,
		1690	#password_recovery_submit {
		1691	padding: 1rem;
		1692	}
		1693
1683	#password_recovery_options {	1694	#password_recovery_options {
1684	background-color: #F0F3F3;	1695	background-color: #F0F3F3;
1685	display: flex;	1696	display: flex;
Lines 1688-1695 nav { Link Here
1688	padding: 1rem;	1699	padding: 1rem;
1689	}	1700	}
1690		1701
1691	#use_login a,	1702	#use_login,
1692	#use_email a {	1703	#use_email {
1693	background-color: #FFF;	1704	background-color: #FFF;
1694	border: 1px solid #0074AD;	1705	border: 1px solid #0074AD;
1695	border-radius: 10px;	1706	border-radius: 10px;
Lines 1697-1702 nav { Link Here
1697	font-size: 130%;	1708	font-size: 130%;
1698	padding: 1rem;	1709	padding: 1rem;
1699	white-space: nowrap;	1710	white-space: nowrap;
		1711
		1712	&.select-login-active {
		1713	background-color: #0074AD;
		1714	color: #FFF;
		1715	}
1700	}	1716	}
1701		1717
1702	#renewcontrols {	1718	#renewcontrols {




                            [% INCLUDE 'csrf-token.inc' %]
                            <legend class="sr-only">Password recovery</legend>
                            <input type="hidden" name="koha_login_context" value="opac" />
                            [% UNLESS ( errMultipleAccountsForEmail ) %]
                                <p id="password_recovery_msg">To reset your password, enter your login or your email address.</p>
                            [% END %]
                            <fieldset class="brief">

                                <div id="password_recovery_options">
                                    <a id="use_login" href="#"><i class="fa fa-user" aria-hidden="true"></i> I know my login</a>
                                    <a id="use_email" href="#"><i class="fa fa-envelope" aria-hidden="true"></i> I know my email address</a>
                                    </div>
                                    <div id="use_email">
                                        <a href="#"><i class="fa fa-envelope" aria-hidden="true"></i> I know my email address</a>
                                    </div>
                                </div>

                                <div class="form-row" id="password_recovery_login" style="display:none">
                                    <div class="col-md-6">
                                        [% IF ( errMultipleAccountsForEmail ) %]
                                            <label for="username" class="required">Login:</label>
                                            <input class="form-control required" required="required" type="text" id="username" size="40" name="username" value="[% username | html %]" />
                                            <div class="required_label required">Required</div>
                                        [% ELSE %]
                                            <label for="username">Login:</label>
                                            <input class="form-control" type="text" id="username" size="40" name="username" value="[% username | html %]" />
                                        [% END %]
                                    </div>
                                </div>

                                <div class="form-row" id="password_recovery_email" style="display:none">
                                    <div class="col-md-6">
                                        [% IF ( errMultipleAccountsForEmail ) %]
                                            <label for="email" class="required">Email:</label>
                                            <input class="form-control required" required="required" type="text" id="email" size="40" name="email" value="[% email | html %]" />
                                            <div class="required_label required">Required</div>
                                        [% ELSE %]
                                            <label for="email">Email:</label>
                                            <input class="form-control" type="text" id="email" size="40" name="email" value="[% email | html %]" />
                                        [% END %]
                                    </div>
                                </div>
                                <fieldset class="action" id="password_recovery_submit" style="display:none">

            [% END %]

            $("#use_email").on("click", function(){
                $("#use_login").removeClass("select-login-active");
                $(this).addClass("select-login-active");
                $("#username").val("");
                $("#password_recovery_login, #password_recovery_msg").hide();
                $("#password_recovery_email, #password_recovery_submit").show();
                $("#email").focus();
            });

            $("#use_login").on("click", function(){
                $("#use_email").removeClass("select-login-active");
                $(this).addClass("select-login-active");
                $("#email").val("");
                $("#password_recovery_email, #password_recovery_msg").hide();
                $("#password_recovery_login, #password_recovery_submit").show();
                $("#username").focus();
            });

            $(".password_recovery_cancel").on("click", function(){
                $("#password_recovery_options, #password_recovery_msg").show();
                $("#password_recovery_login, #password_recovery_email, #password_recovery_submit").hide();
            });
        })
- 

Return to bug 30088

Lines 88-116 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (-15 / +28 lines)
88	[% INCLUDE 'csrf-token.inc' %]	88	[% INCLUDE 'csrf-token.inc' %]
89	<legend class="sr-only">Password recovery</legend>	89	<legend class="sr-only">Password recovery</legend>
90	<input type="hidden" name="koha_login_context" value="opac" />	90	<input type="hidden" name="koha_login_context" value="opac" />
91	<p>To reset your password, enter your login or your email address.</p>	91	[% UNLESS ( errMultipleAccountsForEmail ) %]
		92	<p id="password_recovery_msg">To reset your password, enter your login or your email address.</p>
		93	[% END %]
92	<fieldset class="brief">	94	<fieldset class="brief">
93		95
94	<div id="password_recovery_options">	96	<div id="password_recovery_options">
95	<div id="use_login">	97	<a id="use_login" href="#"><i class="fa fa-user" aria-hidden="true"></i> I know my login</a>
96	<a href="#"><i class="fa fa-user" aria-hidden="true"></i> I know my login</a>	98	<a id="use_email" href="#"><i class="fa fa-envelope" aria-hidden="true"></i> I know my email address</a>
97	</div>
98	<div id="use_email">
99	<a href="#"><i class="fa fa-envelope" aria-hidden="true"></i> I know my email address</a>
100	</div>
101	</div>	99	</div>
102		100
103	<div class="form-row" id="password_recovery_login" style="display:none">	101	<div class="form-row" id="password_recovery_login" style="display:none">
104	<div class="col-md-6">	102	<div class="col-md-6">
105	<label for="username">Login:</label>	103	[% IF ( errMultipleAccountsForEmail ) %]
106	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />	104	<label for="username" class="required">Login:</label>
		105	<input class="form-control required" required="required" type="text" id="username" size="40" name="username" value="[% username \| html %]" />
		106	<div class="required_label required">Required</div>
		107	[% ELSE %]
		108	<label for="username">Login:</label>
		109	<input class="form-control" type="text" id="username" size="40" name="username" value="[% username \| html %]" />
		110	[% END %]
107	</div>	111	</div>
108	</div>	112	</div>
109		113
110	<div class="form-row" id="password_recovery_email" style="display:none">	114	<div class="form-row" id="password_recovery_email" style="display:none">
111	<div class="col-md-6">	115	<div class="col-md-6">
112	<label for="email">Email:</label>	116	[% IF ( errMultipleAccountsForEmail ) %]
113	<input class="form-control" type="text" id="email" size="40" name="email" value="[% email \| html %]" />	117	<label for="email" class="required">Email:</label>
		118	<input class="form-control required" required="required" type="text" id="email" size="40" name="email" value="[% email \| html %]" />
		119	<div class="required_label required">Required</div>
		120	[% ELSE %]
		121	<label for="email">Email:</label>
		122	<input class="form-control" type="text" id="email" size="40" name="email" value="[% email \| html %]" />
		123	[% END %]
114	</div>	124	</div>
115	</div>	125	</div>
116	<fieldset class="action" id="password_recovery_submit" style="display:none">	126	<fieldset class="action" id="password_recovery_submit" style="display:none">
Lines 209-229 Link Here
209	[% END %]	219	[% END %]
210		220
211	$("#use_email").on("click", function(){	221	$("#use_email").on("click", function(){
		222	$("#use_login").removeClass("select-login-active");
		223	$(this).addClass("select-login-active");
212	$("#username").val("");	224	$("#username").val("");
213	$("#password_recovery_login").hide();	225	$("#password_recovery_login, #password_recovery_msg").hide();
214	$("#password_recovery_email, #password_recovery_submit").show();	226	$("#password_recovery_email, #password_recovery_submit").show();
215	$("#email").focus();	227	$("#email").focus();
216	});	228	});
217		229
218	$("#use_login").on("click", function(){	230	$("#use_login").on("click", function(){
		231	$("#use_email").removeClass("select-login-active");
		232	$(this).addClass("select-login-active");
219	$("#email").val("");	233	$("#email").val("");
220	$("#password_recovery_email").hide();	234	$("#password_recovery_email, #password_recovery_msg").hide();
221	$("#password_recovery_login, #password_recovery_submit").show();	235	$("#password_recovery_login, #password_recovery_submit").show();
222	$("#username").focus();	236	$("#username").focus();
223	});	237	});
224		238
225	$(".password_recovery_cancel").on("click", function(){	239	$(".password_recovery_cancel").on("click", function(){
226	$("#password_recovery_options").show();	240	$("#password_recovery_options, #password_recovery_msg").show();
227	$("#password_recovery_login, #password_recovery_email, #password_recovery_submit").hide();	241	$("#password_recovery_login, #password_recovery_email, #password_recovery_submit").hide();
228	});	242	});
229	})	243	})
230	-