From: helge Date: Wed, 20 Jul 2005 12:55:50 +0000 (+0000) Subject: added UIxMainPanelFrame X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f0e19c31e0636e7c1c110e5504cdfacbc6592b9;p=scalable-opengroupware.org added UIxMainPanelFrame git-svn-id: http://svn.opengroupware.org/SOGo/trunk@846 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog index 08719091..4f192d7c 100644 --- a/SOGo/UI/MailerUI/ChangeLog +++ b/SOGo/UI/MailerUI/ChangeLog @@ -1,5 +1,8 @@ 2005-07-20 Helge Hess + * UIxMailMainFrame.m: added UIxMailPanelFrame class for panels opened + by the main frame (v0.9.158) + * UIxMailView.m: show delete button if delete is allowed but trashing isn't (#1444) (v0.9.157) diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m index 11a23055..f9db05a7 100644 --- a/SOGo/UI/MailerUI/UIxMailMainFrame.m +++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m @@ -40,6 +40,9 @@ @end +@interface UIxMailPanelFrame : UIxMailMainFrame +@end + #include "common.h" #include @@ -251,3 +254,14 @@ static NSString *treeRootClassName = nil; } @end /* UIxMailMainFrame */ + +@implementation UIxMailPanelFrame + +- (BOOL)hideFolderTree { + return YES; +} +- (BOOL)showLinkBanner { + return NO; +} + +@end /* UIxMailPanelFrame */ diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version index 5bc038bb..0f2ec22c 100644 --- a/SOGo/UI/MailerUI/Version +++ b/SOGo/UI/MailerUI/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=157 +SUBMINOR_VERSION:=158 # v0.9.140 requires SoObjects/Mailer v0.9.100 # v0.9.134 requires libSOGo v0.9.41 diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog index 397cf7e5..3818f74c 100644 --- a/SOGo/UI/Templates/ChangeLog +++ b/SOGo/UI/Templates/ChangeLog @@ -1,5 +1,8 @@ 2005-07-20 Helge Hess + * MailerUI: use new UIxMailPanelFrame for panel templates (those which + do not show the folder tree) + * MailerUI/UIxMailView.wox: added support for list headers, for the organization header, for some spam-assassin and virus scanning fields diff --git a/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox b/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox index df3b8dcb..a90dfbce 100644 --- a/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox +++ b/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox @@ -6,9 +6,8 @@ xmlns:uix="OGo:uix" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - className="UIxMailMainFrame" + className="UIxMailPanelFrame" title="panelTitle" - const:hideFolderTree="1" >
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox new file mode 100644 index 00000000..681f3d66 --- /dev/null +++ b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox @@ -0,0 +1,134 @@ + + + + + + + <var:string value="title"/> + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + +
+ | + | + | + | + + + + OGo Logo + +
+ + + + + + + + + + + + +
+ +
+ + + +
+
+ + + + + + + + +
+ + + + + + +
+
+ + +
+ + + + + +
+ +
+
+ + + + + + + + + + diff --git a/SOGo/UI/Templates/MailerUI/UIxMailView.wox b/SOGo/UI/Templates/MailerUI/UIxMailView.wox index 02a8ca55..795369d4 100644 --- a/SOGo/UI/Templates/MailerUI/UIxMailView.wox +++ b/SOGo/UI/Templates/MailerUI/UIxMailView.wox @@ -6,9 +6,8 @@ xmlns:uix="OGo:uix" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - className="UIxMailMainFrame" + className="UIxMailPanelFrame" title="panelTitle" - const:hideFolderTree="1" >