[Tutti-commits] 02/02: refs #6150

24 Nov 2014

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/6150 in repository tutti.

See http://git.codelutin.com/tutti.git

commit 5e88001fbe30f808b8a5287a5a9d38e86b2a936e
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Nov 24 19:11:08 2014 +0100

    refs #6150
---
 .../src/main/resources/ftl/pupitriReport_fr.ftl    | 96 ++++++++++++----------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl
index 0043d00..4ea48e9 100644
--- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl
+++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl
@@ -28,6 +28,10 @@
       <#assign blueColor="#000080">
       <#assign lightGrayColor="#ddd">
 
+      body {
+          font-size: 12pt;
+      }
+
       h1 {
           background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKEAAAAeCAYAAABEzX4WAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gsYESwznZhaYQAAC8VJREFUeNrtnHmQHPV1xz+vu+fanZm9b2l1YFlCSGBkkI3DYQpwqrI7rFwuK44ph8QmcQyuUCQYl3EO4xg7wQaDBSZCMahQIiiBjXZWoiiIywIZZbkMiAAxhyWxOliJPbTH3N0vf/x6tKPdjQMY5BGaV9PVU7/+Xb2/7+/73vd1zwrHmW3ZsoXu7m6SyeRFIhIHxgBUNSsiu4GDIpLv7u52i20eeeQRLrroonc95ubNm1m1ahUVe39MjkMQ1qtqN3CBqp4sIiuAw0BaVV8BBkTkGeBRVd0nIqOJRKKQTCarLMuyuru7JwCSyWRMRCw [...]
           width: 100%;
@@ -46,8 +50,13 @@
       }
 
       td, th {
-          padding-right: 10pt;
+          padding: 2pt;
           vertical-align: top;
+          height: 16pt;
+      }
+
+      td + td, th + th {
+          padding-right: 10pt;
       }
 
       td.number {
@@ -79,17 +88,17 @@
       }
 
       .bordered {
-          border: 1px solid black;
+          border: 1pt solid black;
           border-collapse: collapse;
       }
 
       .bordered tr :nth-child(3) {
-          border-right: 1px solid black;
+          border-right: 1pt solid black;
       }
 
       .top-bottom-border {
-          border-top: 1px solid black;
-          border-bottom: 1px solid black;
+          border-top: 1pt solid black;
+          border-bottom: 1pt solid black;
       }
 
     </style>
@@ -110,6 +119,7 @@
             au ${gearShootingEndDate?date?string.short} ${gearShootingEndDate?time?string.short}</#if>
         </span>
 </p>
+
 <hr/>
 
 <table class="center bordered">
@@ -144,8 +154,8 @@
 </p>
 
 <table>
-  <thead class="top-bottom-border">
-    <tr>
+  <thead>
+    <tr class="top-bottom-border">
         <th></th>
         <th>Espèce</th> <!-- trie d'abord tout le vrac sur le code espèce puis tout le HV trié sur le code espèce-->
         <th>V / HV</th>
@@ -174,42 +184,42 @@
         <td class="number">${row.nbBigBox}</td>
     </tr>
 </#list>
-<tr>
-    <td><input type="checkbox"/></td>
-    <td>  </td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-</tr>
-<tr>
-    <td><input type="checkbox"/></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-</tr>
-<tr>
-    <td><input type="checkbox"/></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-</tr>
+    <tr>
+        <td><input type="checkbox"/></td>
+        <td>  </td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td><input type="checkbox"/></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td><input type="checkbox"/></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
   </tbody>
 </table>
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 02/02: refs #6150

codelutin.com scm