From 4b94f33a523f6ea1dae8d726a7028bb1367141b0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 7 Sep 2007 15:38:03 +0000 Subject: [PATCH] Monotone-Parent: 0f74ed9ee961ab1a0c1f0a7f590156e0a6ad0ccc Monotone-Revision: 495909cb819acdb0da4a36935614c3ff0d72319b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-07T15:38:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 ++ UI/MainUI/SOGoRootPage.h | 4 +- UI/Templates/MainUI/SOGoRootPage.wox | 94 ++++++---------------------- UI/WebServerResources/generic.js | 3 +- 4 files changed, 26 insertions(+), 80 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e01f6c97..7b9dccc48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-07 Wolfgang Sourdeau + + * UI/MainUI/SOGoRootPage.[hm]: made a subclass of UIxComponent + instead of UIxPageFrame. + 2007-09-06 Wolfgang Sourdeau * UI/MainUI/SOGoRootPage.m ([-defaultAction]): commented out. diff --git a/UI/MainUI/SOGoRootPage.h b/UI/MainUI/SOGoRootPage.h index fe3ebe466..387e11cd7 100644 --- a/UI/MainUI/SOGoRootPage.h +++ b/UI/MainUI/SOGoRootPage.h @@ -23,9 +23,9 @@ #ifndef SOGOROOTPAGE_H #define SOGOROOTPAGE_H -#import +#import -@interface SOGoRootPage : UIxPageFrame +@interface SOGoRootPage : UIxComponent { NSString *userName; } diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox index 6635a51f4..0fa3da10e 100644 --- a/UI/Templates/MainUI/SOGoRootPage.wox +++ b/UI/Templates/MainUI/SOGoRootPage.wox @@ -1,84 +1,26 @@ - - + - - - - <var:string label:value="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

-
- -
- -
-
-
+
+
+

+
+ +
+
- - - - - +
+
+ + diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 608947f61..95a19fc7b 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1260,9 +1260,8 @@ function loadPreferences() { } function onLoadHandler(event) { - if (!document.body.hasClassName("loginPage")) { + if (UserLogin) loadPreferences(); - } queryParameters = parseQueryParameters('' + window.location); if (!$(document.body).hasClassName("popup")) { initLogConsole();