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
This commit is contained in:
parent
53d48ee66d
commit
13f621c453
|
@ -1,5 +1,8 @@
|
||||||
2009-07-14 Francis Lachapelle <flachapelle@inverse.ca>
|
2009-07-14 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* UI/SOGoUI/UIxComponent.m ([UIxComponent -buildDate]): moved
|
||||||
|
method from UIxPageFrame.
|
||||||
|
|
||||||
* SoObjects/Appointments/SOGoCalendarComponent.m
|
* SoObjects/Appointments/SOGoCalendarComponent.m
|
||||||
([SOGoCalendarComponent _updateRecurrenceIDsWithEvent:]): fixed a
|
([SOGoCalendarComponent _updateRecurrenceIDsWithEvent:]): fixed a
|
||||||
crash that occurs when saving a recurrent task with
|
crash that occurs when saving a recurrent task with
|
||||||
|
|
|
@ -29,8 +29,6 @@
|
||||||
#import <SoObjects/SOGo/SOGoUserDefaults.h>
|
#import <SoObjects/SOGo/SOGoUserDefaults.h>
|
||||||
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
|
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
|
||||||
|
|
||||||
#import <Main/build.h>
|
|
||||||
|
|
||||||
#import "UIxPageFrame.h"
|
#import "UIxPageFrame.h"
|
||||||
|
|
||||||
static NSString *siteFavicon = nil;
|
static NSString *siteFavicon = nil;
|
||||||
|
@ -93,11 +91,6 @@ static NSString *siteFavicon = nil;
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) buildDate
|
|
||||||
{
|
|
||||||
return SOGoBuildDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (NSString *) ownerInContext
|
- (NSString *) ownerInContext
|
||||||
{
|
{
|
||||||
return [[self clientObject] ownerInContext: nil];
|
return [[self clientObject] ownerInContext: nil];
|
||||||
|
|
|
@ -107,6 +107,7 @@
|
||||||
- (WOResponse *) redirectToLocation: (NSString *) newLocation;
|
- (WOResponse *) redirectToLocation: (NSString *) newLocation;
|
||||||
|
|
||||||
/* Debugging */
|
/* Debugging */
|
||||||
|
- (NSString *) buildDate;
|
||||||
- (BOOL) isUIxDebugEnabled;
|
- (BOOL) isUIxDebugEnabled;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -27,6 +27,8 @@
|
||||||
#import <Foundation/NSPathUtilities.h>
|
#import <Foundation/NSPathUtilities.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
|
|
||||||
|
#import <Main/build.h>
|
||||||
|
|
||||||
#import <NGObjWeb/SoHTTPAuthenticator.h>
|
#import <NGObjWeb/SoHTTPAuthenticator.h>
|
||||||
#import <NGObjWeb/SoObjects.h>
|
#import <NGObjWeb/SoObjects.h>
|
||||||
#import <NGObjWeb/WOResourceManager.h>
|
#import <NGObjWeb/WOResourceManager.h>
|
||||||
|
@ -641,7 +643,13 @@ static BOOL uixDebugEnabled = NO;
|
||||||
|
|
||||||
/* debugging */
|
/* debugging */
|
||||||
|
|
||||||
- (BOOL)isUIxDebugEnabled {
|
- (NSString *) buildDate
|
||||||
|
{
|
||||||
|
return SOGoBuildDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL)isUIxDebugEnabled
|
||||||
|
{
|
||||||
return uixDebugEnabled;
|
return uixDebugEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<div id="aboutBox" style="display:none;">
|
<div id="aboutBox" style="display:none;">
|
||||||
<div>
|
<div>
|
||||||
<p class="logo"><img const:alt="Scalable OGo" rsrc:src="sogo-logo.png"/></p>
|
<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>
|
<p class="scroll"><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
|
||||||
<img const:alt="Inverse" rsrc:src="inverse.png"/>
|
<img const:alt="Inverse" rsrc:src="inverse.png"/>
|
||||||
<p class="links"><a href="http://www.scalableogo.org/" target="_new">www.scalableogo.org</a> /
|
<p class="links"><a href="http://www.scalableogo.org/" target="_new">www.scalableogo.org</a> /
|
||||||
|
@ -51,10 +51,10 @@
|
||||||
/></label>
|
/></label>
|
||||||
<label>
|
<label>
|
||||||
<input class="button" id="submit" name="submit" type="submit" label:value="Connect" />
|
<input class="button" id="submit" name="submit" type="submit" label:value="Connect" />
|
||||||
<div id="animation"><!-- animated gif! --></div>
|
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr><td colspan="2"><label id="animation"><!-- busy.gif! --></label></td></tr>
|
||||||
</table>
|
</table>
|
||||||
<p id="noCookiesErrorMessage" style="display: none;"><var:string label:value="cookiesNotEnabled"/></p>
|
<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>
|
<p id="loginErrorMessage" style="display: none;"><var:string label:value="Wrong username or password."/></p>
|
||||||
|
|
|
@ -23,6 +23,13 @@ DIV#aboutBox DIV
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
width: 550px; }
|
width: 550px; }
|
||||||
|
|
||||||
|
DIV#aboutBox SPAN.buildDate
|
||||||
|
{ color: #666; }
|
||||||
|
|
||||||
|
A#aboutClose
|
||||||
|
{ padding-left: 10px;
|
||||||
|
padding-right: 10px; }
|
||||||
|
|
||||||
A,
|
A,
|
||||||
A:link,
|
A:link,
|
||||||
A:visited
|
A:visited
|
||||||
|
|
|
@ -22,6 +22,9 @@ function initLogin() {
|
||||||
|
|
||||||
var image = $("preparedAnimation");
|
var image = $("preparedAnimation");
|
||||||
image.parentNode.removeChild(image);
|
image.parentNode.removeChild(image);
|
||||||
|
|
||||||
|
var submitBtn = $("submit");
|
||||||
|
submitBtn.disabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onLoginClick(event) {
|
function onLoginClick(event) {
|
||||||
|
|
Loading…
Reference in a new issue