Monotone-Parent: 449b9c9fa10daa64618c01940a7d7f15a9d6f168

Monotone-Revision: d48095cca5ce95803d881d96312e4b396f275daf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-03T14:35:30
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2006-10-03 14:35:30 +00:00
parent c3b699db69
commit 8ba9a84a60
7 changed files with 112 additions and 171 deletions

View File

@ -1,3 +1,10 @@
2006-10-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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 <wsourdeau@inverse.ca>
* UI/WebServerResources/ContactsUI.js: hide the current contact

View File

@ -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 <SOGoUI/UIxComponent.h>
@interface UIxContactsMailerSelection : UIxComponent
@end
@implementation UIxContactsMailerSelection
@end /* UIxContactsMailerSelection */

View File

@ -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 <SOGoUI/UIxComponent.h>
@interface UIxContactsSchedulerSelection : UIxComponent
@end
@implementation UIxContactsSchedulerSelection
@end /* UIxContactsSchedulerSelection */

View File

@ -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 <SOGoUI/SOGoJSStringFormatter.h>
@interface UIxContactsSelectionView : UIxContactsListViewBase
{
NSString *callback;
}
// - (NSString *)_getCN;
// - (NSString *)getCN;
// - (NSString *)getSN;
// - (NSString *)getMail;
// - (NSString *)getUID;
@end
// #include "common.h"
// #include <SOGo/AgenorUserManager.h>
@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 */

View File

@ -0,0 +1,28 @@
<?xml version='1.0' standalone='yes'?>
<var:component
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
xmlns:rsrc="OGo:url"
className="UIxContactsSelectionViewContainer"
title="name"
>
<span id="selectionLabel"><var:string label:value="Add as..." /></span><br />
<input type="submit"
class="button"
label:value="Recipient"
name="to"
onclick="return onConfirmContactSelection('to');" /><br />
<input type="submit"
class="button"
label:value="Carbon Copy"
name="cc"
onclick="return onConfirmContactSelection('cc');" /><br />
<input type="submit"
class="button"
label:value="Blind Carbon Copy"
name="bcc"
onclick="return onConfirmContactSelection('bcc');" />
</var:component>

View File

@ -0,0 +1,17 @@
<?xml version='1.0' standalone='yes'?>
<var:component
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
xmlns:rsrc="OGo:url"
className="UIxContactsSelectionViewContainer"
title="name"
>
<input type="submit"
class="button"
label:value="Add Selected Contacts"
name="validate"
onclick="return onConfirmContactSelection(null);" />
</var:component>

View File

@ -1,56 +0,0 @@
<?xml version='1.0' standalone='yes'?>
<var:component
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:uix="OGo:uix"
xmlns:label="OGo:label"
xmlns:rsrc="OGo:url"
className="UIxContactsSelectionViewContainer"
title="name"
>
<table id="contactsList" multiselect="yes">
<tbody>
<tr class="tableview">
<!-- localize -->
<td class="tbtv_headercell">
<var:component className="UIxSortableTableHeader"
label:label="Lastname"
const:sortKey="cn"
const:href="view"
var:queryDictionary="context.request.formValues"
/>
</td>
<td class="tbtv_headercell">
<var:component className="UIxSortableTableHeader"
label:label="EMail"
const:sortKey="mail"
const:href="view"
var:queryDictionary="context.request.formValues"
/>
</td>
<td class="tbtv_headercell">
<var:string label:value="Phone" />
</td>
<td class="tbtv_headercell">
<var:string label:value="Location" />
</td>
</tr>
<var:foreach list="contactInfos" item="currentContact">
<tr class="tableview"
var:id="currentContact.c_name"
var:contactname="currentContact.cn"
var:contactid="currentContact.c_uid"
onclick="return onContactRowClick(event, this);"
ondblclick="return onContactRowDblClick(event, this);"
oncontextmenu="return onContactContextMenu(event, this);">
<td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="currentContact.cn" /></td>
<td onmousedown="return false;"><var:string value="currentContact.mail" /></td>
<td onmousedown="return false;"><var:string value="currentContact.telephonenumber" /></td>
<td onmousedown="return false;"><var:string value="currentContact.l" /></td>
</tr>
</var:foreach>
</tbody>
</table>
</var:component>