Author: bleny Date: 2010-11-08 16:11:08 +0000 (Mon, 08 Nov 2010) New Revision: 748 Log: fix sampling plan html+css for totals ; add tooltip in indicators admin to prevent user to use '.' instead of ',' Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -75,7 +75,9 @@ <!--input t:type="textfield" value="indicatorLevel.lowerBound" size="3" disabled="disabled" /--> </p:else> </t:if> - <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </span> </td> </t:loop> <td> Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -204,7 +204,9 @@ <tr> <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; - <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </span> <t:if test="indicatorLevel.upperBoundIncluded"> ] <p:else> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -327,20 +327,18 @@ </tr> </t:loop> <tr> - <td colspan="${nbColumnsForProfession}" /> + <td colspan="${nbColumnsForProfession}" style="font-size:1.4em; font-weight:bold; border: solid 2px #000000;"> Totaux </td> - <t:loop source="months" value="month"> - <td class="width50 acenter ${monthCurrentClass}"> - ${totalExpectedForMonth} - <!--t:if t:test="canDisplayTidesReal()"--> - <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> - <br /> - ${ratioForMonth} - <!--/t:if--> - </td> - </t:loop> - <td class="width50 acenter bright"> + <td t:type="loop" source="months" value="month" class="width50 acenter ${monthCurrentClass}" style="border-top: solid 2px #000000;"> + ${totalExpectedForMonth} + <!--t:if t:test="canDisplayTidesReal()"--> + <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> + <br /> + ${ratioForMonth} + <!--/t:if--> + </td> + <td class="width50 acenter bright" style="border-top: solid 2px #000000;"> <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du mois ${dateFormat.format(month)}" t:effect="appear"> ${highTotalExpected} <t:unless t:test="user.guest"> @@ -348,7 +346,7 @@ </t:unless> </span> </td> - <td colspan="${nbColumnsForOther}" /> + <td colspan="${nbColumnsForOther}" style="border: solid 2px #000000;" /> </tr> </tbody> </table>