From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 7 Jul 2005 16:09:48 +0000 (+0000)
Subject: new hyperlinks in UIxPageFrame
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=126332f2046a217cacc9de4dee600a69f4db831b;p=scalable-opengroupware.org

new hyperlinks in UIxPageFrame

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

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index dd9fbc26..d55096da 100644
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,6 +1,14 @@
 2005-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-	* English.lproj/Localizable.strings: added new 'Help' label (v0.9.38)
+	* v0.9.39
+
+	* UIxPageFrame.m: added new -
+	* English.lproj/Localizable.strings: added new 'Home' and
+	  'Administration' labels
+
+	* v0.9.38
+
+	* English.lproj/Localizable.strings: added new 'Help' label
 
 2005-07-05  Marcus Mueller  <znek@mulle-kybernetik.com>
 
diff --git a/SOGo/UI/Common/English.lproj/Localizable.strings b/SOGo/UI/Common/English.lproj/Localizable.strings
index 1efca9b5..7d0719c7 100644
--- a/SOGo/UI/Common/English.lproj/Localizable.strings
+++ b/SOGo/UI/Common/English.lproj/Localizable.strings
@@ -1,9 +1,11 @@
 /* this file is in UTF-8 format! */
 
-"Calendar"	= "Calendar";
-"Addressbook"	= "Addressbook";
-"Mail"		= "Mail";
+"Home"			= "Home";
+"Calendar"		= "Calendar";
+"Addressbook"		= "Addressbook";
+"Mail"			= "Mail";
+"Administration"	= "Right Administration";
 
-"You are here"	= "You are here";
+"You are here"		= "You are here";
 
-"Help"		= "Help";
+"Help"			= "Help";
diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index 59e534a2..6c935e08 100644
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -84,6 +84,10 @@
 /* URL generation */
 // TODO: I think all this should be done by the clientObject?!
 
+- (NSString *)relativeHomePath {
+  return [self relativePathToUserFolderSubPath:@""];
+}
+
 - (NSString *)relativeCalendarPath {
   return [self relativePathToUserFolderSubPath:@"Calendar/"];
 }
diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index d3599265..8679947c 100644
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=38
+SUBMINOR_VERSION:=39
 
 # v0.9.28 requires NGExtensions v4.5.136
diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 8f1dc6a1..40019ba1 100644
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* UIxPageFrame.wox: added 'Home' and 'Administration' hyperlink
+
 	* UIxPageFrame.wox: added 'help' hyperlink
 
 	* UIxPageFrame.wox: added 'isAccessRestricted' debug output
diff --git a/SOGo/UI/Templates/UIxPageFrame.wox b/SOGo/UI/Templates/UIxPageFrame.wox
index e7cfe084..c63100e9 100644
--- a/SOGo/UI/Templates/UIxPageFrame.wox
+++ b/SOGo/UI/Templates/UIxPageFrame.wox
@@ -24,12 +24,16 @@
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
               <td valign="bottom" style="font-size: 10pt;">
+                <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>
+                ><var:string label:value="Mail" /></a> |
+                <a href="http://to.be.done/"
+                ><var:string label:value="Administration" /></a>
               </td>
               <td align="right">
                 <a href="http://www.opengroupware.org:80/" target="OGo">