added 'help' hyperlink

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

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 9d8455da5eceaaf46a670354ae00743c4038326c..dd9fbc2669fbea34322d054868a3b5ee541f42d6 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * English.lproj/Localizable.strings: added new 'Help' label (v0.9.38)
+
 2005-07-05  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * calendar.css: added appointment priority styles (v0.9.37)

diff --git a/SOGo/UI/Common/English.lproj/Localizable.strings b/SOGo/UI/Common/English.lproj/Localizable.strings
index cd6f104cdc3e0da9e4d78cac28cd8d637ecf9354..1efca9b5a2a3c3e5a9345cdf71bcc1dd80103c85 100644 (file)
--- a/SOGo/UI/Common/English.lproj/Localizable.strings
+++ b/SOGo/UI/Common/English.lproj/Localizable.strings
@@ -5,3 +5,5 @@
 "Mail"         = "Mail";
 
 "You are here" = "You are here";
+
+"Help"         = "Help";

diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index 8e3fb52858ea9646af673b54d92ee589cb4526c3..59e534a200a9be64e75cfbce989c8806c1d841f6 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -64,6 +64,15 @@
   return [[self clientObject] ownerInContext:[self context]];
 }
 
+/* Help URL/target */
+
+- (NSString *)helpURL {
+  return [NSString stringWithFormat:@"help/%@.html", self->title];
+}
+- (NSString *)helpWindowTarget {
+  return [NSString stringWithFormat:@"Help_%@", self->title];
+}
+
 
 /* notifications */
 

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index b37763b2d8db4325c20873f4754197e6a02fa1bd..d3599265cb8eadb5f258d009039438838a8b570c 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=37
+SUBMINOR_VERSION:=38
 
 # v0.9.28 requires NGExtensions v4.5.136

diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 7d6a330faa02a9266bd4682f9e7f7a044ffc924e..47bb72c16f2194079e63420fb0840ca2477fe173 100644 (file)
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxPageFrame.wox: added 'help' hyperlink
+
 2005-07-06  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxCalInlineAptView.wox: add private appointment icon for non-public

diff --git a/SOGo/UI/Templates/UIxPageFrame.wox b/SOGo/UI/Templates/UIxPageFrame.wox
index 4678202ea60282a5b45afbe1006012d2a5777985..5ca725a3e49d4893bb38b949a93d51aee8c9db9d 100644 (file)
--- a/SOGo/UI/Templates/UIxPageFrame.wox
+++ b/SOGo/UI/Templates/UIxPageFrame.wox
@@ -53,9 +53,16 @@
               <td class="linecolor"><img rsrc:src="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>