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 dd9fbc2669fbea34322d054868a3b5ee541f42d6..d55096dad0caed59159a8ffebc0d8ecf39dde592 100644 (file)
--- 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 1efca9b5a2a3c3e5a9345cdf71bcc1dd80103c85..7d0719c787402c465f92cfd948b59872da757162 100644 (file)
--- 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 59e534a200a9be64e75cfbce989c8806c1d841f6..6c935e088965015c7335adb2c57bc03a27b6d6ab 100644 (file)
--- 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 d3599265cb8eadb5f258d009039438838a8b570c..8679947c587be5c75685b0d265890ac04f39ce82 100644 (file)
--- 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 8f1dc6a1359ac1c6cef40ed610edb3511d55916a..40019ba19bcb88cda547cfb853c593270cb2b4cb 100644 (file)
--- 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 e7cfe084cac5df2dc9fc92982708500655febb02..c63100e99e14aaed01b726f831c8f34026eba314 100644 (file)
--- 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">