From 13f621c453a49f8f8e915113c83921a094d42135 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 14 Jul 2009 17:20:49 +0000
Subject: [PATCH] Improved login page

Monotone-Parent: 6b9f81899aec0db3909c9b036a5cb7166a9185bc
Monotone-Revision: 298cdcf2f6c47c075aa3da6b45deb9784730194d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-14T17:20:49
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                              |  3 +++
 UI/Common/UIxPageFrame.m               |  7 -------
 UI/SOGoUI/UIxComponent.h               |  1 +
 UI/SOGoUI/UIxComponent.m               | 10 +++++++++-
 UI/Templates/MainUI/SOGoRootPage.wox   |  4 ++--
 UI/WebServerResources/SOGoRootPage.css |  7 +++++++
 UI/WebServerResources/SOGoRootPage.js  |  3 +++
 7 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65b9a4fab..9d229a5ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -buildDate]): moved
+	method from UIxPageFrame.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent _updateRecurrenceIDsWithEvent:]): fixed a
 	crash that occurs when saving a recurrent task with
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index a3d568ed0..66523b599 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -29,8 +29,6 @@
 #import <SoObjects/SOGo/SOGoUserDefaults.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 
-#import <Main/build.h>
-
 #import "UIxPageFrame.h"
 
 static NSString *siteFavicon = nil;
@@ -93,11 +91,6 @@ static NSString *siteFavicon = nil;
   return item;
 }
 
-- (NSString *) buildDate
-{
-  return SOGoBuildDate;
-}
-
 - (NSString *) ownerInContext
 {
   return [[self clientObject] ownerInContext: nil];
diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h
index 056cdaa17..21a778e0e 100644
--- a/UI/SOGoUI/UIxComponent.h
+++ b/UI/SOGoUI/UIxComponent.h
@@ -107,6 +107,7 @@
 - (WOResponse *) redirectToLocation: (NSString *) newLocation;
 
 /* Debugging */
+- (NSString *) buildDate;
 - (BOOL) isUIxDebugEnabled;
 
 @end
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index e34621427..6d3f19fd1 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -27,6 +27,8 @@
 #import <Foundation/NSPathUtilities.h>
 #import <Foundation/NSString.h>
 
+#import <Main/build.h>
+
 #import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGObjWeb/SoObjects.h>
 #import <NGObjWeb/WOResourceManager.h>
@@ -641,7 +643,13 @@ static BOOL uixDebugEnabled = NO;
 
 /* debugging */
 
-- (BOOL)isUIxDebugEnabled {
+- (NSString *) buildDate
+{
+  return SOGoBuildDate;
+}
+
+- (BOOL)isUIxDebugEnabled
+{
   return uixDebugEnabled;
 }
 
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 4c7ae120f..ca9b18cd4 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -12,7 +12,7 @@
   <div id="aboutBox" style="display:none;">
     <div>
       <p class="logo"><img const:alt="Scalable OGo" rsrc:src="sogo-logo.png"/></p>
-      <p>Version <var:string value="version"/></p>
+      <p>Version <var:string value="version"/> <span class="buildDate">(<var:string value="buildDate" />)</span></p>
       <p class="scroll"><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
       <img const:alt="Inverse" rsrc:src="inverse.png"/>
       <p class="links"><a href="http://www.scalableogo.org/" target="_new">www.scalableogo.org</a> / 
@@ -51,10 +51,10 @@
 		       /></label>
 	    <label>
 	      <input class="button" id="submit" name="submit" type="submit" label:value="Connect" />
-	      <div id="animation"><!-- animated gif! --></div>
 	    </label>
 	  </td>
 	</tr>
+        <tr><td colspan="2"><label id="animation"><!-- busy.gif! --></label></td></tr>
       </table>
       <p id="noCookiesErrorMessage" style="display: none;"><var:string label:value="cookiesNotEnabled"/></p>
       <p id="loginErrorMessage" style="display: none;"><var:string label:value="Wrong username or password."/></p>
diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css
index eb44f996c..cba692e74 100644
--- a/UI/WebServerResources/SOGoRootPage.css
+++ b/UI/WebServerResources/SOGoRootPage.css
@@ -23,6 +23,13 @@ DIV#aboutBox DIV
   padding-bottom: 20px;
   width: 550px; }
 
+DIV#aboutBox SPAN.buildDate
+{ color: #666; }
+
+A#aboutClose
+{ padding-left: 10px;
+  padding-right: 10px; }
+
 A,
 A:link,
 A:visited
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index b5fae56af..088e94f4a 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -22,6 +22,9 @@ function initLogin() {
 
 	var image = $("preparedAnimation");
 	image.parentNode.removeChild(image);
+
+	var submitBtn = $("submit");
+	submitBtn.disabled = false;
 }
 
 function onLoginClick(event) {