various minor fixes & enhancements

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 588d4a3c48ce2d264a04292850b32ddbae861c1c..5e9171f9e00b16c47fde259948165145ae79ac76 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-20  Helge Hess  <helge.hess@skyrix.com>
+
+       * SOGoUserHomePage.wox: added link to Mail (v0.9.10)
+
 2004-08-27  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.9

diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox
index c1697f92535b830c01e36b92372c7fabf4db2b2e..c657ec2b6d06533e0097995c5233012db48c9686 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.wox
+++ b/SOGo/Main/SOGoUserHomePage.wox
@@ -13,7 +13,8 @@
   </h3>
 
   <ul>
-    <li><a href="Calendar/" ><var:string label:value="Calendar" /></a></li>
+    <li><a href="Calendar/" ><var:string label:value="Calendar"    /></a></li>
     <li><a href="Contacts/" ><var:string label:value="Addressbook" /></a></li>
+    <li><a href="Mail/"     ><var:string label:value="eMail"       /></a></li>
   </ul>
 </var:component>

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 81be7eb6e79defb0b93e0ca78f8a44c310c033c2..317960a726fc24e656b0d801367866c318018c26 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 607664da121c7c465a12e5db9e6f086bb9eea2ae..6cc26756e38d671acc5c4abc4b070bf2ebcd54f8 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,4 +1,8 @@
-2004-09-08    <helge@agenor.opengroupware.org>
+2004-09-20  Helge Hess  <helge.hess@skyrix.com>
+
+       * SOGoObject.m(-description): added name of container (v0.9.17)
+
+2004-09-08  Helge Hess  <helge.hess@skyrix.com>
 
        * SOGoGroupFolder.m: separate -resetFolderCaches method from -sleep
          (v0.9.16)

diff --git a/SOGo/SoObjects/SOGo/SOGoObject.m b/SOGo/SoObjects/SOGo/SOGoObject.m
index fc8fa491baba949578d570545160b4cec017ccb4..03087268b06e5a65be7b0a8d333c4a99c21d357c 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoObject.m
@@ -108,10 +108,12 @@
 /* description */
 
 - (void)appendAttributesToDescription:(NSMutableString *)_ms {
-  if (self->nameInContainer) 
+  if (self->nameInContainer != nil) 
     [_ms appendFormat:@" name=%@", self->nameInContainer];
-  if (self->container) 
-    [_ms appendFormat:@" container=0x%08X", self->container];
+  if (self->container != nil) {
+    [_ms appendFormat:@" container=0x%08X/%@", 
+          self->container, [self->container valueForKey:@"nameInContainer"]];
+  }
 }
 
 - (NSString *)description {

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index 255d8fd4dc3ce6465c44fe74062d0f7f2a3fd129..15ba30f9c2ef5917f097a43e69ab8d836be54ccb 100644 (file)
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,3 +1,3 @@
 # $Id: Version 170 2004-08-11 10:45:40Z helge $
 
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 724fc3a6bb3158575e5edccca30ccb67f1899e81..4b4aeb2d8e9fac6f599082cad8e48ddcbc9aae90 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-20  Helge Hess  <helge.hess@skyrix.com>
+
+       * UIxPageFrame.wox: improved debugging section (v0.9.25)
+
 2004-09-10  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * uix.css: new button_submit style for the Anais selector, looks

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index f868ee0ad47828e9c8c4df57b0fd64662274e9cd..b04ed19d9b93abd4384beb2bc222448f7f0c97b4 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -41,6 +41,7 @@
               </td>
             </tr>
           </table>
+          <!-- TODO: replace the line with a CSS straight line -->
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
               <td class="linecolor"><img rsrc:src="line_left.gif"/></td>
@@ -93,18 +94,53 @@
       <var:if condition="isUIxDebugEnabled">
         <tr>
           <td colspan="2">
-            <small>
-              <hr />
-              clientObject: <var:string value="clientObject" />
-              <p>
-              OTS: <var:string value="context.objectTraversalStack" />
-              </p>
-            </small>
+            <hr />
+            <table border="0" style="font-size: 9pt;">
+              <tr>
+                <td valign="top">clientObject:</td>
+                <td valign="top"><var:string value="clientObject" /></td>
+              </tr>
+              <tr>
+                <td valign="top">traversal stack:</td>
+                <td valign="top">
+                  <var:foreach list="context.objectTraversalStack" item="item">
+                    <var:string value="item" /><br />
+                  </var:foreach>
+                </td>
+              </tr>
+              <tr>
+                <td valign="top">traversal path:</td>
+                <td valign="top">
+                  <var:foreach list="context.soRequestTraversalPath"
+                               item="item" const:separator=" => ">
+                    <var:string value="item" />
+                  </var:foreach>
+                </td>
+              </tr>
+              <tr>
+                <td valign="top">request type:</td>
+                <td valign="top"><var:string value="context.soRequestType"/>
+                </td>
+              </tr>
+              <tr>
+                <td valign="top">path info:</td>
+                <td valign="top"><var:string value="context.pathInfo"/></td>
+              </tr>
+              <tr>
+                <td valign="top">rootURL:</td>
+                <td valign="top"><var:string value="context.rootURL"/></td>
+              </tr>
+              <tr>
+                <td valign="top">active user:</td>
+                <td valign="top"><var:string value="context.activeUser"/></td>
+              </tr>
+            </table>
           </td>
         </tr>
       </var:if>
       <tr>
         <td colspan="2">
+          <!-- TODO: replace the line with a CSS straight line -->
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
               <td class="linecolor">

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index a281cca1594d733d2ec92e26d77e63bf0f1045e6..8b283eb3b53cdd6a8e556ffea74b87430ca7e635 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=24
+SUBMINOR_VERSION:=25

diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/Mailer/UIxMailView.m
index 209df7c2dea553b556c3ef66780dc7ff71c260ff..95c28d140c51b315448664912fef2db629ea68e3 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailView.m
+++ b/SOGo/UI/Mailer/UIxMailView.m
@@ -20,12 +20,10 @@
 */
 // $Id$
 
-
 #include <SOGoUI/UIxComponent.h>
 
 @interface UIxMailView : UIxComponent
 {
-
 }
 
 - (BOOL)isDeletableClientObject;
@@ -45,8 +43,7 @@
   id url;
 
   if (![self isDeletableClientObject]) {
-    /* return 400 == Bad Request */
-    return [NSException exceptionWithHTTPStatus:400
+    return [NSException exceptionWithHTTPStatus:400 /* Bad Request */
                         reason:@"method cannot be invoked on "
                                @"the specified object"];
   }
@@ -61,4 +58,4 @@
   return [self redirectToLocation:url];
 }
 
-@end
+@end /* UIxMailView */

diff --git a/SOGo/UI/Mailer/UIxMailView.wox b/SOGo/UI/Mailer/UIxMailView.wox
index 7f53e297705a3f1445658fe412ecf84ee220902f..00d401b484e4d388d7248350c0d5a5444d84997a 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailView.wox
+++ b/SOGo/UI/Mailer/UIxMailView.wox
@@ -11,4 +11,4 @@
     <hr />
     clientObject: <var:string value="clientObject" />
   </var:if>
-</var:component>
\ No newline at end of file
+</var:component>