See ChangeLog.

Monotone-Parent: d63c864a1b3540c00d2825cbeb4a8cdb0a698ea6
Monotone-Revision: a8f2e801b983189f8ed379cd8df342731ccee65d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-08-08T14:20:46
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,12 @@
+2011-08-05  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactView.m (-contactCardTitle): removed this
+	method since we no longer prefix the contact name by a label
+	("Card For").
+	(-_cardStringWithLabel:value:url:): new method that wraps the
+	value with an <A> link with the specified URL type. Used for
+	telephone numbers.
+
 2011-08-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreAppointmentWrapper.m

UI/Contacts/English.lproj/Localizable.strings

@@ -76,7 +76,6 @@
 "No possible subscription" = "No possible subscription";
 
 "Preferred" = "Preferred";
-"Card for %@" = "Card for %@";
 "Display:" = "Display:";
 "Display Name:" = "Display Name:";
 "Email:" = "Email:";

UI/Contacts/UIxContactView.m

@@ -60,6 +60,15 @@
 
 - (NSString *) _cardStringWithLabel: (NSString *) label
                               value: (NSString *) value
+{
+  return [self _cardStringWithLabel: label
+                              value: value
+                                url: nil];
+}
+
+- (NSString *) _cardStringWithLabel: (NSString *) label
+                              value: (NSString *) value
+                                url: (NSString *) url
 {
   NSMutableString *cardString;
 
@@ -67,6 +76,9 @@
   value = [value stringByReplacingString: @"\r" withString: @""];
   if ([value length] > 0)
     {
+      if ([url length] > 0)
+        value = [NSString stringWithFormat: @"<a href=\"%@://%@\">%@</a>", url, value, value];
+
       if (label)
         [cardString appendFormat: @"%@&nbsp;%@<br />\n",
                     [self labelForKey: label], value];
@@ -77,13 +89,6 @@
   return cardString;
 }
 
-- (NSString *) contactCardTitle
-{
-  return [NSString stringWithFormat:
-                     [self labelForKey: @"Card for %@"],
-		   [self fullName]];
-}
-
 - (NSString *) displayName
 {
   return [self _cardStringWithLabel: @"Display Name:"
@@ -200,7 +205,7 @@
 - (NSString *) preferredTel
 {
   return [self _cardStringWithLabel: @"Phone Number:"
-               value: [card preferredTel]];
+                              value: [card preferredTel] url: @"tel"];
 }
 
 - (NSString *) preferredAddress
@@ -257,7 +262,7 @@
 	}
     }
 
-  return [self _cardStringWithLabel: aLabel value: phone];
+  return [self _cardStringWithLabel: aLabel value: phone url: @"tel"];
 }
 
 - (NSString *) workPhone

UI/Templates/ContactsUI/UIxContactView.wox

@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix">
     
-    <h3 class="contactCardTitle"><var:string value="contactCardTitle" /></h3
+    <h3 class="contactCardTitle"><var:string value="fullName" /></h3
       
       ><div id="leftContactColumn" class="contactColumn"
       ><div id="primaryInfos"