timb merging

1 files changed, 7 insertions, 24 deletions

diff --git a/template/form_login.st b/template/form_login.st
index aee9283..a028769 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -3,42 +3,25 @@
   <fieldset id="signin_menu">
     <form onsubmit="return false">
       </p>
-<img src="/static/signin.gif">
         </p>
       </p><br>
       </p>
 
-      <input id="nickInput" name="nickInput" value="" title="username" tabindex="4" type="text">
+      <input id="nickInput" name="nickInput" title="username" tabindex="4" type="text">
       </p>
       <p>
-        <input id="passwordInput" name="passwordInput" value="" title="password" tabindex="5" type="password">
+        <input id="passwordInputLabel" name="passwordInputLabel" tabindex="5" type="text" class="invisible">
+        <input id="passwordInput" name="passwordInput" title="password" tabindex="5" type="password">
       </p>
       <p class="remember">
-        <input id="loginSubmit" value="Sign in" tabindex="6" type="submit">
+        <img src="/static/signin.gif" id="signin-submit">
+        
+        <!-- <input id="loginSubmit" value="Sign in" tabindex="6" type="submit"> -->
       </p>
     </form>
   </fieldset>
 </div>
 <script src="/static/js/home.js" type="text/javascript"></script>
 <script type="text/javascript">
-  jQuery(document).ready(function() {
-
-    initHome();
-
-    jQuery(".signin").click(function(e) {          
-      e.preventDefault();
-      jQuery("fieldset#signin_menu").toggle();
-      jQuery(".signin").toggleClass("menu-open");
-    });
-
-    jQuery("fieldset#signin_menu").mouseup(function() {
-      return false
-    });
-    jQuery(document).mouseup(function(e) {
-      if(jQuery(e.target).parent("a.signin").length==0) {
-        jQuery(".signin").removeClass("menu-open");
-        jQuery("fieldset#signin_menu").hide();
-      }
-    });			
-});
+  initExpandableLoginForm()
 </script>
\ No newline at end of file