--- templates/smarty/my/annuaire.tpl.old	2008-04-08 17:44:16.000000000 +0200
+++ templates/smarty/my/annuaire.tpl	2008-04-08 18:23:46.000000000 +0200
@@ -39,36 +39,39 @@
 <td width="50%" valign="top">
 
 <div  class="form">
+<div id="hcard-{$results[result].firstname}-{$results[result].name}" class="vcard">
 <table>
 <tr valign="top">
 <td colspan="2">
 {if $results[result].photo_file and $results[result].photo_public == 1}
-<img style="border: solid 1px black; margin-right: 6px;" {$results[result].html_photo_size} alt="{$results[result].nickname}" align="left" src="{$dtc_base_url}/photos/{$results[result].photo_file}"/>
+<img style="border: solid 1px black; margin-right: 6px;" {$results[result].html_photo_size} alt="{$results[result].nickname}" class="photo" align="left" src="{$dtc_base_url}/photos/{$results[result].photo_file}"/>
 {else}
 <img style="margin-right: 6px;" width="64" height="64" alt="Pas de photo" align="left" src="{$dtc_base_url}/images/no_photo.png"/>
 {/if}
 </td>
 <td>
-{if $results[result].website}<a href="{$results[result].website}">{/if}
+{if $results[result].website}<a class="url fn" href="{$results[result].website}">{/if}
 <font size="+1"><b>
-{$results[result].firstname} {$results[result].name}</b></font><br/>
+<span class="fn">{$results[result].firstname} {$results[result].name}</span></b></font><br/>
 {if $results[result].website}</a>{/if}
 <strong>{if $results[result].civility == 'M'}{$results[result].april_position}{else}{$results[result].april_position_female}{/if}.</strong><br/>
 
 {if $results[result].birth_date && $results[result].birth_date_public}
+<abbr class="bday" title="{$results[result].birth_date|date_format:"%Y-%m-%dT00:00:00Z"}>
  Né le {$results[result].birth_date|date_format:"%d/%m/%Y"}
 {if $results[result].birth_place && $results[result].birth_place_public}
  à {$results[result].birth_place}
 {/if}
+</abbr>
 <br/>
 {/if}
 
 {if $results[result].other_organizations && $results[result].other_organizations_public}
- Membre de {$results[result].other_organizations}<br/>
+ Membre de <span class="org">{$results[result].other_organizations}</span><br/>
 {/if}
 
 {if $results[result].occupation && $results[result].occupation_public}
- Activité professionelle : {$results[result].occupation}<br/>
+ Activité professionelle : <span class="org">{$results[result].occupation}</span><br/>
 {/if}
 </td>
 </tr>
@@ -79,28 +82,28 @@
 {if $results[result].email_public}
 <tr>
   <td width="24"><img src="../images/mail.png" alt="courriel : " align="top"></td>
-  <td colspan="2"><a href="mailto:{$results[result].email}">{$results[result].email}</a></td>
+  <td colspan="2"><a class="email" href="mailto:{$results[result].email}">{$results[result].email}</a></td>
 </tr>
 {/if}
 
 {if $results[result].website && $results[result].website_public}
 <tr>
   <td width="24"><img src="../images/web.png" alt="Site web : " align="top"></td>
-  <td colspan="2"><a href="{$results[result].website}">{$results[result].website}</a></td>
+  <td colspan="2"><a class="url fn" href="{$results[result].website}">{$results[result].website}</a></td>
 </tr>
 {/if}
 
 {if $results[result].jabber_id_public and $results[result].jabber_id}
 <tr>
   <td width="24"><img src="../images/jabber.png" alt="jabber id : " align="top"></td>
-  <td colspan="2"><em><a href="http://wiki.jabberfr.org/Accueil">Jabber</a>:</em> {$results[result].jabber_id}</td>
+  <td colspan="2"><em><a href="http://wiki.jabberfr.org/Accueil">Jabber</a>:</em> <a class="url" href="xmpp:{$results[result].jabber_id}">{$results[result].jabber_id}</a></td>
 </tr>
 {/if}
 
 {if $results[result].irc_nickname_public and $results[result].irc_nickname}
 <tr>
   <td width="24"><img src="../images/irc.png" alt="irc nickname : " align="top"></td>
-  <td colspan="2"><em><a href="http://www.april.org/association/irc.html">Pseudo IRC:</a></em> {$results[result].irc_nickname}</td>
+  <td colspan="2"><em><a href="http://www.april.org/association/irc.html">Pseudo IRC:</a></em> <span class="nickname">{$results[result].irc_nickname}</span></td>
 </tr>
 {/if}
 
@@ -108,37 +111,45 @@
 <tr>
 <td width="24" valign="top"><img src="../images/home.png" alt="Adresse : " align="baseline"/></td>
 <td colspan="2">
+<div class="adr">
 {if $results[result].address_public}
+  <div class="street-address">
   {if $results[result].address1}{$results[result].address1}<br/>{/if}
   {if $results[result].address2}{$results[result].address2}<br/>{/if}
   {if $results[result].address3}{$results[result].address3}<br/>{/if}
+  </div>
 {/if}
 
-  {if $results[result].zip_code && $results[result].zip_code_public}{$results[result].zip_code}{/if}
-  {if $results[result].city && $results[result].city_public}{$results[result].city}<br/>{/if}
-  {if $results[result].country && $results[result].country_public}{$results[result].country}{/if}
+  {if $results[result].zip_code && $results[result].zip_code_public}<span class="postal-code">{$results[result].zip_code}</span>{/if}
+  {if $results[result].city && $results[result].city_public}<span class="locality">{$results[result].city}</span><br/>{/if}
+  {if $results[result].country && $results[result].country_public}<span class="country-name">{$results[result].country}</span>{/if}
+</div>
 </td>
 </tr>
 {/if}
 
 {if $results[result].phone_public and $results[result].phone}
 <tr>
-  <td width="24"><img src="../images/phone.png" alt="téléphone fixe : " /></td>
-  <td colspan="2">{$results[result].phone}</td>
+  <div class="tel">
+  <td width="24"><span class="type"><img src="../images/phone.png" alt="téléphone fixe : " /></span></td>
+  <td colspan="2"><span class="value">{$results[result].phone}</span></td>
+  </div>
 </tr>
 {/if}
 
 {if $results[result].mobile_public and $results[result].mobile}
 <tr>
-  <td width="24"><img src="../images/mobile.png" alt="téléphone fixe : " /></td>
-  <td colspan="2">{$results[result].mobile}</td>
+  <div class="tel">
+  <td width="24"><span class="cell"><img src="../images/mobile.png" alt="téléphone mobile : " /></span></td>
+  <td colspan="2"><span class="value">{$results[result].mobile}</span></td>
+  </div>
 </tr>
 {/if}
 
 {if $results[result].gpg_id_public and $results[result].gpg_id}
 <tr>
   <td width="24"><img src="../images/gpg.png" alt="gpg id : " align="top"></td>
-  <td colspan="2"><em>GPG&nbsp;Id</em>: {$results[result].gpg_id}</td>
+  <td colspan="2"><em>GPG&nbsp;Id</em>: <span class="key">{$results[result].gpg_id}</span></td>
 </tr>
 {/if}
 
@@ -150,8 +161,9 @@
 {/if}
 
 </table>
-
 </div>
+</div>
+
 </td>
 {if ( $smarty.section.result.index mod 2 ) or $last}
 </tr>