diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css index 82fd3f8cd..de80284a0 100644 --- a/webapp/web/css/login.css +++ b/webapp/web/css/login.css @@ -42,6 +42,25 @@ p.request-account { } #login-form p.external-auth { margin-left: 36px; + margin-top: 1em; +} +.or-auth{ + margin-left: 135px; + width: 30px; + height: 30px; + background: #fff 0 0 url(../images/login-or.png) no-repeat; + margin-bottom: 0; + padding-left: 8px; + padding-top: 5px; + color: #fff; + font-size: .8em; +} +h3.internal-auth{ + margin-left: 38px; + color: #5F6464; + font-size: 1em; + margin-bottom: 0; + padding-bottom: 0; } #error-alert{ color: #900; diff --git a/webapp/web/images/login-or.png b/webapp/web/images/login-or.png new file mode 100644 index 000000000..45a3317d3 Binary files /dev/null and b/webapp/web/images/login-or.png differ diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js index 26c024026..e0848fc14 100644 --- a/webapp/web/js/login/loginUtils.js +++ b/webapp/web/js/login/loginUtils.js @@ -9,10 +9,9 @@ $(document).ready(function(){ $('.focus').focus(); // fade out error alerts - //$('#error-alert').css('display', 'none'); - //$('#error-alert).fadeIn(500); - -}); - - - + $('section#error-alert').css('display', 'none').fadeIn(1500); + + // fade out 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 f5ea179c8..f696cade8 100644 --- a/webapp/web/templates/freemarker/widgets/widget-login.ftl +++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl @@ -29,12 +29,22 @@ #if> <#if errorMessage??> -
${errorMessage}
-or
+ +