From d7209cf2d868539a377d2ad280702567f012f4a6 Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 14 Jan 2011 22:00:30 +0000 Subject: [PATCH] Changed loginUtils.js to the head and change comment for fading error alerts to fade IN --- webapp/web/js/login/loginUtils.js | 4 ++-- webapp/web/templates/freemarker/widgets/widget-login.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js index e0848fc14..1c46d8d7b 100644 --- a/webapp/web/js/login/loginUtils.js +++ b/webapp/web/js/login/loginUtils.js @@ -8,10 +8,10 @@ $(document).ready(function(){ // focus on email or newpassword field $('.focus').focus(); - // fade out error alerts + // fade in error alerts $('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); }); \ No newline at end of file diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl index d013a04a9..3941f3a39 100644 --- a/webapp/web/templates/freemarker/widgets/widget-login.ftl +++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl @@ -7,8 +7,8 @@ See NIHVIVO-1357. This test does nothing, since user has not been put into the data model. <#if ! user.loggedIn> --> ${stylesheets.add("/css/login.css")} - ${scripts.add("/js/login/loginUtils.js")} - <#-- ${headScripts.add("")} --> + <#-- ${scripts.add("")} --> + ${headScripts.add("/js/login/loginUtils.js")} <#-- -->