Monotone-Parent: 8c71c2f6c15c42ccc96502db7a2872d682131749
Monotone-Revision: 9d2034c400246e39f2d7a801f52ee4971e5b431a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-21T14:22:27 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
e3f661afec
commit
05f79daf43
|
@ -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
|
||||
|
|
|
@ -6,3 +6,5 @@
|
|||
"Password:" = "Password:";
|
||||
|
||||
"Connect" = "Connect";
|
||||
|
||||
"Wrong username or password." = "Wrong username or password.";
|
|
@ -6,3 +6,5 @@
|
|||
"Password:" = "Mot de passe :";
|
||||
|
||||
"Connect" = "Connexion";
|
||||
|
||||
"Wrong username or password." = "Mauvais nom d'utilisateur ou mot de passe.";
|
|
@ -423,6 +423,9 @@ static BOOL uixDebugEnabled = NO;
|
|||
|
||||
- (NSString *) shortUserNameForDisplay
|
||||
{
|
||||
if ([context activeUser] == nil)
|
||||
return @"wrongusernamepassword";
|
||||
|
||||
return [[context activeUser] login];
|
||||
}
|
||||
|
||||
|
|
|
@ -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/>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue