From: helge Date: Fri, 8 Jul 2005 10:05:21 +0000 (+0000) Subject: added link banner X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d6355361c234512d2d3ade46e248418bb1fa35a;p=scalable-opengroupware.org added link banner git-svn-id: http://svn.opengroupware.org/SOGo/trunk@697 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog index b51be639..882b4afe 100644 --- a/SOGo/UI/MailerUI/ChangeLog +++ b/SOGo/UI/MailerUI/ChangeLog @@ -1,3 +1,11 @@ +2005-07-08 Helge Hess + + * UIxMailMainFrame.m: added "link" banner to jump to the other SOGo + tools, disable the banner in case the tree is disabled (since that + hints that a new window without the frame is being used, eg the + compose panel), added some more CSS classes instead of inline style + declarations (v0.9.132) + 2005-07-08 Helge Hess * prepared ACL editors (v0.9.131) diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m index 5a4ced7e..f8d5d843 100644 --- a/SOGo/UI/MailerUI/UIxMailMainFrame.m +++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m @@ -29,7 +29,7 @@ id item; struct { int hideFolderTree:1; - int hideFrame:1; + int hideFrame:1; /* completely disables all the frame around the comp. */ int reserved:30; } mmfFlags; } @@ -109,6 +109,16 @@ static NSString *treeRootClassName = nil; return [u hasSuffix:@"/"] ? @"view" : @"#"; } +- (BOOL)showLinkBanner { + if ([self hideFolderTree]) return NO; +} +- (NSString *)bannerToolbarStyle { + return [self showLinkBanner] ? @"top: 48px;" : nil /* fallback to CSS */; +} +- (NSString *)bannerConsumeStyle { + return [self showLinkBanner] ? @"height: 106px;" : nil /* fallback to CSS */; +} + /* notifications */ - (void)sleep { diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version index 7b76bee4..eb4792d7 100644 --- a/SOGo/UI/MailerUI/Version +++ b/SOGo/UI/MailerUI/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=130 +SUBMINOR_VERSION:=132 # v0.9.100 requires libNGMime v4.5.213 # v0.9.99 requires libNGMime v4.5.212 diff --git a/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox index 8b183415..87d3c63e 100644 --- a/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -35,28 +35,80 @@ Note: the 'href' is required, otherwise an element-id will get created -->
- + + +
+ + + +
+ + + + + +
+ | + | + | + | + + + + OGo Logo + +
+ + + + + + + + + + + +
+ +
+ +
+
+ + +
- +
-
-
- + +
+ +
diff --git a/SOGo/UI/Templates/UIxAppointmentEditor.wox b/SOGo/UI/Templates/UIxAppointmentEditor.wox index 3736a60b..5e630af9 100644 --- a/SOGo/UI/Templates/UIxAppointmentEditor.wox +++ b/SOGo/UI/Templates/UIxAppointmentEditor.wox @@ -334,6 +334,7 @@ + Forbidden ... diff --git a/SOGo/UI/WebServerResources/mailer.css b/SOGo/UI/WebServerResources/mailer.css index d44d549a..25e85643 100644 --- a/SOGo/UI/WebServerResources/mailer.css +++ b/SOGo/UI/WebServerResources/mailer.css @@ -133,6 +133,22 @@ td.titlecell { /* toolbar */ +table.tb_maintable { + width: 100%; + position: fixed; + top: 0px; /* this is patched when the linkbar is on */ + height: 48px; + z-index: 100; +} +td.tb_logocell { + width: 36px; + padding-right: 8px; +} +div.tb_consumer { /* consumes the spaces taken by the toolbar */ + height: 58px; /* this is patched when the linkbar is on */ + clear: both; +} + .tb_toolbar { height: 30px; } @@ -505,3 +521,23 @@ table.linked_attachment_meta { color: #444444; font-style: italic; } + + +/* OGo link banner on top of mail frame */ + +table.linkbanner { + width: 100%; + background-color: white; + position: fixed; + height: 48px; + z-index: 100; +} + +.linkbannerlinks { + font-size: 10pt; + vertical-align: bottom; + text-align: left; +} +.linkbannerimage { + text-align: right; +}