From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 7 Jul 2005 10:34:30 +0000 (+0000)
Subject: added 'help' hyperlink
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9161de35946bfd559192148c8522ccfc323b03e5;p=scalable-opengroupware.org

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 9d8455da..dd9fbc26 100644
--- 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 cd6f104c..1efca9b5 100644
--- 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 8e3fb528..59e534a2 100644
--- 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 b37763b2..d3599265 100644
--- 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 7d6a330f..47bb72c1 100644
--- 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 4678202e..5ca725a3 100644
--- 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>