From 6196d46d600129162360b0c771e6088062954737 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 19 Nov 2010 20:54:16 +0000
Subject: [PATCH] Worked on styling login widget for Wilma theme

---
 webapp/web/js/login/loginUtils.js                 | 14 ++++++++++----
 .../templates/freemarker/widgets/widget-login.ftl | 15 ++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js
index 8172f98e2..696065f89 100644
--- a/webapp/web/js/login/loginUtils.js
+++ b/webapp/web/js/login/loginUtils.js
@@ -2,10 +2,16 @@
 
 $(document).ready(function(){
 
-  // login form is hidden by default; use JavaScript to reveal
-  $("#loginFormAndLinks").show();
+    // login form is hidden by default; use JavaScript to reveal
+    $("#loginFormAndLinks").show();
   
-  // focus on email or newpassword field
-  $('.focus').focus();
+    // focus on email or newpassword field
+    $('.focus').focus();
 
 });
+
+// fade out error alerts
+$('#errorAlert').css('display', 'none');
+$('#errorAlert').fadeIn(2900);
+  
+
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 423fbfc12..25a7830fc 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -31,7 +31,7 @@
         </#if>
        
         <#if errorMessage??>
-            <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"  alert="Error alert icon"/>
+            <div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/>
                 <p>${errorMessage}</p>
             </div>
         </#if>
@@ -47,11 +47,12 @@
 
             <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />  
             <label class="label-remember-me" for="remember-me">Remember me</label>
+            
+            <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>
         </form>
 
-        <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>
-
     </section><!-- #log-in -->
 </#macro> 
 
@@ -67,14 +68,14 @@
            
             <form role="form" id="log-in-form" action="${formAction}" method="post" name="log-in-form" required />
                 <label for="newPassword">New Password</label>
-                <input id="newPassword" class="focus" type="password" name="newPassword"  required />
+                <input id="newPassword" class="focus text-field" type="password" name="newPassword"  required />
                 
                 <p class="passwordNote">Minimum of 6 characters in length.</p>
                 
                 <label for="confirmPassword">Confirm Password</label>
-                <input id="confirmPassword" type="password" name="confirmPassword"  />
+                <input id="confirmPassword" class="text-field" type="password" name="confirmPassword"  />
                 
-                 <p class="submit"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p>
+                 <p class="submit-password"><input name="passwordChangeForm" type="submit" class="green button" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span></p>
             </form>
     </section>
 </#macro>