From f573dc5d0e0e39cf4cabd35cf93781d66d059358 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Sat, 23 Aug 2008 03:24:24 +0000
Subject: [PATCH] Monotone-Parent: f36908690fb1287e17d7bb0eb4155ddc4c6f6a55
 Monotone-Revision: 8bc0eb7c9fd973f77be1c3e110b5c04007734d45

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-23T03:24:24
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/SOGoRootPage.js | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 14b834ab5..75fb9da6f 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -14,12 +14,13 @@ function initLogin() {
 }
 
 function onLoginClick(event) {
-  startAnimation($("loginButton"), $("submit"));
-
-  var userName = $("userName").value;
+  var userNameField = $("userName");
+  var userName = userNameField.value;
   var password = $("password").value;
 
   if (userName.length > 0) {
+    startAnimation($("loginButton"), $("submit"));
+
     if (typeof(loginSuffix) != "undefined"
 	&& loginSuffix.length > 0
 	&& !userName.endsWith(loginSuffix))
@@ -32,6 +33,8 @@ function onLoginClick(event) {
 			 "Content-length": parameters.length,
 			 "Connection": "close" });
   }
+  else
+    userNameField.focus();
 
   preventDefault(event);
 }
@@ -41,17 +44,17 @@ function onLoginCallback(http) {
     if (isHttpStatus204(http.status)) {
       var userName = $("userName").value;
       if (typeof(loginSuffix) != "undefined"
-	  && loginSuffix.length > 0
-	  && !userName.endsWith(loginSuffix))
-	userName += loginSuffix;
+          && loginSuffix.length > 0
+          && !userName.endsWith(loginSuffix))
+        userName += loginSuffix;
       var address = "" + window.location.href;
       var baseAddress = ApplicationBaseURL + encodeURI(userName);
       var altBaseAddress;
       if (baseAddress[0] == "/") {
-	var parts = address.split("/");
-	var hostpart = parts[2];
-	var protocol = parts[0];
-	baseAddress = protocol + "//" + hostpart + baseAddress;
+        var parts = address.split("/");
+        var hostpart = parts[2];
+        var protocol = parts[0];
+        baseAddress = protocol + "//" + hostpart + baseAddress;
       }
       var altBaseAddress;
       var parts = baseAddress.split("/");
@@ -60,11 +63,11 @@ function onLoginCallback(http) {
 
       var newAddress;
       if ((address.startsWith(baseAddress)
-	   || address.startsWith(altBaseAddress))
-	  && !address.endsWith("/logoff"))
-	newAddress = address;
+           || address.startsWith(altBaseAddress))
+          && !address.endsWith("/logoff"))
+        newAddress = address;
       else
-	newAddress = baseAddress;
+        newAddress = baseAddress;
       window.location.href = newAddress;
     }
   }