From fb8e8681186b4bb074b6ac311730f95db6d304f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Mon, 22 Mar 2010 13:29:06 +0100
Subject: [PATCH] Update display of jobs in profiles
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 templates/include/emploi.tpl | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index 6277a39..66b5614 100644
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -19,40 +19,34 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-{if $address.entreprise || $address.sector || $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&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>
+          <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.sector}
+        {if $job->sector}
         <tr>
           <td><em>Secteur&nbsp;: </em></td>
-          <td><strong>{$address.sector}{if $address.subSector} ({$address.subSector}){/if}</strong></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&nbsp;: </em></td>
-          <td><strong>{$address.fonction}</strong></td>
+          <td><strong>{$job->description}</strong></td>
         </tr>
         {/if}
-        {if $address.poste}
-        <tr>
-          <td><em>Poste&nbsp;: </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>
-- 
2.1.4