From a6eadec5093676e6652e8a8c481fe2b4b76ca412 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@gmail.com>
Date: Tue, 9 Aug 2011 15:49:58 -0400
Subject: [PATCH] #1999

---
 .../templates/dae/embauche-dossier-consulter.html   |   19 ++++++++++++-------
 project/dae/templates/dae/embauche_consulter.html   |    4 ++--
 project/dae/templates/dae/poste_resume.html         |    8 ++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/project/dae/templates/dae/embauche-dossier-consulter.html b/project/dae/templates/dae/embauche-dossier-consulter.html
index e220be4..9feb9d9 100644
--- a/project/dae/templates/dae/embauche-dossier-consulter.html
+++ b/project/dae/templates/dae/embauche-dossier-consulter.html
@@ -4,24 +4,29 @@
     <tbody>
     <tr>
         <th>Type de contrat</th>
-        <td colspan="4">{{ dossier.type_contrat }}</td>
+        <td>{{ dossier.type_contrat }}</td>
+    </tr>
+    <tr>
         <th>Remplacement</th>
         <td>{%if dossier.remplacement %}oui{% else %}non{%endif %}</td>
     </tr>
     <tr>
-        <th rowspan="2">Durée</th>
-        <td colspan=2> du {{ dossier.contrat_date_debut }}</td>
-        <td colspan=2>au {{ dossier.contrat_date_fin }}</td>
+        <th>Durée</th>
+        <td> du {{ dossier.contrat_date_debut }} au {{ dossier.contrat_date_fin }}</td>
+    </tr>
+    <tr>
         <th>Régime de travail</th>
         <td>{{ dossier.regime_travail|floatformat:0  }}%</td>
     </tr>
     <tr>
         <th>Nombre d'heure par semaine</th>
-        <td colspan=5>{{ dossier.regime_travail_nb_heure_semaine|floatformat:0  }}H</td>
+        <td>{{ dossier.regime_travail_nb_heure_semaine|floatformat:0  }}H</td>
+    </tr>
+    <tr>
+        <th>Statut</th>
+        <td>{{ dossier.statut }} {{ dossier.statut_residence }}</td>
     </tr>
     <tr>
-        <th>Statut : </th>
-        <td colspan="4">{{ dossier.statut }} {{ dossier.statut_residence }}</td>
         <th>Organisme BSTG</th>
         {% if dossier.organisme_bstg or dossier.organisme_bstg_autre %}
             <td>{% if dossier.organisme_bstg %}{{ dossier.organisme_bstg }}{% endif %} {{ dossier.organisme_bstg_autre }}</td>
diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index dc89d14..bb3447d 100644
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -73,8 +73,8 @@
       </tr>
       {% endfor %}
   </tbody>
-<table>
-<fieldset>
+</table>
+</fieldset>
 
 
 <div id="form-dossier">
diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index 504f19b..61bade6 100644
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -32,13 +32,13 @@
     <tbody>
     <tr>
         <th>Statut</th>
-        <th>local</th><td>{% if poste.local %}oui{% else %}non{% endif %}</td>
-        <th>expatrié</th><td>{% if poste.expatrie %}oui{% else %}non{% endif %}</td>
-        <th>mise à disposition</th><td>{% if poste.mise_a_disposition %}oui{% else %}non{% endif %}</td>
+        <td>Local : {% if poste.local %}oui{% else %}non{% endif %}</td>
+        <td>Expatrié : {% if poste.expatrie %}oui{% else %}non{% endif %}
+        <td>Mise à disposition : {% if poste.mise_a_disposition %}oui{% else %}non{% endif %}</td>
     </tr>
     <tr>
         <th>Appel</th>
-        <td colspan="6">{{ poste.appel }}</td>
+        <td colspan="3">{{ poste.appel }}</td>
     </tr>
     </tbody>
 </table>
-- 
1.7.10.4