Merge commit 'origin/master' into account

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

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index b704048..6277a39 100644 (file)
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -19,20 +19,21 @@
 {*  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&nbsp;: </em></td>
-          <td><strong>{$address.entreprise}{if $address.web} [<a href='{$address.web}'>site</a>]{/if}</strong></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&nbsp;: </em></td>
-          <td><strong>{$address.secteur}{if $address.ss_secteur} ({$address.ss_secteur}){/if}</strong></td>
+          <td><strong>{$address.sector}{if $address.subSector} ({$address.subSector}){/if}</strong></td>
         </tr>
         {/if}