litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1458 Login form is hidden once again if JavaScript is disabled. Autofocus on login form also makes a triumphant return.

Browse source
This commit is contained in:
nac26 2011-01-16 19:26:15 +00:00
parent c6afc196c8
commit 3a5a01ee57
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/js/login/loginUtils.js
View file

@ -3,7 +3,7 @@
$(document).ready(function(){ $(document).ready(function(){
// login form is hidden by default; use JavaScript to reveal // login form is hidden by default; use JavaScript to reveal
$("#loginFormAndLinks").show(); $("#login").removeClass('hidden');
// focus on email or newpassword field // focus on email or newpassword field
$('.focus').focus(); $('.focus').focus();

21
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -13,16 +13,15 @@
</#macro> </#macro>
<#macro loginForm> <#macro loginForm>
<noscript>
<section id="error-alert">
<img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
</section>
</noscript>
<section id="login"> <section id="login" class="hidden">
<h2>Log in</h2> <h2>Log in</h2>
<noscript>
<section id="error-alert">
<img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
</section>
</noscript>
<#if infoMessage??> <#if infoMessage??>
<h3>${infoMessage}</h3> <h3>${infoMessage}</h3>
@ -43,13 +42,13 @@
</#if> </#if>
<label for="email">Email</label> <label for="email">Email</label>
<input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required /> <input class="text-field focus" name="loginName" id="loginName" type="text" value="${loginName!}" required />
<label for="password">Password</label> <label for="password">Password</label>
<input class="text-field" name="loginPassword" id="password" type="password" required /> <input class="text-field" name="loginPassword" id="password" type="password" required />
<p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p> <p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p>
<#-- nac26: remember me won't be ready for r1.2 <#-- NC: remember me won't be ready for r1.2
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" /> <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<label class="label-remember-me" for="remember-me">Remember me</label> --> <label class="label-remember-me" for="remember-me">Remember me</label> -->
<#-- mb863: forgot password and request an account won't be part of VIVO r1.2 <#-- mb863: forgot password and request an account won't be part of VIVO r1.2
@ -72,7 +71,7 @@
<form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required /> <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required />
<label for="new-password">New Password</label> <label for="new-password">New Password</label>
<input id="new-password" class="focus text-field" type="password" name="newPassword" required /> <input id="new-password" class="text-field focus" type="password" name="newPassword" required />
<p class="password-note">Minimum of 6 characters in length.</p> <p class="password-note">Minimum of 6 characters in length.</p>