X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femploi.tpl;h=293cf3df74f5bbe45f71e9edb8606e6c53e9560a;hb=8a43972f58f0a77015ae9e509f1c073d188874d2;hp=65abc3c718e964b82837e5aae66b0fae5c7246e4;hpb=179afa7fa79902e11498314d37fe4dbf452b3617;p=platal.git

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index 65abc3c..293cf3d 100644
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.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  *}
@@ -19,38 +19,39 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-{if $address.entreprise || $address.secteur || $address.fonction ||
+{if $address.entreprise || $address.sector || $address.fonction ||
   $address.poste || $address.fonction || $address.email || $address.web}
       <div class="adresse" style="float: left">
       	<table>
         {if $address.entreprise || $address.web}
         <tr>
-          <td><em>Ent/Org: </em></td>
-          <td><strong>{$address.entreprise}{if $address.web} [<a href='{$address.web}'>site</a>]{/if}</strong></td>
+          <td><em>Ent/Org&nbsp;: </em></td>
+          <td><strong>{if $address.web}<a href='{$address.web}'>{$address.entreprise}</a>{$address.entreprise}{else}{$address.entreprise}{/if}
+          {if $address.w_web} [<a href='{$address.w_web}'>Page perso</a>]{/if}</strong></td>
         </tr>
         {/if}
-        {if $address.secteur}
+        {if $address.sector}
         <tr>
-          <td><em>Secteur: </em></td>
-          <td><strong>{$address.secteur}{if $address.ss_secteur} ({$address.ss_secteur}){/if}</strong></td>
+          <td><em>Secteur&nbsp;: </em></td>
+          <td><strong>{$address.sector}{if $address.subSector} ({$address.subSector}){/if}</strong></td>
         </tr>
         {/if}
 
         {if $address.fonction}
         <tr>
-          <td><em>Fonction: </em></td>
+          <td><em>Fonction&nbsp;: </em></td>
           <td><strong>{$address.fonction}</strong></td>
         </tr>
         {/if}
         {if $address.poste}
         <tr>
-          <td><em>Poste: </em></td>
+          <td><em>Poste&nbsp;: </em></td>
           <td><strong>{$address.poste}</strong></td>
         </tr>
         {/if}
         {if $address.email}
         <tr>
-          <td><em>E-mail: </em></td>
+          <td><em>Email&nbsp;: </em></td>
           <td><strong>{$address.email}</strong></td>
         </tr>
         {/if}