added help button

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@698 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 882b4afe411905ee386c931725a6aeee705dc257..1855f6f3ecc20d647b5baf576830d30da43083de 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
+
+       * UIxMailMainFrame.m: added help button and extra space for that in the
+         toolbar (v0.9.133)
+       
 2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxMailMainFrame.m: added "link" banner to jump to the other SOGo

diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m
index f8d5d8434492f5fc1cd900773c5f08f25c28f902..9be337ee6281f4ee6c8f589294a876f5cc4a5e57 100644 (file)
--- a/SOGo/UI/MailerUI/UIxMailMainFrame.m
+++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m
@@ -111,12 +111,13 @@ static NSString *treeRootClassName = nil;
 
 - (BOOL)showLinkBanner {
   if ([self hideFolderTree]) return NO;
+  return YES;
 }
 - (NSString *)bannerToolbarStyle {
-  return [self showLinkBanner] ? @"top: 48px;" : nil /* fallback to CSS */;
+  return [self showLinkBanner] ? @"top: 58px;" : nil /* fallback to CSS */;
 }
 - (NSString *)bannerConsumeStyle {
-  return [self showLinkBanner] ? @"height: 106px;" : nil /* fallback to CSS */;
+  return [self showLinkBanner] ? @"height: 116px;" : nil /* fallback to CSS */;
 }
 
 /* notifications */

diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index eb4792d7f2cabe6fcf986f462eb36d2a8be945c7..119da9308351b44199643872c9a38b1011d4c705 100644 (file)
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=132
+SUBMINOR_VERSION:=133
 
 # 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 87d3c63eb25dba3f1ad836f2d10e2ebf6f02b1de..7acab9ddd4892ccd8af35864a46dafbcb350c8ed 100644 (file)
--- a/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -77,9 +77,16 @@
                     rsrc:src="CommonUI.SOGo/line_right.gif"/></td>
               </tr>
               <tr>
-                <td valign="top" colspan="3">
+                <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>

diff --git a/SOGo/UI/Templates/UIxPageFrame.wox b/SOGo/UI/Templates/UIxPageFrame.wox
index c63100e99e14aaed01b726f831c8f34026eba314..40a3286b0eff3343f8943fc42d0505af4e4f60bb 100644 (file)
--- a/SOGo/UI/Templates/UIxPageFrame.wox
+++ b/SOGo/UI/Templates/UIxPageFrame.wox
@@ -38,11 +38,7 @@
               <td align="right">
                 <a href="http://www.opengroupware.org:80/" target="OGo">
                   <img rsrc:src="menu_logo_top.gif"
-                       align="center"
-                       border="0"
-                       alt=""
-                       valign="middle"
-                  />
+                       align="center" border="0" alt="" valign="middle" />
                 </a>
               </td>
             </tr>