]> err.no Git - scalable-opengroupware.org/commitdiff
projects / scalable-opengroupware.org / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db43719)
added UIxMainPanelFrame
authorhelge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Wed, 20 Jul 2005 12:55:50 +0000 (12:55 +0000)
committerhelge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Wed, 20 Jul 2005 12:55:50 +0000 (12:55 +0000)
git-svn-id: http://svn.opengroupware.org/SOGo/trunk@846 d1b88da0-ebda-0310-925b-ed51d893ca5b

SOGo/UI/MailerUI/ChangeLog patch | blob | history
SOGo/UI/MailerUI/UIxMailMainFrame.m patch | blob | history
SOGo/UI/MailerUI/Version patch | blob | history
SOGo/UI/Templates/ChangeLog patch | blob | history
SOGo/UI/Templates/MailerUI/UIxMailEditor.wox patch | blob | history
SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox [new file with mode: 0644] patch | blob
SOGo/UI/Templates/MailerUI/UIxMailView.wox patch | blob | history

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 08719091e96e72a3f94efed239d55512febaee49..4f192d7c000b58be62cfecdf676442ba7a4fa02d 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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 11a23055c7862479893ccba583a732057f1e6348..f9db05a7664f2d2f9cc3da3d5399507650822c8b 100644 (file)
--- 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 <NGObjWeb/SoComponent.h>
 
@@ -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 5bc038bbf14a934a864c649288a14bfb981b39a7..0f2ec22cbb4d68c06fb25c89d09a7fc28c0718f2 100644 (file)
--- 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 397cf7e522e306741ae4b6246132cffd3636ca3d..3818f74cc1048829d4118ed505037bdf9b685114 100644 (file)
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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 df3b8dcb4fa94fb9e1ad84c269d627f31dad7875..a90dfbce0fc3ff57631408cd528f5032fbd6c69a 100644 (file)
--- 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"
 >
  <div id="compose_panel">
 
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox
new file mode 100644 (file)
index 0000000..681f3d6
--- /dev/null
+++ b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox
@@ -0,0 +1,134 @@
+<?xml version="1.0" standalone="yes"?>
+<container xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
+>
+  <var:if condition="hideFrame" const:negate="YES">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
+>
+  <head>
+    <title>
+      <var:string value="title"/>
+    </title>
+    
+    <meta name="description" content="SOGo Web Interface"/>
+    <meta name="author" content="SKYRIX Software AG"/>
+    <meta name="robots" content="stop"/>
+    
+    <script rsrc:src="generic.js"> <!-- space required --></script>
+    <script rsrc:src="mailer.js" > <!-- space required --></script>
+    
+    <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
+    <link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
+    <link href="mailto:info@skyrix.com" rev="made"/>
+  </head>
+
+  <body style="background-color: #D4D0C8;">
+   <!-- 
+     Note: the 'href' is required, otherwise an element-id will get created
+     -->
+   <form name="pageform" var:href="pageFormURL" sidInUrl="NO">
+
+     <var:if condition="showLinkBanner">
+       <table cellpadding="5" cellspacing="0" border="0" class="linkbanner">
+         <tr>
+          <td colspan="2">
+            <table cellpadding="0" cellspacing="0" border="0" width="100%">
+              <tr>
+                <td class="linkbannerlinks">
+                  <a var:href="relativeHomePath"
+                  ><var:string label:value="Home" /></a> |
+                  <a var:href="relativeCalendarPath"
+                  ><var:string label:value="Calendar" /></a> |
+                  <a var:href="relativeContactsPath"
+                  ><var:string label:value="Addressbook" /></a> |
+                  <a var:href="relativeMailPath"
+                  ><var:string label:value="Mail" /></a> |
+                  <a href="http://to.be.done/"
+                  ><var:string label:value="Right Administration" /></a>
+                </td>
+                <td class="linkbannerimage">
+                  <a href="http://www.opengroupware.org:80/" target="OGo">
+                    <img rsrc:src="CommonUI.SOGo/menu_logo_top.gif"
+                         align="center" border="0" alt="OGo Logo" 
+                         valign="middle"
+                    />
+                  </a>
+                </td>
+              </tr>
+            </table>
+           
+            <!-- TODO: replace the line with a CSS straight line -->
+            <table cellpadding="0" cellspacing="0" border="0" width="100%">
+              <tr>
+                <td class="linecolor"><img 
+                    rsrc:src="CommonUI.SOGo/line_left.gif"/></td>
+                <td class="linecolor" width="98%">
+                  <img rsrc:src="CommonUI.SOGo/line_stretch.gif"/>
+                </td>
+                <td class="linecolor"><img 
+                    rsrc:src="CommonUI.SOGo/line_right.gif"/></td>
+              </tr>
+              <tr>
+                <td valign="top" colspan="2">
+                  <var:component className="UIxAppNavView" />
+                </td>
+                <td valign="top" align="right" class="button_submit_env">
+                  <a var:href="helpURL"
+                     class="button_submit"
+                     label:string="Help"
+                     var:target="helpWindowTarget"
+                  />
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </var:if>
+
+    <table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
+           var:style="bannerToolbarStyle">
+      <!-- this table is required for right alignment -->
+      <tr>
+        <td valign="top" class="vertframerow">
+          <var:component className="UIxMailToolbar" />
+        </td>
+        <td align="right" width="80" class="vertframerow">
+          <table border="0"> <!-- TODO: what is this table for? -->
+            <tr>
+              <td class="tb_logocell tb_icon"
+                  ><div class="tbicon_logo"> </div></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    
+    <!-- consume toolbar -->
+    <div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
+    
+    <table border="0" width="100%" cellspacing="0" cellpadding="2">
+      <tr class="vertframerow">
+        <td width="100%" valign="top" class="vertframerow" colspan="2">
+          <var:component-content/>
+        </td>
+      </tr>
+    </table>
+   </form>
+
+   <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
+  </body>
+</html>
+   </var:if>
+
+  <var:if condition="hideFrame">
+    <var:component-content/>
+  </var:if>
+</container>
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailView.wox b/SOGo/UI/Templates/MailerUI/UIxMailView.wox
index 02a8ca5509e13735c1f9d8a3aaf87925c243d3dc..795369d49ff3e581271f289c6890869582eb4843 100644 (file)
--- 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"
 >
   <!-- TODO: refactor address rendering into an own component(/element) -->
 
Unnamed repository; edit this file to name it for gitweb.