From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 11 Jul 2005 12:36:45 +0000 (+0000)
Subject: fixed links in banner (#1448)
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a3798937e69502e076994f5326fddf5179d861e;p=scalable-opengroupware.org

fixed links in banner (#1448)


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

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 9a712bfe..1ce44b93 100644
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-11  Helge Hess  <helge.hess@opengroupware.org>
+
+	* UIxMailMainFrame.m: generate proper URLs for jumping to Calendar,
+	  HomePage etc (#1448) (v0.9.136)
+
 2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
 
 	* UIxMailEditor.m: added from-selection popup, list discovery via
diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m
index 9be337ee..4d4465a2 100644
--- a/SOGo/UI/MailerUI/UIxMailMainFrame.m
+++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m
@@ -195,4 +195,22 @@ static NSString *treeRootClassName = nil;
 		     @"</script>", errorText];
 }
 
+/* URLs */
+
+- (NSString *)relativeHomePath {
+  return [self relativePathToUserFolderSubPath:@""];
+}
+
+- (NSString *)relativeCalendarPath {
+  return [self relativePathToUserFolderSubPath:@"Calendar/"];
+}
+
+- (NSString *)relativeContactsPath {
+  return [self relativePathToUserFolderSubPath:@"Contacts/"];
+}
+
+- (NSString *)relativeMailPath {
+  return [self relativePathToUserFolderSubPath:@"Mail/"];
+}
+
 @end /* UIxMailMainFrame */
diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index ebc04838..3dd15304 100644
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=135
+SUBMINOR_VERSION:=136
 
 # v0.9.134 requires libSOGo          v0.9.41
 # v0.9.100 requires libNGMime        v4.5.213
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 7acab9dd..3661ccd9 100644
--- a/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -52,7 +52,7 @@
                   <a var:href="relativeMailPath"
                   ><var:string label:value="Mail" /></a> |
                   <a href="http://to.be.done/"
-                  ><var:string label:value="Administration" /></a>
+                  ><var:string label:value="Right Administration" /></a>
                 </td>
                 <td class="linkbannerimage">
                   <a href="http://www.opengroupware.org:80/" target="OGo">