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

Worked on styling login widget for Wilma theme

Browse source
This commit is contained in:
mb863 2010-11-19 20:54:16 +00:00
parent a3b8550e29
commit 6196d46d60
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,16 @@
$(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(); $("#loginFormAndLinks").show();
// focus on email or newpassword field // focus on email or newpassword field
$('.focus').focus(); $('.focus').focus();
}); });
// fade out error alerts
$('#errorAlert').css('display', 'none');
$('#errorAlert').fadeIn(2900);

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

@ -31,7 +31,7 @@
</#if> </#if>
<#if errorMessage??> <#if errorMessage??>
<div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/> <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>
@ -47,11 +47,12 @@
<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>
<p class="forgot-password"><a href="#">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#">Request an account</a> </p>
</form> </form>
<p class="forgot-password"><a href="#">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#">Request an account</a> </p>
</section><!-- #log-in --> </section><!-- #log-in -->
</#macro> </#macro>
@ -67,14 +68,14 @@
<form role="form" id="log-in-form" action="${formAction}" method="post" name="log-in-form" required /> <form role="form" id="log-in-form" action="${formAction}" method="post" name="log-in-form" required />
<label for="newPassword">New Password</label> <label for="newPassword">New Password</label>
<input id="newPassword" class="focus" type="password" name="newPassword" required /> <input id="newPassword" class="focus text-field" type="password" name="newPassword" required />
<p class="passwordNote">Minimum of 6 characters in length.</p> <p class="passwordNote">Minimum of 6 characters in length.</p>
<label for="confirmPassword">Confirm Password</label> <label for="confirmPassword">Confirm Password</label>
<input id="confirmPassword" type="password" name="confirmPassword" /> <input id="confirmPassword" class="text-field" type="password" name="confirmPassword" />
<p class="submit"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p> <p class="submit-password"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p>
</form> </form>
</section> </section>
</#macro> </#macro>