From 8ba9a84a601b7f00bbefb9699374f6fc7c1084f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 3 Oct 2006 14:35:30 +0000 Subject: [PATCH] Monotone-Parent: 449b9c9fa10daa64618c01940a7d7f15a9d6f168 Monotone-Revision: d48095cca5ce95803d881d96312e4b396f275daf Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-03T14:35:30 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 ++ UI/Contacts/UIxContactsMailerSelection.m | 30 +++++ UI/Contacts/UIxContactsSchedulerSelection.m | 30 +++++ UI/Contacts/UIxContactsSelectionView.m | 115 ------------------ .../ContactsUI/UIxContactsMailerSelection.wox | 28 +++++ .../UIxContactsSchedulerSelection.wox | 17 +++ .../ContactsUI/UIxContactsSelectionView.wox | 56 --------- 7 files changed, 112 insertions(+), 171 deletions(-) create mode 100644 UI/Contacts/UIxContactsMailerSelection.m create mode 100644 UI/Contacts/UIxContactsSchedulerSelection.m delete mode 100644 UI/Contacts/UIxContactsSelectionView.m create mode 100644 UI/Templates/ContactsUI/UIxContactsMailerSelection.wox create mode 100644 UI/Templates/ContactsUI/UIxContactsSchedulerSelection.wox delete mode 100644 UI/Templates/ContactsUI/UIxContactsSelectionView.wox diff --git a/ChangeLog b/ChangeLog index 6937d3c1b..a36709112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-03 Wolfgang Sourdeau + + * UI/Contacts/UIxContactsMailerSelection.m, + UI/Contacts/UIxContactsSchedulerSelection.m: classes replacing + UI/Contacts/UIxContactsSelectionView.m to provide a different set + of widgets depending on the application invoking the contact list. + 2006-09-29 Wolfgang Sourdeau * UI/WebServerResources/ContactsUI.js: hide the current contact diff --git a/UI/Contacts/UIxContactsMailerSelection.m b/UI/Contacts/UIxContactsMailerSelection.m new file mode 100644 index 000000000..830dd573e --- /dev/null +++ b/UI/Contacts/UIxContactsMailerSelection.m @@ -0,0 +1,30 @@ +/* + Copyright (C) 2004-2005 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#import + +@interface UIxContactsMailerSelection : UIxComponent + +@end + +@implementation UIxContactsMailerSelection + +@end /* UIxContactsMailerSelection */ diff --git a/UI/Contacts/UIxContactsSchedulerSelection.m b/UI/Contacts/UIxContactsSchedulerSelection.m new file mode 100644 index 000000000..3a9c49b25 --- /dev/null +++ b/UI/Contacts/UIxContactsSchedulerSelection.m @@ -0,0 +1,30 @@ +/* + Copyright (C) 2004-2005 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#import + +@interface UIxContactsSchedulerSelection : UIxComponent + +@end + +@implementation UIxContactsSchedulerSelection + +@end /* UIxContactsSchedulerSelection */ diff --git a/UI/Contacts/UIxContactsSelectionView.m b/UI/Contacts/UIxContactsSelectionView.m deleted file mode 100644 index 2b94ecfda..000000000 --- a/UI/Contacts/UIxContactsSelectionView.m +++ /dev/null @@ -1,115 +0,0 @@ -/* - Copyright (C) 2004-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#include "UIxContactsListViewBase.h" -#include - -@interface UIxContactsSelectionView : UIxContactsListViewBase -{ - NSString *callback; -} - -// - (NSString *)_getCN; -// - (NSString *)getCN; -// - (NSString *)getSN; -// - (NSString *)getMail; -// - (NSString *)getUID; - -@end - -// #include "common.h" -// #include - -@implementation UIxContactsSelectionView - -// static SOGoJSStringFormatter *jsFormatter = nil; - -// + (void)initialize { -// static BOOL didInit = NO; - -// if(didInit) -// return; - -// didInit = YES; -// jsFormatter = [SOGoJSStringFormatter sharedFormatter]; -// } - -// - (void)dealloc { -// [self->callback release]; -// [super dealloc]; -// } - -// - (NSString *)callback { -// if(!self->callback) { -// WORequest *r = [[self context] request]; -// self->callback = [[r formValueForKey:@"callback"] retain]; -// } -// return self->callback; -// } - -// - (NSString *)_getCN { -// return [self->contact valueForKey:@"cn"]; -// } - -// - (NSString *)getCN { -// return [jsFormatter stringByEscapingQuotesInString:[self _getCN]]; -// } - -// - (NSString *)getSN { -// NSString *sn = [self->contact valueForKey:@"sn"]; -// return [jsFormatter stringByEscapingQuotesInString:sn]; -// } - -// - (NSString *)getMail { -// return [self->contact valueForKey:@"mail"]; -// } - -// - (NSString *)getUID { -// return [[AgenorUserManager sharedUserManager] getUIDForEmail:[self getMail]]; -// } - -// - (NSString *)jsOnClickCode { -// /* callback parameters: (type, cn, dn, email, uid, sn) */ - - - -// changed to : type, email, uid, sn, cn, dn -// static NSString *jsCode = \ -// @"javascript:opener.window.%@('', '%@', '%@', '%@', '%@', '');"; - -// return [NSString stringWithFormat:jsCode, -// [self callback], -// [self getMail], -// [self getUID], -// [self getSN], -// [self getCN]]; - - - -// // return [NSString stringWithFormat:jsCode, -// // [self callback], -// // [self getCN], -// // [self getMail], -// // [self getUID], -// // [self getSN]]; -// } - -@end /* UIxContactsInlineListView */ diff --git a/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox new file mode 100644 index 000000000..c349fb0cc --- /dev/null +++ b/UI/Templates/ContactsUI/UIxContactsMailerSelection.wox @@ -0,0 +1,28 @@ + + +
+
+
+ + diff --git a/UI/Templates/ContactsUI/UIxContactsSchedulerSelection.wox b/UI/Templates/ContactsUI/UIxContactsSchedulerSelection.wox new file mode 100644 index 000000000..dcba7718f --- /dev/null +++ b/UI/Templates/ContactsUI/UIxContactsSchedulerSelection.wox @@ -0,0 +1,17 @@ + + + + diff --git a/UI/Templates/ContactsUI/UIxContactsSelectionView.wox b/UI/Templates/ContactsUI/UIxContactsSelectionView.wox deleted file mode 100644 index 1efd7e948..000000000 --- a/UI/Templates/ContactsUI/UIxContactsSelectionView.wox +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
-