From 3a5a01ee5799be1f8826c5fe801c9498ab9d4eb5 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sun, 16 Jan 2011 19:26:15 +0000
Subject: [PATCH] NIHVIVO-1458 Login form is hidden once again if JavaScript is
 disabled. Autofocus on login form also makes a triumphant return.

---
 webapp/web/js/login/loginUtils.js             |  2 +-
 .../freemarker/widgets/widget-login.ftl       | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/webapp/web/js/login/loginUtils.js b/webapp/web/js/login/loginUtils.js
index 1c46d8d7b..9fa54dee2 100644
--- a/webapp/web/js/login/loginUtils.js
+++ b/webapp/web/js/login/loginUtils.js
@@ -3,7 +3,7 @@
 $(document).ready(function(){
 
     // login form is hidden by default; use JavaScript to reveal
-    $("#loginFormAndLinks").show();
+    $("#login").removeClass('hidden');
   
     // focus on email or newpassword field
     $('.focus').focus();
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 3941f3a39..5e6ee2c13 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -13,16 +13,15 @@
 </#macro>
 
 <#macro loginForm>
+    <noscript>
+        <section id="error-alert">
+            <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
+            <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
+        </section>
+    </noscript>
 
-    <section id="login">
+    <section id="login" class="hidden">
         <h2>Log in</h2>
-
-        <noscript>
-            <section id="error-alert">
-                <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
-                <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
-            </section>
-        </noscript>
     
         <#if infoMessage??>
             <h3>${infoMessage}</h3>
@@ -43,13 +42,13 @@
             </#if>
 
             <label for="email">Email</label>
-            <input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required />
+            <input class="text-field focus" name="loginName" id="loginName" type="text" value="${loginName!}" required />
 
             <label for="password">Password</label>
             <input class="text-field" name="loginPassword" id="password" type="password" required />
             
             <p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p>
-            <#-- nac26: remember me won't be ready for r1.2
+            <#-- NC: remember me won't be ready for r1.2
             <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />  
             <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
@@ -72,7 +71,7 @@
            
             <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" required />
                 <label for="new-password">New Password</label>
-                <input id="new-password" class="focus text-field" type="password" name="newPassword"  required />
+                <input id="new-password" class="text-field focus" type="password" name="newPassword"  required />
                 
                 <p class="password-note">Minimum of 6 characters in length.</p>