X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Fminifiche.tpl;h=0fd2a140cf60da357ae26b4088035c26510fadd2;hb=36dd191093ad8c22280db280e13ba7618c127a4e;hp=26d428c70cc58a361d860bf73a8bfde70cdb1292;hpb=21c7c593d7100a887f984c49a82c03eb32169fc4;p=platal.git

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 26d428c..0fd2a14 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -64,7 +64,7 @@
         {if !$c.dcd}
     <a href="vcard/{$c.hruid}.vcf">{*
     *}{icon name=vcard title="Afficher la carte de visite"}</a>
-    <a href="mailto:{$c.forlife}@{#globals.mail.domain#}">{*
+    <a href="mailto:{$c.bestemail}">{*
     *}{icon name=email title="Envoyer un email"}</a>
           {if $show_action eq ajouter}
     <a href="carnet/contacts?action={$show_action}&amp;user={$c.hruid}&amp;token={xsrf_token}">{*
@@ -85,7 +85,7 @@
       {/if}
       <a href="admin/user/{$c.hruid}">{*
       *}{icon name=wrench title="administrer user"}</a>
-      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
+      <a href="profile/ax/{$c.hruid}">{*
       *}{icon name=user_gray title="fiche AX"}</a>]
     </div>
     {/if}
@@ -102,7 +102,7 @@
         <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
       </tr>
       {/if}
-      {if $c.countrytxt || $c.city}
+      {if ($c.countrytxt || $c.city) && !$c.dcd}
       <tr>
         <td class="lt">Géographie&nbsp;:</td>
         <td class="rt">{$c.city}{if $c.city && $c.countrytxt}, {/if}{$c.countrytxt}</td>
@@ -119,7 +119,7 @@
         <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
           {if $c.job_web}<a href="{$c.job_web}">{$c.entreprise}</a>{else}{$c.entreprise}{/if}
-          {if $c.secteur}({$c.secteur}){/if} {if $c.fonction}<br />{$c.fonction}{/if}
+          {if $c.secteur} ({$c.secteur}){/if}{if $c.fonction}<br />{$c.fonction}{/if}
         </td>
       </tr>
       {/if}