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 2c5021a49aa3ce9c90dda24f33ef2fe138b4ab4f Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 24 17:30:25 2014 +0100 refs #6150 --- .../src/main/resources/ftl/pupitriReport_fr.ftl | 68 +++++++++++++--------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl index a45d7ca..06554da 100644 --- a/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl +++ b/tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl @@ -26,6 +26,7 @@ @page { size: A4 landscape;} <#assign blueColor="#000080"> + <#assign lightGrayColor="#ddd"> h1, h4 { color: ${blueColor}; @@ -51,8 +52,8 @@ text-align: center; } - tbody > tr:nth-child(odd) { - background-color: #ddd; + .alternateRows > tr:nth-child(odd) { + background-color: ${lightGrayColor}; } .operationInfo { @@ -67,6 +68,19 @@ margin-right: 50pt; } + .center { + margin: auto; + } + + .bordered { + border: 1px solid black; + border-collapse: collapse; + } + + .bordered tr :nth-child(3) { + border-right: 1px solid black; + } + </style> </head> <body> @@ -84,34 +98,34 @@ </p> <hr/> -<table> +<table class="center bordered"> <thead> - <tr> - <th colspan="3" class="text">Balance Trémie</th> - <th colspan="3" class="text">Balance Carrousel</th> - </tr> - <tr> - <th class="text">Trié</th> - <th class="text">Non trié</th> - <th class="text">Total</th> - <th class="text">Vrac</th> - <th class="text">Hors vrac</th> - <th class="text">Total</th> - </tr> + <tr> + <th colspan="3" class="text">Balance Trémie</th> + <th colspan="3" class="text">Balance Carrousel</th> + </tr> + <tr> + <th class="text">Trié</th> + <th class="text">Non trié</th> + <th class="text">Total</th> + <th class="text">Vrac</th> + <th class="text">Hors vrac</th> + <th class="text">Total</th> + </tr> </thead> - <tr> - <td class="number"><#if trunkSortedWeight??>${trunkSortedWeight?string("0.00")}</#if></td> - <td class="number"><#if trunkRejectedWeight??>${trunkRejectedWeight?string("")}</#if></td> - <td class="number"><#if trunkTotalWeight??>${trunkTotalWeight?string("0.00")}</#if></td> - <td class="number"><#if carrouselSortedWeight??>${carrouselSortedWeight?string("0.00")}</#if></td> - <td class="number"><#if carrouselUnsortedWeight??>${carrouselUnsortedWeight?string("")}</#if></td> - <td class="number"><#if carrouselTotalWeight??>${carrouselTotalWeight?string("0.00")}</#if></td> - </tr> + <tbody> + <tr> + <td class="number"><#if trunkSortedWeight??>${trunkSortedWeight?string("0.00")}</#if></td> + <td class="number"><#if trunkRejectedWeight??>${trunkRejectedWeight?string("")}</#if></td> + <td class="number"><#if trunkTotalWeight??>${trunkTotalWeight?string("0.00")}</#if></td> + <td class="number"><#if carrouselSortedWeight??>${carrouselSortedWeight?string("0.00")}</#if></td> + <td class="number"><#if carrouselUnsortedWeight??>${carrouselUnsortedWeight?string("")}</#if></td> + <td class="number"><#if carrouselTotalWeight??>${carrouselTotalWeight?string("0.00")}</#if></td> + </tr> + </tbody> </table> -<br/> - -<p> +<p class="centered">> NOTE: Les poids affichés sont en kg. </p> @@ -131,7 +145,7 @@ </tr> </thead> - <tbody> + <tbody class="alternateRows"> <#list rows as row> <tr> <td><input type="checkbox"/></td> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.