5637

diff --git a/project/assets/css/dae.css b/project/assets/css/dae.css
index a0da3f0..14edde2 100644 (file)
--- a/project/assets/css/dae.css
+++ b/project/assets/css/dae.css
@@ -19,4 +19,7 @@ h2.section {width:100%; background-color: #D0E8F8; text-align: center; color: #5
 .pagination { text-align: center; }
 table.listing { width: 100%; }
 .print-only { display: none; }
-.total-row th { background-color: #C7D1D8; }
\ No newline at end of file
+.total-row th { background-color: #C7D1D8; }
+table#global-cost tr td.spaced {
+    padding-left: 25px;
+}
\ No newline at end of file

diff --git a/project/assets/css/print.css b/project/assets/css/print.css
index 0f22c3b..b2c869f 100644 (file)
--- a/project/assets/css/print.css
+++ b/project/assets/css/print.css
@@ -27,3 +27,7 @@ label {font-weight: bold;}
 a.bouton-action, #header, #footer, #menu, form { display: none; }
 
 .print-only { display: block; }
+
+table#global-cost tr td.spaced {
+    padding-left: 25px;
+}

diff --git a/project/dae/templates/dae/embauche-remun.html b/project/dae/templates/dae/embauche-remun.html
index 52b7ee8..b0d9f9b 100644 (file)
--- a/project/dae/templates/dae/embauche-remun.html
+++ b/project/dae/templates/dae/embauche-remun.html
@@ -21,7 +21,7 @@
 {% for f in group.forms %}
 <tr class="calculable remunform">
     {{ f.id }}
-    <td>{{ f.type.errors }} {{ f.type }}</td>
+    <td class="spaced">{{ f.type.errors }} {{ f.type }}</td>
     <td>{{ f.devise.errors }} {{ f.devise }}</td>
     <td class="monnaie cumulable">{{ f.montant.errors }} {{ f.montant }}</td>
     <td class="euro cumulable" id="id_{{ f.prefix }}-montant_annuel_euros"></td>
@@ -32,7 +32,7 @@
 </tr>
 {% endfor %}
 <tr class="sous-totaux">
-    <td>Sous-total{% if not remunForm.read_only %} - 
+    <td class="spaced">Sous-total{% if not remunForm.read_only %} - 
       <a class="addlink" href="#">
        [<span class="icon">Ajouter une ligne</span>]
       </a>
@@ -71,7 +71,7 @@
 {% for f in remunForm.groups.RAS.forms %}
 <tr class="calculable remunform">
     {{ f.id }}
-    <td>{{ f.type.errors }} {{ f.type }}</td>
+    <td class="spaced">{{ f.type.errors }} {{ f.type }}</td>
     <td>{{ f.devise.errors }} {{ f.devise }}</td>
     <td class="monnaie cumulable">{{ f.montant.errors }} {{ f.montant }}</td>
     <td class="euro cumulable" id="id_{{ f.prefix }}-montant_annuel_euros"></td>
@@ -82,7 +82,7 @@
 </tr>
 {% endfor %}
 <tr class="sous-totaux">
-    <td>Sous-total{% if not remunForm.read_only %} - 
+    <td class="spaced">Sous-total{% if not remunForm.read_only %} - 
       <a class="addlink" href="#">
        [<span class="icon">Ajouter une ligne</span>]
       </a>

diff --git a/project/dae/templates/dae/table_remuneration.html b/project/dae/templates/dae/table_remuneration.html
index 39fb195..d351d6f 100644 (file)
--- a/project/dae/templates/dae/table_remuneration.html
+++ b/project/dae/templates/dae/table_remuneration.html
@@ -1,3 +1 @@
-<table cellspacing="0" id="global-cost">
-  {% include 'dae/embauche-remun.html' %}
-</table>
+{% include 'dae/embauche-remun.html' %}