LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_17' (head f3654e9c29406b43890181ca1e890b64daca6321)

Browse source 
to branch 'ca.inverse.sogo' (head 9fc01803511e28b63ef83d04b3a22f5da78861a3)

Monotone-Parent: 9fc01803511e28b63ef83d04b3a22f5da78861a3
Monotone-Parent: f3654e9c29406b43890181ca1e890b64daca6321
Monotone-Revision: 2fe9d54ea82595348c57b93890c2e06bd53156db

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T17:18:41
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Jean Raby 2012-07-05 17:18:41 +00:00
parent 3e2bfbea14 993c0ee52e
commit d13bd52f62
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2012-07-05 Jean Raby <jraby@inverse.ca>
* UI/Contacts/UIxContactView.m (secondaryEmail):
function renamed to secondaryEmails. It now returns all addresses
instead of the first one found in the vcard.
* UI/Templates/ContactsUI/UIxContactView.wox:
Show all addresses returned from secondaryEmails.
This still need some css tweaks.
2012-07-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreRecurrenceUtils.m

17
UI/Contacts/UIxContactView.m
View file

@ -154,12 +154,14 @@
value: mailTo];
}
- (NSString *) secondaryEmail
- (NSArray *) secondaryEmails
{
NSString *email, *fn, *mailTo;
NSMutableArray *emails;
NSMutableArrays *secondaryEmails;
emails = [NSMutableArray array];
secondayEmails = [NSMutableArray array];
mailTo = nil;
[emails addObjectsFromArray: [card childrenWithTag: @"email"]];
@ -185,6 +187,7 @@
{
email = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
// skip primary email
if ([email caseInsensitiveCompare: [card preferredEMail]] != NSOrderedSame)
{
fn = [card fn];
@ -193,13 +196,19 @@
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
@" onclick=\"return openMailTo('%@ <%@>');\">"
@"%@</a>", email, fn, email, email];
break;
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
value: mailTo]];
}
}
}
else
{
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
value: mailTo]];
}
return [self _cardStringWithLabel: @"Additional Email:"
value: mailTo];
return secondayEmails;
}
- (NSString *) screenName

6
UI/Templates/ContactsUI/UIxContactView.wox
View file

@ -19,8 +19,10 @@
><var:string value="displayName" escapeHTML="NO"
/><var:string value="nickName" escapeHTML="NO"
/><var:string value="primaryEmail" escapeHTML="NO"
/><var:string value="secondaryEmail" escapeHTML="NO"
/><var:string value="screenName" escapeHTML="NO"
/><var:foreach list="secondaryEmails" item="currentEmail">
<var:string value="currentEmail" escapeHTML="NO"/>
</var:foreach>
<var:string value="screenName" escapeHTML="NO"
/><var:string value="preferredAddress" escapeHTML="NO"
/><var:string value="categories" escapeHTML="NO"
/></div