lots of improvements

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index bf03fa09ecf3df00e81030a49483997469c1eca3..91bc56d7afcde9fa37285013e18377cc94dd304a 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.14
+
+       * SOGoUserHomePage.wox: Changed label for "eMail" to "Mail" for 
+         consistency
+       
+       * *.lproj/default.strings: added label "Mail"
+
 2004-09-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * sogod.m: return 404 for favicon.ico queries (v0.9.13)

diff --git a/SOGo/Main/English.lproj/default.strings b/SOGo/Main/English.lproj/default.strings
index 1e1780fb49a6c836d472f10e446aded3a5586d48..900bf8858477afa02a0b6af287c834b256de736a 100644 (file)
--- a/SOGo/Main/English.lproj/default.strings
+++ b/SOGo/Main/English.lproj/default.strings
@@ -2,3 +2,4 @@
 
 "Calendar"     = "Calendar";
 "Addressbook"  = "Addressbook";
+"Mail"         = "Mail";

diff --git a/SOGo/Main/French.lproj/default.strings b/SOGo/Main/French.lproj/default.strings
index 538d76660949f1ec372e80d141a618f455379f16..4de5e71486eb5758520a015b25bab124724644a3 100644 (file)
--- a/SOGo/Main/French.lproj/default.strings
+++ b/SOGo/Main/French.lproj/default.strings
@@ -2,3 +2,4 @@
 
 "Calendar"     = "Agenda";
 "Addressbook"  = "Carnet d'adresses";
+"Mail"         = "Mail";

diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox
index 2130a915a5365d7e137991f6cdcce1e2b0158676..4c8508051ef8a4beec0f56192cefd151218c6298 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.wox
+++ b/SOGo/Main/SOGoUserHomePage.wox
@@ -16,6 +16,6 @@
   <ul>
     <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>
+    <li><a href="Mail/"     ><var:string label:value="Mail"        /></a></li>
   </ul>
 </var:component>

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 92c8fa08c38f073a34665a077f87e34ece0ab9e3..cc039aca8fe720e89b35bf8bb715cdccb043159e 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=13
+SUBMINOR_VERSION:=14

diff --git a/SOGo/UI/Anais/AnaisUidSelector.m b/SOGo/UI/Anais/AnaisUidSelector.m
index 3d500a0c56d81039b28836ee88399f0332fb8459..01f7760682f27b01f932d14ccec7e2d56b4ac59e 100644 (file)
--- a/SOGo/UI/Anais/AnaisUidSelector.m
+++ b/SOGo/UI/Anais/AnaisUidSelector.m
@@ -150,7 +150,7 @@
     @"}\n"
     @"function addUid(division, cn, dn, email, uid, sn) {\n"
     @"  if(!uid)\n"
-    @"    uid='unknown';\n"
+    @"    return;\n"
     @"  var e = document.getElementById('anaisUIDString');\n"
     @"  var s = e.getAttribute('value');\n"
     @"  if(s)\n"

diff --git a/SOGo/UI/Anais/AnaisUidSelector.wox b/SOGo/UI/Anais/AnaisUidSelector.wox
index e0611017ad8afc36bcde3e7e78bd4844504f5688..546fdd42410ca485cfe459b94c188a6941677255 100644 (file)
--- a/SOGo/UI/Anais/AnaisUidSelector.wox
+++ b/SOGo/UI/Anais/AnaisUidSelector.wox
@@ -20,7 +20,11 @@
                            label:title="Search in Anais"
                            const:windowId="UidSelector"
                            const:callback="addUid"
-                           const:division="TEST"
+            />
+            <var:component className="UIxContactSelector"
+                           label:title="Search in Addressbook"
+                           const:windowId="UidSelector"
+                           const:callback="addUid"
             />
           </td>
           <td id="addMeToo" class="button_submit_env" var:style="meTooStyle">

diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog
index a289f06d4afc49beb323f2ebdea668b029b0b0da..2edcc70a09468eb3373f4be46753487a6610acbb 100644 (file)
--- a/SOGo/UI/Anais/ChangeLog
+++ b/SOGo/UI/Anais/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.16
+
+       * AnaisUidSelector.m: changed function addUid to instantly return if
+         given uid is empty
+       
+       * AnaisUidSelector.wox: added UixContactSelector
+
 2004-10-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * AnaisAttendeeSelector.m: minor cleanup (v0.9.15)

diff --git a/SOGo/UI/Anais/Version b/SOGo/UI/Anais/Version
index 0270084a6c6cae5003c4e2783ab1c159b4f5785a..3ec1cfd088446903dd02e2d761e4f2d5e33eca73 100644 (file)
--- a/SOGo/UI/Anais/Version
+++ b/SOGo/UI/Anais/Version
@@ -1,3 +1,3 @@
 # $Id: Version 165 2004-08-05 17:55:50Z znek $
 
-SUBMINOR_VERSION:=15
+SUBMINOR_VERSION:=16

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 40e21db4bd286a5ca43608b5cd8ff6d887883644..0397ac38178dd102bc1bad326193d8d2cbc021d6 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.27
+
+       * UIxPageFrame.wox: added Mail, fixed relative URL composition
+
+       * UIxPageFrame.m: removed URL processing, instead uses methods from
+         UIxComponent
+
+       * *.lproj/default.strings: added label "Mail"
+
 2004-09-20  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxPageFrame.m: added item ivar (v0.9.26)

diff --git a/SOGo/UI/Common/English.lproj/default.strings b/SOGo/UI/Common/English.lproj/default.strings
index fd9dd6caf84207126ba4d701291213a516a44a5a..79275af859cf29db514c2738c9c0150aae6cbda7 100644 (file)
--- a/SOGo/UI/Common/English.lproj/default.strings
+++ b/SOGo/UI/Common/English.lproj/default.strings
@@ -2,5 +2,6 @@
 
 "Calendar"     = "Calendar";
 "Addressbook"  = "Addressbook";
+"Mail"         = "Mail";
 
 "You are here" = "You are here";

diff --git a/SOGo/UI/Common/French.lproj/default.strings b/SOGo/UI/Common/French.lproj/default.strings
index 635a26176159f1800f2cea6f8b3920f1b7ae74da..e40a11d5d7304a395de23196fe26e93251e3deac 100644 (file)
--- a/SOGo/UI/Common/French.lproj/default.strings
+++ b/SOGo/UI/Common/French.lproj/default.strings
@@ -2,5 +2,6 @@
 
 "Calendar"     = "Agenda";
 "Addressbook"  = "Carnet d'adresses";
+"Mail"         = "Mail";
 
 "You are here" = "Vous êtes ici";

diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index 10c4b3c638e316b0643436d431ed950feda30b0f..439e812517d9f356f8a286bdea82b89037204bc8 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -25,15 +25,9 @@
 @interface UIxPageFrame : UIxComponent
 {
   NSString *title;
-  NSString *rootURL;
-  NSString *userRootURL;
   id item;
 }
 
-- (NSString *)rootURL;
-- (NSString *)userRootURL;
-- (NSString *)calendarRootURL;
-
 @end
 
 #include "common.h"
@@ -44,8 +38,6 @@
 - (void)dealloc {
   [self->item        release];
   [self->title       release];
-  [self->rootURL     release];
-  [self->userRootURL release];
   [super dealloc];
 }
 
@@ -78,42 +70,16 @@
 /* URL generation */
 // TODO: I think all this should be done by the clientObject?!
 
-- (NSString *)rootURL {
-  WOContext *ctx;
-  NSArray   *traversalObjects;
-
-  if (self->rootURL != nil)
-    return self->rootURL;
-
-  ctx = [self context];
-  traversalObjects = [ctx objectTraversalStack];
-  self->rootURL = [[[traversalObjects objectAtIndex:0]
-                                      rootURLInContext:ctx]
-                                      copy];
-  return self->rootURL;
+- (NSString *)relativeCalendarPath {
+  return [self relativePathToUserFolderSubPath:@"Calendar/"];
 }
 
-- (NSString *)userRootURL {
-  WOContext *ctx;
-  NSArray   *traversalObjects;
-
-  if (self->userRootURL)
-    return self->userRootURL;
-
-  ctx = [self context];
-  traversalObjects = [ctx objectTraversalStack];
-  self->userRootURL = [[[[traversalObjects objectAtIndex:1]
-                                           baseURLInContext:ctx]
-                                           stringByAppendingString:@"/"]
-                                           retain];
-  return self->userRootURL;
+- (NSString *)relativeContactsPath {
+  return [self relativePathToUserFolderSubPath:@"Contacts/"];
 }
 
-- (NSString *)calendarRootURL {
-  return [[self userRootURL] stringByAppendingString:@"Calendar/"];
-}
-- (NSString *)contactsRootURL {
-  return [[self userRootURL] stringByAppendingString:@"Contacts/"];
+- (NSString *)relativeMailPath {
+  return [self relativePathToUserFolderSubPath:@"Mail/"];
 }
 
 @end /* UIxPageFrame */

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index b04ed19d9b93abd4384beb2bc222448f7f0c97b4..69224348fea65d5f97baa102c5d5140985f67e20 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -24,10 +24,12 @@
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
               <td valign="bottom" style="font-size: 10pt;">
-                <a var:href="calendarRootURL"
+                <a var:href="relativeCalendarPath"
                 ><var:string label:value="Calendar" /></a> |
-                <a var:href="contactsRootURL"
-                ><var:string label:value="Addressbook" /></a>
+                <a var:href="relativeContactsPath"
+                ><var:string label:value="Addressbook" /></a> |
+                <a var:href="relativeMailPath"
+                ><var:string label:value="Mail" /></a>
               </td>
               <td align="right">
                 <a href="http://www.opengroupware.org:80/" target="OGo">
@@ -58,34 +60,6 @@
           </table>
         </td>
       </tr>
-      <!--
-      <tr>
-        <td valign="top">
-          <table cellpadding="0" cellspacing="0" border="0" width="100%">
-            <tr valign="top">
-              <td align="left" width="10%">
-                <a var:href="userRootURL"
-                   class="skydockfont"
-                >SOGo (<var:string value="shortUserNameForDisplay" />)</a>
-              </td>
-              <td align="left" width="10%">
-                <a var:href="calendarRootURL"
-                   class="skyDockFont"
-                ><var:string label:value="Calendar" /></a>
-              </td>
-              <td align="left" width="10%">
-                <a var:href="userRootURL"
-                   class="skydockfont"
-                ><var:string label:value="Contacts" /></a>
-              </td>
-              <td align="left" width="70%">
-                <var:entity const:name="nbsp" />
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      -->
       <tr>
         <td valign="top" width="100%">
           <var:component-content/>

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 3f89705521a483757db74bbbace46267ca691352..cbe756794b8f95c1a0813a588adb688acb81f51f 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=26
+SUBMINOR_VERSION:=27

diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index 87bc4eb3b29d156f500c9664d813d05b951262e6..7866f5b6c0ad6bb3d73622d492a7bd07a164c3b5 100644 (file)
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxComponent.m: changed the implementation of -ownPath and fixed a
+         bug in -userFolderPath (v0.9.15)
+
 2004-10-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxComponent.m: added some helper methods for computing relative

diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index f87bfe24edcd15f4b59aedc7405649395a88b5c1..a063446131418a79ca42f85d62680c0992b14192 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -236,17 +236,23 @@ static BOOL uixDebugEnabled = NO;
   
   ctx = [self context];
   traversalObjects = [ctx objectTraversalStack];
-  url = [[[traversalObjects objectAtIndex:1]
-                            baseURLInContext:ctx]
-                            stringByAppendingString:@"/"];
+  url = [[traversalObjects objectAtIndex:1]
+                           baseURLInContext:ctx];
   return [[NSURL URLWithString:url] path];
 }
 
 - (NSString *)ownPath {
-  NSString *url;
+  NSString *uri;
+  NSRange  r;
   
-  url = [[self clientObject] baseURLInContext:[self context]];
-  return [[NSURL URLWithString:url] path];
+  uri = [[[self context] request] uri];
+  
+  /* first: cut off query parameters */
+  
+  r = [uri rangeOfString:@"?" options:NSBackwardsSearch];
+  if (r.length > 0)
+    uri = [uri substringToIndex:r.location];
+  return uri;
 }
 
 - (NSString *)relativePathToUserFolderSubPath:(NSString *)_sub {

diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version
index cc039aca8fe720e89b35bf8bb715cdccb043159e..cf9e5c1262bbe256db9dcbe38538f8ad07693b99 100644 (file)
--- a/SOGo/UI/SOGoUI/Version
+++ b/SOGo/UI/SOGoUI/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 36e9ff1c483133e49973f50f6faf6ed96404dd55..cf7b3d9a156466aec34728ecebdc49cc48330b3c 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxAppointmentEditor.wox: added possibility to add resources from
+         Addressbook (v0.9.90)
+
 2004-10-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxAppointmentEditor.wox: added "withCN=YES" to resources because

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
index 3121e1c9269962f104efb2c68609abfee74349b8..2d003e3428a66e704ea38ad446d2d3b70a64c710 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox
@@ -156,12 +156,11 @@
                 <span class="aptview_text">
                   <var:component className="AnaisAttendeeSelector"
                                  const:selectorID="participant"
-                                 const:division="CC"
-                                 const:withCN="YES"
                                  const:role="REQ-PARTICIPANT"
                                  attendees="participants"
                                  var:emailForUser="emailForUser"
                                  var:cnForUser="cnForUser"
+                                 const:withCN="YES"
                                  const:withAddressBook="YES"
                   />
                 </span>
@@ -194,8 +193,8 @@
                                  const:selectorID="resource"
                                  const:role="NON-PARTICIPANT"
                                  attendees="resources"
-                                 const:division="CC"
                                  const:withCN="YES"
+                                 const:withAddressBook="YES"
                   />
                 </span>
               </td>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 2504eba2baaaa3cb916c6c38bbfa422c33d783a7..486103bc671b06f641cf9890a5ca969be6d3157b 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=88
+SUBMINOR_VERSION:=90
 
 # v0.9.84 requires libSOGoLogic    v0.9.12
 # v0.9.70 requires libNGExtensions v4.3.107