From 0329dc7cc04d9d561a659b771281c9b4af67eb3c Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 21 Dec 2010 15:11:50 +0000
Subject: [PATCH] NIHVIVO-1492:  Style external authentication in the VITRO
 core when active

---
 webapp/web/css/login.css                      |  19 +++++++++++++++
 webapp/web/images/login-or.png                | Bin 0 -> 481 bytes
 webapp/web/js/login/loginUtils.js             |  13 +++++-----
 .../freemarker/widgets/widget-login.ftl       |  23 ++++++++++--------
 4 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 webapp/web/images/login-or.png

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 0000000000000000000000000000000000000000..45a3317d3ca4f94ee3909543654108f6ca966666
GIT binary patch
literal 481
zcmV<70UrK|P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzgGod|RCwCNmmzP1Kp2MCX1WSN>ShQM
zjiJdzZ3W4YmHP+%1ru`<6O+x<mQ>VMENKmH36k&wx(ZbP0DHgegIqT5VC~)YOP(gA
z$M@to4qgUTRb5@8uIcA}wdxu-0uvB|0C>RV{|=x48A!nv997Nk;`m3bC<i1U29adU
z4KwBA9iW-Kfl@hRNl~MFF#G3KjF?;S0yb@fhLV%#;OPXZSTpW1?>l1}_yEQl?jfIh
zQ7u(7rpvp~B&}=AJ*P6U!)xjr*gZb?cG|?rnQPi-&6D5a5pNmO6|<`mPZax9XGQF4
z#G%EfWhjaRi{d~Odlto>D0VH1UDYGgcnyVDo2@#C;=-c15XG5AaVCmWi{exiZ#g-b
zt{uA?@sZ<-=~~r!Ox#YCk=6#KYj*s3EtZ^-as$$wdzZ2VLc#12>@`aF+;h{Fx$11R
z(2z!QmM;6oTN?OvV!RdCR2pwpxtdP+1RouNzHQ5#73k|5?isx5{Dh$zT<W9kTYv!o
Xvu9BjpkTp*00000NkvXXu0mjfvS8Md

literal 0
HcmV?d00001

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??>
-            <div id="error-alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon"/>
+            <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
                 <p>${errorMessage}</p>
-            </div>
+            </section>
         </#if>
        
         <form  role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
+            <#if externalAuthUrl??>
+                <p class="external-auth">
+                    <a class="blue button" href="${externalAuthUrl}">${externalAuthName}</a>
+                </p>
+                
+            </#if>
+            <p class="or-auth">or</p>
+            
+            <h3 class="internal-auth" >Login using a different account</h3>
+            
             <label for="email">Email</label>
             <input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required />
 
@@ -47,14 +57,7 @@
             <label class="label-remember-me" for="remember-me">Remember me</label> -->
             <#-- mb863: forgot password and request an account won't be part of VIVO r1.2
             <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> -->    
-                            
-            <#if externalAuthUrl??>
-                <p class="external-auth">
-                    <a class="green button" href="${externalAuthUrl}">${externalAuthName}</a>
-                </p>
-            </#if>
-
+            <p class="request-account"><a class="blue button" href="#">Request an account</a> </p> -->                       
         </form>
 
     </section><!-- #log-in -->