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 b51be639f1f3e24ac7051c160469bb384dc048d6..882b4afe411905ee386c931725a6aeee705dc257 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * prepared ACL editors (v0.9.131)

diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m
index 5a4ced7efc54d83ccfe2f00874a97ba214c3bbe2..f8d5d8434492f5fc1cd900773c5f08f25c28f902 100644 (file)
--- 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 7b76bee450210da1ca02b6b1fc0ba73f8913ae40..eb4792d7f2cabe6fcf986f462eb36d2a8be945c7 100644 (file)
--- 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 8b1834156c9cf91527a06e103bf2740ac682a41a..87d3c63eb25dba3f1ad836f2d10e2ebf6f02b1de 100644 (file)
--- 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
      -->
    <form name="pageform" var:href="pageFormURL" sidInUrl="NO">
-    <table border="0" width="100%" cellspacing="0" cellpadding="2"
-           style="position: fixed; height: 48px; z-index: 100;"
-    >
+
+     <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="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="3">
+                  <var:component className="UIxAppNavView" />
+                </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">
+          <table border="0"> <!-- TODO: what is this table for? -->
             <tr>
-              <td class="tb_icon" style="width: 36px; padding-right: 8px;"
+              <td class="tb_logocell tb_icon"
                   ><div class="tbicon_logo"> </div></td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <div style="height: 58px; clear: both;"> </div> <!-- consume toolbar -->
     
-    <table border="0" width="100%" cellspacing="0" cellpadding="2"
-    >
+    <!-- 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:if condition="hideFolderTree">

diff --git a/SOGo/UI/Templates/UIxAppointmentEditor.wox b/SOGo/UI/Templates/UIxAppointmentEditor.wox
index 3736a60bd29ce946e75e78c512b5dae85acd64c7..5e630af978a41af1de73e8a36536acbdf5d25272 100644 (file)
--- a/SOGo/UI/Templates/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Templates/UIxAppointmentEditor.wox
@@ -334,6 +334,7 @@
       <input type="hidden" name="ical" var:value="iCalString" />
     </form>
   </var:if>
+  
   <var:if condition="canEditApt" const:negate="YES">
     Forbidden ... <var:redirect const:setURL="view" />
   </var:if>

diff --git a/SOGo/UI/WebServerResources/mailer.css b/SOGo/UI/WebServerResources/mailer.css
index d44d549a91be9eb70699bfcb78c3a229acde37c7..25e85643762b0901ac3334d4d332ca76836c7cf0 100644 (file)
--- 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;
+}