Author: bleny Date: 2010-11-08 21:42:32 +0000 (Mon, 08 Nov 2010) New Revision: 750 Log: manage rights to see administration of indicators 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/css/common.css 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 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 21:42:32 UTC (rev 750) @@ -90,7 +90,7 @@ </tbody> </table> <t:if test="isWithLegend()"> - <div class="acenter"> + <div class="acenter" style="font-size: 9pt;"> En jaune, la position actuelle de la société selon cet indicateur. </div> </t:if> Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 21:42:32 UTC (rev 750) @@ -174,34 +174,35 @@ <t:if test="currentUser.indicatorsViewer"> - <t:if t:test="currentUser.admin"> <!-- read only ????--> + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> - <t:zone t:id="synthesisParametersFormZone" t:update="show"> - <h2>Indicateurs qualités prestataires</h2> + <div class="mtop30" /> - <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> - <t:errors t:banner="message:errors-banner" /> + <t:errors t:banner="message:errors-banner" /> - <!-- ALL ACTUAL VALUES FOR INDICATORS OF GLOBAL SYNTHESIS --> - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> - <t:indicatorLevels t:indicator="indicator" editable="true" /> - </t:loop> + <!-- ALL ACTUAL VALUES FOR INDICATORS OF GLOBAL SYNTHESIS --> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="currentUser.admin" /> + </t:loop> - <table class="indicatorLevels"> - <tr> - <th>Total coefficients : </th> - <td>${globalSynthesisParameters.totalCoefficients}</td> - </tr> - </table> + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${globalSynthesisParameters.totalCoefficients}</td> + </tr> + </table> - <table class="indicatorLevels"> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> - ${globalIndicatorValue.label} - </td> - </tr> - <tr> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> + ${globalIndicatorValue.label} + </td> + </tr> + <tr> + <t:if test="currentUser.admin"> <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> @@ -214,24 +215,35 @@ </p:else> </t:if> </td> - </tr> - </table> + <p:else> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + [ ${indicatorLevel.lowerBound} ; ${indicatorLevel.upperBound} + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> + </td> + </p:else> + </t:if> + </tr> + </table> - <div> - <p><label>Commentaire sur la modification* :</label></p> - <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> - </div> + <div> + <p><label>Commentaire sur la modification* :</label></p> + <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> + </div> - <div class="fright"> - <a t:type="pagelink" page="IndicatorsHistory"> - <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> - </a> - <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> - </div> - </form> - </t:zone> - </t:if> + <div class="fright"> + <a t:type="pagelink" page="IndicatorsHistory"> + <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> + </a> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> + </div> + </form> + </t:zone> </t:if> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-11-08 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-11-08 21:42:32 UTC (rev 750) @@ -375,6 +375,7 @@ /* INDICATOR TABLES */ table.indicatorLevels { + width: 750px; border: solid 1px black; margin-left: auto; margin-right: auto; @@ -393,6 +394,7 @@ table.indicatorLevels td { text-align: center; + font-size: 90%; } table.indicatorLevels td.highlight {