From 54256096f3f99671bcbecb4c5f0f87a24b44c6af Mon Sep 17 00:00:00 2001 From: znek Date: Mon, 18 Oct 2004 15:45:04 +0000 Subject: [PATCH] lots of improvements git-svn-id: http://svn.opengroupware.org/SOGo/trunk@405 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Main/ChangeLog | 9 ++++ SOGo/Main/English.lproj/default.strings | 1 + SOGo/Main/French.lproj/default.strings | 1 + SOGo/Main/SOGoUserHomePage.wox | 2 +- SOGo/Main/Version | 2 +- SOGo/UI/Anais/AnaisUidSelector.m | 2 +- SOGo/UI/Anais/AnaisUidSelector.wox | 6 ++- SOGo/UI/Anais/ChangeLog | 9 ++++ SOGo/UI/Anais/Version | 2 +- SOGo/UI/Common/ChangeLog | 11 +++++ SOGo/UI/Common/English.lproj/default.strings | 1 + SOGo/UI/Common/French.lproj/default.strings | 1 + SOGo/UI/Common/UIxPageFrame.m | 46 +++----------------- SOGo/UI/Common/UIxPageFrame.wox | 36 +++------------ SOGo/UI/Common/Version | 2 +- SOGo/UI/SOGoUI/ChangeLog | 5 +++ SOGo/UI/SOGoUI/UIxComponent.m | 18 +++++--- SOGo/UI/SOGoUI/Version | 2 +- SOGo/UI/Scheduler/ChangeLog | 5 +++ SOGo/UI/Scheduler/UIxAppointmentEditor.wox | 5 +-- SOGo/UI/Scheduler/Version | 2 +- 21 files changed, 80 insertions(+), 88 deletions(-) diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index bf03fa09..91bc56d7 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,12 @@ +2004-10-18 Marcus Mueller + + * v0.9.14 + + * SOGoUserHomePage.wox: Changed label for "eMail" to "Mail" for + consistency + + * *.lproj/default.strings: added label "Mail" + 2004-09-26 Helge Hess * 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 1e1780fb..900bf885 100644 --- 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 538d7666..4de5e714 100644 --- 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 2130a915..4c850805 100644 --- a/SOGo/Main/SOGoUserHomePage.wox +++ b/SOGo/Main/SOGoUserHomePage.wox @@ -16,6 +16,6 @@
    • -
    • +
diff --git a/SOGo/Main/Version b/SOGo/Main/Version index 92c8fa08..cc039aca 100644 --- 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 3d500a0c..01f77606 100644 --- 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 e0611017..546fdd42 100644 --- 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" + /> + diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog index a289f06d..2edcc70a 100644 --- a/SOGo/UI/Anais/ChangeLog +++ b/SOGo/UI/Anais/ChangeLog @@ -1,3 +1,12 @@ +2004-10-18 Marcus Mueller + + * 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 * AnaisAttendeeSelector.m: minor cleanup (v0.9.15) diff --git a/SOGo/UI/Anais/Version b/SOGo/UI/Anais/Version index 0270084a..3ec1cfd0 100644 --- 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 40e21db4..0397ac38 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,14 @@ +2004-10-18 Marcus Mueller + + * 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 * 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 fd9dd6ca..79275af8 100644 --- 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 635a2617..e40a11d5 100644 --- 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 10c4b3c6..439e8125 100644 --- 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 b04ed19d..69224348 100644 --- a/SOGo/UI/Common/UIxPageFrame.wox +++ b/SOGo/UI/Common/UIxPageFrame.wox @@ -24,10 +24,12 @@
- | - + | + @@ -58,34 +60,6 @@
- diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version index 3f897055..cbe75679 100644 --- 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 87bc4eb3..7866f5b6 100644 --- a/SOGo/UI/SOGoUI/ChangeLog +++ b/SOGo/UI/SOGoUI/ChangeLog @@ -1,3 +1,8 @@ +2004-10-18 Marcus Mueller + + * UIxComponent.m: changed the implementation of -ownPath and fixed a + bug in -userFolderPath (v0.9.15) + 2004-10-12 Marcus Mueller * UIxComponent.m: added some helper methods for computing relative diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m index f87bfe24..a0634461 100644 --- 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 cc039aca..cf9e5c12 100644 --- 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 36e9ff1c..cf7b3d9a 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,8 @@ +2004-10-18 Marcus Mueller + + * UIxAppointmentEditor.wox: added possibility to add resources from + Addressbook (v0.9.90) + 2004-10-16 Marcus Mueller * UIxAppointmentEditor.wox: added "withCN=YES" to resources because diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox index 3121e1c9..2d003e34 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox @@ -156,12 +156,11 @@ @@ -194,8 +193,8 @@ const:selectorID="resource" const:role="NON-PARTICIPANT" attendees="resources" - const:division="CC" const:withCN="YES" + const:withAddressBook="YES" /> diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 2504eba2..486103bc 100644 --- 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 -- 2.39.5