From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:15 2026
From: bleny@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r750 - in trunk/wao-ui/src/main:
	resources/fr/ifremer/wao/ui/components webapp webapp/css
Date: Mon, 08 Nov 2010 22:42:32 +0100
Message-ID: <20101108214232.C13E42F224@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7990911636049987307=="

--===============7990911636049987307==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/IndicatorLeve=
ls.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/Indica=
torLevels.tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLev=
els.tml	2010-11-08 16:40:11 UTC (rev 749)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLev=
els.tml	2010-11-08 21:42:32 UTC (rev 750)
@@ -90,7 +90,7 @@
         </tbody>
     </table>
     <t:if test=3D"isWithLegend()">
-        <div class=3D"acenter">
+        <div class=3D"acenter" style=3D"font-size: 9pt;">
             En jaune, la position actuelle de la soci=C3=A9t=C3=A9 selon cet=
 indicateur.
         </div>
     </t:if>

Modified: trunk/wao-ui/src/main/webapp/Administration.tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
     <t:if test=3D"currentUser.indicatorsViewer">
=20
-        <t:if t:test=3D"currentUser.admin"> <!-- read only ????-->
+        <t:zone t:id=3D"synthesisParametersFormZone" t:update=3D"show">
+            <h2>Indicateurs qualit=C3=A9s prestataires</h2>
=20
-            <t:zone t:id=3D"synthesisParametersFormZone" t:update=3D"show">
-                <h2>Indicateurs qualit=C3=A9s prestataires</h2>
+            <div class=3D"mtop30" />=20
=20
-                <form t:type=3D"form" t:id=3D"synthesisParametersForm" t:zon=
e=3D"synthesisParametersFormZone">
+            <form t:type=3D"form" t:id=3D"synthesisParametersForm" t:zone=3D=
"synthesisParametersFormZone">
=20
-                    <t:errors t:banner=3D"message:errors-banner" />
+                <t:errors t:banner=3D"message:errors-banner" />
=20
-                    <!-- ALL ACTUAL VALUES FOR INDICATORS OF GLOBAL SYNTHESI=
S -->
-                    <t:loop t:source=3D"globalSynthesisParameters.parameters=
" t:value=3D"indicator" t:volatile=3D"true">
-                        <t:indicatorLevels t:indicator=3D"indicator" editabl=
e=3D"true" />
-                    </t:loop>
+                <!-- ALL ACTUAL VALUES FOR INDICATORS OF GLOBAL SYNTHESIS -->
+                <t:loop t:source=3D"globalSynthesisParameters.parameters" t:=
value=3D"indicator" t:volatile=3D"true">
+                    <t:indicatorLevels t:indicator=3D"indicator" editable=3D=
"currentUser.admin" />
+                </t:loop>
=20
-                    <table class=3D"indicatorLevels">
-                        <tr>
-                            <th>Total coefficients : </th>
-                            <td>${globalSynthesisParameters.totalCoefficient=
s}</td>
-                        </tr>
-                    </table>
+                <table class=3D"indicatorLevels">
+                    <tr>
+                        <th>Total coefficients : </th>
+                        <td>${globalSynthesisParameters.totalCoefficients}</=
td>
+                    </tr>
+                </table>
=20
-                    <table class=3D"indicatorLevels">
-                        <tr>
-                            <td t:type=3D"loop" t:source=3D"globalSynthesisP=
arameters.globalIndicator.indicatorLevel" t:value=3D"indicatorLevel" t:volati=
le=3D"true">
-                                ${globalIndicatorValue.label}
-                            </td>
-                        </tr>
-                        <tr>
+                <table class=3D"indicatorLevels">
+                    <tr>
+                        <td t:type=3D"loop" t:source=3D"globalSynthesisParam=
eters.globalIndicator.indicatorLevel" t:value=3D"indicatorLevel" t:volatile=
=3D"true">
+                            ${globalIndicatorValue.label}
+                        </td>
+                    </tr>
+                    <tr>
+                        <t:if test=3D"currentUser.admin">
                             <td t:type=3D"loop" t:source=3D"globalSynthesisP=
arameters.globalIndicator.indicatorLevel" t:value=3D"indicatorLevel" volatile=
=3D"true">
                                 [ <input type=3D"text" size=3D"3" value=3D"$=
{indicatorLevel.lowerBound}" disabled=3D"disabled" /> ;
                                 <span t:type=3D"ck/Tooltip" t:value=3D"Atten=
tion =C3=A0 bien utiliser ',' et non '.' pour les d=C3=A9cimales" t:effect=3D=
"appear">
@@ -214,24 +215,35 @@
                                     </p:else>
                                 </t:if>
                             </td>
-                        </tr>
-                    </table>
+                            <p:else>
+                                <td t:type=3D"loop" t:source=3D"globalSynthe=
sisParameters.globalIndicator.indicatorLevel" t:value=3D"indicatorLevel" vola=
tile=3D"true">
+                                    [ ${indicatorLevel.lowerBound} ; ${indic=
atorLevel.upperBound}
+                                    <t:if test=3D"indicatorLevel.upperBoundI=
ncluded">
+                                        ]
+                                        <p:else>
+                                            [
+                                        </p:else>
+                                    </t:if>
+                                </td>
+                            </p:else>
+                        </t:if>
+                    </tr>
+                </table>
=20
-                    <div>
-                        <p><label>Commentaire sur la modification* :</label>=
</p>
-                        <p><input t:type=3D"textarea" t:id=3D"comment" cols=
=3D"50" rows=3D"5" value=3D"comment"/></p>
-                    </div>
+                <div>
+                    <p><label>Commentaire sur la modification* :</label></p>
+                    <p><input t:type=3D"textarea" t:id=3D"comment" cols=3D"5=
0" rows=3D"5" value=3D"comment"/></p>
+                </div>
=20
-                    <div class=3D"fright">
-                        <a t:type=3D"pagelink" page=3D"IndicatorsHistory">
-                            <img src=3D"${asset:context:/img/clock.png}" alt=
=3D"Historique" title=3D"Voir l'historique des modifications des indicateurs"=
 />
-                        </a>
-                        <input t:type=3D"submit" t:id=3D"saveData" class=3D"=
ico save" value=3D"Save" title=3D"Enregistrer les modifications" />
-                        <input type=3D"reset" class=3D"ico undo" value=3D"An=
nuler les modificationss" title=3D"Annuler les modifications" />
-                    </div>
-                </form>
-            </t:zone>
-        </t:if>
+                <div class=3D"fright">
+                    <a t:type=3D"pagelink" page=3D"IndicatorsHistory">
+                        <img src=3D"${asset:context:/img/clock.png}" alt=3D"=
Historique" title=3D"Voir l'historique des modifications des indicateurs" />
+                    </a>
+                    <input t:type=3D"submit" t:id=3D"saveData" class=3D"ico =
save" value=3D"Save" title=3D"Enregistrer les modifications" />
+                    <input type=3D"reset" class=3D"ico undo" value=3D"Annule=
r les modificationss" title=3D"Annuler les modifications" />
+                </div>
+            </form>
+        </t:zone>
=20
     </t:if>
=20

Modified: trunk/wao-ui/src/main/webapp/css/common.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
 /* INDICATOR TABLES */
 table.indicatorLevels {
+    width: 750px;
     border: solid 1px black;
     margin-left: auto;
     margin-right: auto;
@@ -393,6 +394,7 @@
=20
 table.indicatorLevels td {
     text-align: center;
+    font-size: 90%;
 }
=20
 table.indicatorLevels td.highlight {


--===============7990911636049987307==--