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

Changed loginUtils.js to the head and change comment for fading error alerts to fade IN

Browse source
This commit is contained in:
mb863 2011-01-14 22:00:30 +00:00
parent 2aee2e581c
commit d7209cf2d8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,10 +8,10 @@ $(document).ready(function(){
// focus on email or newpassword field // focus on email or newpassword field
$('.focus').focus(); $('.focus').focus();
// fade out error alerts // fade in error alerts
$('section#error-alert').css('display', 'none').fadeIn(1500); $('section#error-alert').css('display', 'none').fadeIn(1500);
// fade out fash-message when user log out // fade in fash-message when user log out
$('section#flash-message').css('display', 'none').fadeIn(1500); $('section#flash-message').css('display', 'none').fadeIn(1500);
}); });

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

@ -7,8 +7,8 @@
See NIHVIVO-1357. This test does nothing, since user has not been put into the data model. See NIHVIVO-1357. This test does nothing, since user has not been put into the data model.
<#if ! user.loggedIn> --> <#if ! user.loggedIn> -->
${stylesheets.add("/css/login.css")} ${stylesheets.add("/css/login.css")}
${scripts.add("/js/login/loginUtils.js")} <#-- ${scripts.add("")} -->
<#-- ${headScripts.add("")} --> ${headScripts.add("/js/login/loginUtils.js")}
<#-- </#if> --> <#-- </#if> -->
</#macro> </#macro>