From a5e621970a7ce62d4652a0593fa455dfd213f317 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 5 Jul 2006 13:27:18 +0000 Subject: [PATCH] - see ChangeLog; Monotone-Parent: 8ddb2a0ff49be672a150054c0e9781c669a91f34 Monotone-Revision: cf18a9ab5ead55ed9cf2650fae505a079dd489ad Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-07-05T13:27:18 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 12 + UI/MailerUI/UIxMailMainFrame.m | 4 +- UI/Templates/MailerUI/UIxMailMainFrame.wox | 262 +++++++++------------ UI/Templates/UIxPageFrame.wox | 86 +++---- 4 files changed, 164 insertions(+), 200 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0d00d77f..337c9a0ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-07-05 Wolfgang Sourdeau + + * UI/Templates/UIxPageFrame.wox: use the exact html code as below. + + * UI/Templates/MailerUI/UIxMailMainFrame.wox: redone the + linkbanner as a DIV instead of a TABLE. + + * UI/MailerUI/UIxMailMainFrame.m [UIxMailMainFrame + showLinkBanner]: + returns 'YES' to request the display of the navigation bar between + applets. + 2006-06-15 ludovic@inverse.ca * It's now possible to set the default diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 9a6915e45..8a9d08604 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -150,11 +150,13 @@ static NSString *treeRootClassName = nil; } - (BOOL)showLinkBanner { - return NO; + return YES; } + - (NSString *)bannerToolbarStyle { return nil; } + - (NSString *)bannerConsumeStyle { return nil; } diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index 4c0f6c329..eba8b7573 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -1,163 +1,121 @@ - + + - - - - - <var:string value="title"/> - + + + <var:string value="title"/> + - - - + + + - - + + - - - + + + - - + + - - -
+ + + +
+ + | + | + | + | + +
+ - - - - - -
- - - - - -
- | - | - | - | - - - - OGo Logo - -
+ + + + + + + + +
+ + + + + + +
+
- - - - - - - - - - - -
- -
- - - -
-
+ +
+ + + + + +
+ + + + + + + + + + + +
+
+
+
+
+ +
+
+
+ 		+ +
+ +
+ + + + +
- - - - - - -
- - - - - - -
-
- - -
- - - - - -
- - - - - - - - - - - -
-
-
-
-
- -
-
-
- 		- -
- -
- - - - - - - - - - - + + + + diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox index 5702e0864..1ac4a278c 100644 --- a/UI/Templates/UIxPageFrame.wox +++ b/UI/Templates/UIxPageFrame.wox @@ -25,55 +25,47 @@ +
+ | + | + | + | + +
+ - - - + + + + + + + + + + + + + + + + + + + + + + +
- - - - - -
- | - | - | - | - - - - - -
+ + + - - - - - - - - - - -
- -
- - - -
-