X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Finclude%2Femploi.tpl;h=66b561449558206263c0ff649c6230eca299a2f5;hb=c3e0d3c1d59d1928f78644618156f50b4e48ba0b;hp=a724ca88a28a026dc2994cefea1b7f0db2e0baf7;hpb=31821494a692c035262a32493aef6cb3e1f61579;p=platal.git

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index a724ca8..66b5614 100644
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -19,39 +19,34 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-{if $address.entreprise || $address.secteur || $address.fonction ||
-  $address.poste || $address.fonction || $address.email || $address.web}
+{if $job->company || $job->sector || $job->subsector ||
+  $job->subsubsector || $job->description || $job->user_email}
       <div class="adresse" style="float: left">
       	<table>
-        {if $address.entreprise || $address.web}
+        {if $job->company || $job->user_site}
         <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 $job->company->url}<a href='{$job->company->url}'>{$job->company->name}</a>{else}{$job->company->name}{/if}
+          {if $job->user_site} [<a href='{$job->user_site}'>Page perso</a>]{/if}</strong></td>
         </tr>
         {/if}
-        {if $address.secteur}
+        {if $job->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>{$job->sector}{if $job->subsector} ({$job->subsector}){/if}</strong></td>
         </tr>
         {/if}
 
-        {if $address.fonction}
+        {if $job->description}
         <tr>
-          <td><em>Fonction: </em></td>
-          <td><strong>{$address.fonction}</strong></td>
+          <td><em>Fonction&nbsp;: </em></td>
+          <td><strong>{$job->description}</strong></td>
         </tr>
         {/if}
-        {if $address.poste}
-        <tr>
-          <td><em>Poste: </em></td>
-          <td><strong>{$address.poste}</strong></td>
-        </tr>
-        {/if}
-        {if $address.email}
+        {if $job->user_email}
         <tr>
           <td><em>Email&nbsp;: </em></td>
-          <td><strong>{$address.email}</strong></td>
+          <td><strong>{$job->user_email}</strong></td>
         </tr>
         {/if}
         </table>