Merge commit 'origin/master' into fusionax

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

diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl
index 10d26c6..29c416a 100644 (file)
--- a/templates/include/emploi.tpl
+++ b/templates/include/emploi.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -21,36 +21,37 @@
 {**************************************************************************}
 {if $address.entreprise || $address.secteur || $address.fonction ||
   $address.poste || $address.fonction || $address.email || $address.web}
-      <div class="adresse">
+      <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}
         <tr>
-          <td><em>Secteur: </em></td>
+          <td><em>Secteur&nbsp;: </em></td>
           <td><strong>{$address.secteur}{if $address.ss_secteur} ({$address.ss_secteur}){/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}
@@ -58,4 +59,4 @@
       </div>
 {/if}
 
-{* vim:set et sws=2 sts=2 sw=2: *}
+{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *}