fixes

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index ba1a65bb92920686dfb05d2d2cef54aa37934f49..61287cd7b63f4969c6d90188f96f03d60f3fe948 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,13 @@
 2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * v0.9.59
+
+       * UIxTimeDateControl.m: subclasses from UIxComponent now, hence
+         -viewTimeZone should work correctly now.
+
+       * UIxAppointmentProposal.wox, UIxAppointmentEditor.wox: fixed
+         cancel button urls.
+
        * v0.9.58
 
        * UIxAppointmentProposal.[wox,m]: fixed date/time fields.

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 19d5f132c319e50364a341411bbd979b6340302e..903a2013d3c20623b5f62ac854454c91affde77c 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -200,9 +200,11 @@
       <tr>
         <td>
             <input type="submit" label:value="Save" name="save:method" />
-            <span class="button_auto_env"><a href="javascript:history.back()"
-               class="button_auto"
-            ><var:string label:value="Cancel" /></a></span>
+            <span class="button_auto_env"
+            ><a href="../weekoverview"
+                var:queryDictionary="queryParameters"
+                class="button_auto"
+             ><var:string label:value="Cancel" /></a></span>
             <var:if condition="isUIxDebugEnabled">
               <input type="submit" value="Test" name="test:method" />
             </var:if>

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
index d392e9d9e9a3e78b40c2315ae7b51f4c3884dcfa..1f29e8a545b01cb614a84acf7284c65cd9a44a7a 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
@@ -183,7 +183,9 @@
                            name="proposalSearch:method"
                     />
                     <span class="button_auto_env"
-                      ><a href=".." class="button_auto"
+                      ><a href="weekoverview"
+                          var:queryDictionary="queryParameters"
+                          class="button_auto"
                       ><var:string label:value="Cancel" /></a></span>
                   </td>
                 </tr>

diff --git a/SOGo/UI/Scheduler/UIxTimeDateControl.m b/SOGo/UI/Scheduler/UIxTimeDateControl.m
index 5a981c9d698a1ac21c08417bd0e14128a5844e8e..0768ec7b320025faf369a879c04d861e2985f036 100644 (file)
--- a/SOGo/UI/Scheduler/UIxTimeDateControl.m
+++ b/SOGo/UI/Scheduler/UIxTimeDateControl.m
@@ -20,9 +20,9 @@
 */
 // $Id$
 
-#include <NGObjWeb/NGObjWeb.h>
+#include <SOGoUI/UIxComponent.h>
 
-@interface UIxTimeDateControl : WOComponent
+@interface UIxTimeDateControl : UIxComponent
 {
   NSString *controlID;
   NSString *label;
@@ -66,14 +66,6 @@
 
 @implementation UIxTimeDateControl
 
-static NSTimeZone *MET = nil;
-
-+ (void)initialize {
-    if (MET == nil) {
-        MET = [[NSTimeZone timeZoneWithAbbreviation:@"MET"] retain];
-    }
-}
-
 - (void)dealloc {
   [self->controlID release];
   [self->label     release];
@@ -185,7 +177,7 @@ static NSTimeZone *MET = nil;
                               hour:_hour
                             minute:_minute
                             second:_second
-                          timeZone:MET];
+                          timeZone:[self viewTimeZone]];
   [self debugWithFormat:@"%s setting date:%@", __PRETTY_FUNCTION__, d];
   [self _setDate:d];
 }

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index b6179f4b8fd6f34ede9d339c3d159baa453973ad..1cf2745de4ee8d0e11b3da7b06f1733141ca7f2d 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=58
+SUBMINOR_VERSION:=59
 
 # v0.9.41 requires libNGObjWeb     v4.2.431
 # v0.9.31 requires libWEExtensions v4.2.52