mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-19 21:53:19 +00:00
Various minor Web interface improvements.
Monotone-Parent: de57fd5034fd57e2302198e4d6b342a30830430a Monotone-Revision: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-07-10T15:26:00
This commit is contained in:
@@ -73,10 +73,10 @@
|
||||
value = [NSString stringWithFormat: @"<a href=\"%@:%@\">%@</a>", url, value, value];
|
||||
|
||||
if (label)
|
||||
[cardString appendFormat: @"%@ %@<br />\n",
|
||||
[cardString appendFormat: @"<dt>%@</dt><dd>%@</dd>\n",
|
||||
[self labelForKey: label], value];
|
||||
else
|
||||
[cardString appendFormat: @"%@<br />\n", value];
|
||||
[cardString appendFormat: @"<dt></dt><dd>%@</dd>\n", value];
|
||||
}
|
||||
|
||||
return cardString;
|
||||
@@ -196,14 +196,14 @@
|
||||
mailTo = [NSString stringWithFormat: @"<a href=\"mailto:%@\""
|
||||
@" onclick=\"return openMailTo('%@ <%@>');\">"
|
||||
@"%@</a>", email, fn, email, email];
|
||||
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
|
||||
[secondaryEmails addObject: [self _cardStringWithLabel: nil
|
||||
value: mailTo]];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
[secondaryEmails addObject: [self _cardStringWithLabel: @"Additional Email:"
|
||||
[secondaryEmails addObject: [self _cardStringWithLabel: nil
|
||||
value: mailTo]];
|
||||
}
|
||||
|
||||
@@ -575,7 +575,7 @@
|
||||
data = [NSMutableString string];
|
||||
[data appendString: city];
|
||||
if ([city length] > 0 && [prov length] > 0)
|
||||
[data appendString: @", "];
|
||||
[data appendString: @" "];
|
||||
[data appendString: prov];
|
||||
|
||||
return [self _cardStringWithLabel: nil value: data];
|
||||
@@ -592,7 +592,7 @@
|
||||
data = [NSMutableString string];
|
||||
[data appendString: postalCode];
|
||||
if ([postalCode length] > 0 && [country length] > 0)
|
||||
[data appendFormat: @", ", country];
|
||||
[data appendFormat: @" ", country];
|
||||
[data appendString: country];
|
||||
|
||||
return [self _cardStringWithLabel: nil value: data];
|
||||
|
||||
Reference in New Issue
Block a user