From f400ce01c12bbd3b8e011c42f79ba819a3fb9bd5 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 13 Sep 2006 21:32:54 +0000
Subject: [PATCH] Monotone-Parent: f4e60e030cb328a6fad093631dd0d87d84ddd7e9
 Monotone-Revision: 67d95e4466d127870af881a2f0225ba6ed2e27ec

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-13T21:32:54
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/French.lproj/Localizable.strings | 21 +++++-
 UI/Templates/ContactsUI/UIxContactView.wox   | 68 +++++++++++++++++++-
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index be4ec2e65..333ff5ec5 100644
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -11,7 +11,6 @@
 "Extended"          = "Informations complémentaires";
 "Fax"               = "Fax";
 "Firstname"         = "Prénom";
-"Home"              = "Personnelle";
 "HomePhone"         = "Domicile";
 "Lastname"          = "Nom";
 "Location"          = "Lieux";
@@ -41,3 +40,23 @@
 
 "Add..." = "Ajouter...";
 "Remove" = "Enlever";
+
+"Card for %@" = "Fiche pour %@";
+"Display Name: " = "Nom &agrave; afficher : ";
+"Email Address: " = "Adresse &eacute;lectronique : ";
+"Nickname: " = "Surnom : ";
+
+"Telephone" = "Téléphone";
+"Work: " = "Travail : ";
+"Home: " = "Domicile : ";
+"Fax: " = "T&eacute;l&eacute;copieur : ";
+"Mobile: " = "Portable : ";
+"Pager: " = "Téléavertisseur : ";
+
+"Home" = "Domicile";
+"Work" = "Travail";
+"Other Infos" = "Informations supplémentaires";
+
+"Note: " = "Commentaires : ";
+"Timezone: " = "Fuseau horaire : ";
+"Birthday: " = "Date de naissance : ";
diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox
index af67fca12..184b143a5 100644
--- a/UI/Templates/ContactsUI/UIxContactView.wox
+++ b/UI/Templates/ContactsUI/UIxContactView.wox
@@ -1,14 +1,78 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
+  <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:rsrc="OGo:url"
     xmlns:label="OGo:label"
+    xmlns:uix="OGo:uix"
     className="UIxPageFrame"
     title="name"
     const:popup="YES"
     >
     
+    <h3 class="contactCardTitle"><var:string value="contactCardTitle" /></h3>
+
+    <div id="leftContactColumn" class="contactColumn">
+      <div id="primaryInfos">
+        <h4><var:string label:value="Contact" /></h4>
+        <var:string value="displayName" escapeHTML="NO" />
+        <var:string value="nickName" escapeHTML="NO" />
+        <var:string value="preferredEmail" escapeHTML="NO" />
+        <var:string value="preferredTel" escapeHTML="NO" />
+        <var:string value="preferredAddress" escapeHTML="NO" />
+      </div>
+
+      <var:if condition="hasHomeInfos">
+        <div id="homeInfos">
+          <h4><var:string label:value="Home" /></h4>
+          <var:string value="homePobox" escapeHTML="NO" />
+          <var:string value="homeExtendedAddress" escapeHTML="NO" />
+          <var:string value="homeStreetAddress" escapeHTML="NO" />
+          <var:string value="homeCityAndProv" escapeHTML="NO" />
+          <var:string value="homePostalCodeAndCountry" escapeHTML="NO" />
+          <var:string value="homeUrl" escapeHTML="NO" />
+        </div>
+      </var:if>
+
+      <var:if condition="hasOtherInfos">
+        <div id="otherInfos">
+          <h4><var:string label:value="Other Infos" /></h4>
+          <var:string value="bday" escapeHTML="NO" />
+          <var:string value="tz" escapeHTML="NO" />
+          <var:string value="note" escapeHTML="NO" />
+        </div>
+      </var:if>
+    </div>
+
+    <div id="rightContactColumn" class="contactColumn">
+      <var:if condition="hasTelephones">
+        <div id="phoneInfos">
+          <h4><var:string label:value="Telephone" /></h4>
+          <var:string value="workPhone" escapeHTML="NO" />
+          <var:string value="homePhone" escapeHTML="NO" />
+          <var:string value="fax" escapeHTML="NO" />
+          <var:string value="mobile" escapeHTML="NO" />
+          <var:string value="pager" escapeHTML="NO" />
+        </div>
+      </var:if>
+
+      <var:if condition="hasWorkInfos">
+        <div id="workInfos">
+          <h4><var:string label:value="Work" /></h4>
+          <var:string value="workTitle" escapeHTML="NO" />
+          <var:string value="workService" escapeHTML="NO" />
+          <var:string value="workCompany" escapeHTML="NO" />
+          <var:string value="workPobox" escapeHTML="NO" />
+          <var:string value="workExtendedAddress" escapeHTML="NO" />
+          <var:string value="workStreetAddress" escapeHTML="NO" />
+          <var:string value="workCityAndProv" escapeHTML="NO" />
+          <var:string value="workPostalCodeAndCountry" escapeHTML="NO" />
+          <var:string value="workUrl" escapeHTML="NO" />
+        </div>
+      </var:if>
+    </div>
+
     <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
       width="100%"
       >