From 0d78f1f1f0669f8d80edd1d618596383c94c0dfd Mon Sep 17 00:00:00 2001 From: nac26 Date: Mon, 24 Jan 2011 18:26:51 +0000 Subject: [PATCH] Moved fade-in for flash-message to vitroUtils.js since this behavior should apply throughout the app and should not be limited only to pages that include the login widget. --- webapp/web/js/login/loginUtils.js | 5 +---- webapp/web/js/vitroUtils.js | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js index 9aa279de9..06df844a9 100644 --- a/webapp/web/js/login/loginUtils.js +++ b/webapp/web/js/login/loginUtils.js @@ -9,9 +9,6 @@ $(document).ready(function(){ $('.focus').focus(); // fade in error alerts - $('section#error-alert').css('display', 'none').fadeIn(1500); - - // fade in fash-message when user log out - $('section#flash-message').css('display', 'none').fadeIn(1500); + $('section#error-alert').css('display', 'none').fadeIn(1500); }); \ No newline at end of file diff --git a/webapp/web/js/vitroUtils.js b/webapp/web/js/vitroUtils.js index 164a0a975..d84d8bcbd 100755 --- a/webapp/web/js/vitroUtils.js +++ b/webapp/web/js/vitroUtils.js @@ -5,4 +5,6 @@ $(document).ready(function(){ // fade out welcome-message when user logs in $('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); + // fade in flash-message when user logs out + $('section#flash-message').css('display', 'none').fadeIn(1500); }); \ No newline at end of file