refined redirects/navigation, cancel button

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

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index ea6afae1692cb94166462af87d1a45f0969c7367..bca248fc41860f52f35a23a9530bec3de5535ec4 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxPageFrame.m: -title returns label for "OpenGroupware.org" when
+         -isUIxDebugEnabled is NO. (v0.9.13)
+
 2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxPageFrame.wox: removed left side navigation completely as it

diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index 6f538e0257f3eb821cd09b166c5a0d11e7265ac9..380d73a70989bacd8936fddba86db01d38453570 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -33,7 +33,9 @@
   ASSIGN(self->title, _value);
 }
 - (NSString *)title {
-  return self->title;
+  if([self isUIxDebugEnabled])
+    return self->title;
+    return [self labelForKey:@"OpenGroupware.org"];
 }
 
 /* URL generation */

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 9cef79939ea704d51f0e6725b9964991d0cafe31..92c8fa08c38f073a34665a077f87e34ece0ab9e3 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=12
+SUBMINOR_VERSION:=13

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index a2e32b27b2ec40be9b90d56536bb0bdcfab4b689..cfc807ff1212708f3a84560e26d83d29f5ca57a2 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.37
+
+       * English.lproj/default.strings: new labels
+
+       * UIxAppointmentEditor.m: after save, return to ".." instead of "view"
+
+       * UIxAppointmentEditor.wox: added "Cancel" button.
+
+       * UIxCalView.m: refined behaviour of redirects according to Helge's
+         request.
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxAppointmentEditor.m: Changed "X-OGo-RESOURCE" into

diff --git a/SOGo/UI/Scheduler/English.lproj/default.strings b/SOGo/UI/Scheduler/English.lproj/default.strings
index 854f6c848d883e5fad7b3f13fb3a2b85ca144381..a308c1c04fab93cf1605368925ac56ec90879484 100644 (file)
--- a/SOGo/UI/Scheduler/English.lproj/default.strings
+++ b/SOGo/UI/Scheduler/English.lproj/default.strings
@@ -70,10 +70,12 @@
 
 /* Misc */
 
-"new"           = "new";
-"printview"     = "printview";
-"proposal"      = "proposal";
-"Save"          = "Save";
+"new"               = "new";
+"printview"         = "printview";
+"proposal"          = "proposal";
+"Save"              = "Save";
+"Cancel"            = "Cancel";
+"OpenGroupware.org" = "OpenGroupware.org"
 
 
 /* Appointments */

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index b3f854066bf0240f0bf0fb0cbd445a3ccefff219..12c296cb45461cf2f78daf16a19b81ef1828c3f7 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -426,7 +426,7 @@
     // TODO: add some error handling in form! (eg like in Zope)
   }
   
-  uri = [self _completeURIForMethod:@"view"];
+  uri = [self _completeURIForMethod:@".."];
   return [self redirectToLocation:uri];
 }
 

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 3ac73b49bd3861b2d0001c0551632ae2663568a9..063e6f32191697704560530dfb0de3aa00a6dba0 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -259,11 +259,16 @@
       <tr>
         <td>
             <input type="submit" label:value="Save" name="save:method" />
-            <input type="hidden" name="ical" var:value="iCalString" />
-            <!-- <input type="submit" value="test" name="test:method" /> -->
+            <span class="button_auto_env"><a href="javascript:history.back()"
+               class="button_auto"
+            ><var:string label:value="Cancel" /></a></span>
+            <var:if condition="isUIxDebugEnabled">
+              <input type="submit" value="Test" name="test:method" />
+            </var:if>
         </td>
       </tr>
     </table>
+    <input type="hidden" name="ical" var:value="iCalString" />
   </form>
   <var:if condition="isUIxDebugEnabled">
     <hr />

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 8aa76178a688cf3e5f4b510a447bd570cc6192b2..9cef50ae16bf997256a93e03c38770cd43208ada 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -404,6 +404,7 @@ static BOOL shouldDisplayWeekend = NO;
   NSString   *uidsString, *loc, *prevMethod;
   WORequest  *req;
   id <WOActionResults> r;
+  BOOL useGroups;
 
   req = [[self context] request];
 
@@ -415,12 +416,30 @@ static BOOL shouldDisplayWeekend = NO;
     prevMethod = @"";
 
   uri = [[NSMutableString alloc] initWithString:[self _userFolderURI]];
-  if(!(([uidsString length] == 0) ||
-       ([[uri lastPathComponent] isEqualToString:uidsString]))) {
-    [uri appendString:@"/Groups/_custom_"];
+  /* if we have more than one entry, use groups - otherwise don't */
+  useGroups = [uidsString rangeOfString:@","].length > 0;
+
+  if(useGroups) {
+    [uri appendString:@"Groups/_custom_"];
     [uri appendString:uidsString];
+    [uri appendString:@"/"];
+  }
+  else {
+      /* check if lastPathComponent is the base that we want to have */
+      if((([uidsString length] != 0) &&
+          (![[uri lastPathComponent] isEqualToString:uidsString]))) {
+          NSRange r;
+          
+          /* uri ends with an '/', so we have to adjust the range a little */
+          r = NSMakeRange(0, [uri length] - 1);
+          r = [uri rangeOfString:@"/"
+                         options:NSBackwardsSearch
+                           range:r];
+          r = NSMakeRange(r.location + 1, [uri length] - r.location - 2);
+          [uri replaceCharactersInRange:r withString:uidsString];
+      }
   }
-  [uri appendString:@"/Calendar/"];
+  [uri appendString:@"Calendar/"];
   [uri appendString:prevMethod];
 
 #if 0

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 4d40cd2fafd119406077d217ee923248571b85ee..4b9056fce557f63f7534b84a05effce978c36ace 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=36
+SUBMINOR_VERSION:=37
 
 # v0.9.31 requires libWEExtensions v4.2.52
 # v0.9.29 requires libWEExtensions v4.2.51