Merge commit 'origin/master' into fusionax

[platal.git] / templates / include / minifiche.tpl

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 3d7942c..b6f1d2a 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -97,7 +97,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}
@@ -114,7 +114,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>
@@ -131,7 +131,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.sector} ({$c.sector}){/if}{if $c.fonction}<br />{$c.fonction}{/if}
         </td>
       </tr>
       {/if}