From 05f79daf43da5f0b188aff4696c30bd862a8a447 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 21 Sep 2007 14:22:27 +0000
Subject: [PATCH] Monotone-Parent: 8c71c2f6c15c42ccc96502db7a2872d682131749
 Monotone-Revision: 9d2034c400246e39f2d7a801f52ee4971e5b431a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-09-21T14:22:27
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                   | 6 ++++++
 UI/MainUI/English.lproj/Localizable.strings | 2 ++
 UI/MainUI/French.lproj/Localizable.strings  | 2 ++
 UI/SOGoUI/UIxComponent.m                    | 3 +++
 UI/Templates/MainUI/SOGoRootPage.wox        | 4 +++-
 UI/Templates/UIxPageFrame.wox               | 7 ++++---
 UI/WebServerResources/SOGoRootPage.css      | 4 ++++
 7 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac0d9909c..74e21958e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/SOGoUI/UIxComponent.m 
+	([UIxComponent -shortUserNameForDisplay]): returns the string
+	"wrongusernamepassword" when authentication failed.
+
 2007-09-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartICalViewer.m
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 932c42194..9cc6c319a 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -6,3 +6,5 @@
 "Password:" = "Password:";
 
 "Connect" = "Connect";
+
+"Wrong username or password." = "Wrong username or password.";
\ No newline at end of file
diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings
index dbdc05ac2..2cd2ec069 100644
--- a/UI/MainUI/French.lproj/Localizable.strings
+++ b/UI/MainUI/French.lproj/Localizable.strings
@@ -6,3 +6,5 @@
 "Password:" = "Mot de passe :";
 
 "Connect" = "Connexion";
+
+"Wrong username or password." = "Mauvais nom d'utilisateur ou mot de passe.";
\ No newline at end of file
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 643dca563..273d3e20b 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -423,6 +423,9 @@ static BOOL uixDebugEnabled = NO;
 
 - (NSString *) shortUserNameForDisplay
 {
+  if ([context activeUser] == nil)
+    return @"wrongusernamepassword";
+
   return [[context activeUser] login];
 }
 
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index af0bc6bc4..78353a75b 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -11,7 +11,9 @@
   <form id="connectForm" var:href="connectURL">
     <div id="loginScreen">
       <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
-      <label><var:string label:value="Login:"/><br/>
+      <var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
+      ><p class="error"><var:string label:value="Wrong username or password."/></p>
+      </var:if><label><var:string label:value="Login:"/><br/>
 	<input class="textField" id="userName" name="userName"
 	  type="text" var:value="userName" /></label><br/>
       <label><var:string label:value="Password:"/><br/>
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index ada40f363..d2a9086d6 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -63,10 +63,11 @@
 	  const:identifier="labels" />
 	<var:js-stringtable
 	  const:identifier="clabels" />
-
 	<var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	  const:negate="YES"
-	  ><var:if condition="isPopup" const:negate="YES"
+	  ><var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
+	  const:negate="YES"
+          ><var:if condition="isPopup" const:negate="YES"
 	    ><var:if condition="context.isUIxDebugEnabled"
 	      ><div id="logConsole"><!-- space --></div></var:if>
 	    <div id="linkBanner" class="linkbanner">
@@ -88,7 +89,7 @@
 	  </var:if
 	    ><var:component className="UIxToolbar" var:toolbar="toolbar"
 	    />
-	</var:if>
+	</var:if></var:if>
 	
 	<div class="pageContent"
 	  ><var:component-content
diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css
index 9654ce87d..0018554ea 100644
--- a/UI/WebServerResources/SOGoRootPage.css
+++ b/UI/WebServerResources/SOGoRootPage.css
@@ -46,6 +46,10 @@ DIV#loginButton IMG#progressIndicator
   margin-top: 5px;
   margin-left: 5px; }
 
+P.error
+{ color: #f00;
+  text-align: center; }
+
 P.browser
 { background-color: #fff;
   border-top: 1px solid #888;