Author: bleny Date: 2014-03-31 11:10:25 +0200 (Mon, 31 Mar 2014) New Revision: 1773 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1773 Log: refs #4483 some styles Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-28 10:24:41 UTC (rev 1772) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 09:10:25 UTC (rev 1773) @@ -58,10 +58,6 @@ <content tag="mainClass">large</content> - <h1> - <s:text name="wao.ui.page.SamplingPlan.title" /> - </h1> - <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> <fieldset> @@ -139,7 +135,7 @@ </fieldset> - <div class="form-actions" style="clear: both;"> + <div class="form-actions"> <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> @@ -486,12 +482,11 @@ <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> <span class="estimated"> - <s:property value="samplingPlan.getTotalEstimatedRatio(#month)"/> + (<s:property value="samplingPlan.getTotalEstimatedRatio(#month)"/>) </span> <span class="real"> - <s:property value="samplingPlan.getTotalRealRatio(#month)"/> + (<s:property value="samplingPlan.getTotalRealRatio(#month)"/>) </span> - </s:if> </td> </s:iterator> @@ -511,12 +506,11 @@ <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> <span class="estimated"> - <s:property value="samplingPlan.highTotalEstimatedRatio"/> + (<s:property value="samplingPlan.highTotalEstimatedRatio"/>) </span> <span class="real"> - <s:property value="samplingPlan.highTotalRealRatio"/> + (<s:property value="samplingPlan.highTotalRealRatio"/>) </span> - </s:if> </td> <td class="effort"> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-28 10:24:41 UTC (rev 1772) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-31 09:10:25 UTC (rev 1773) @@ -81,7 +81,22 @@ text-overflow: initial; } +.compact-view .only-in-full-view, +.full-view .only-in-compact-view, +.show-estimated .real, +.show-real .estimated { + display: none; +} +.effort .lower-than-expected { + color : red; +} + +.effort .higher-than-expected { + color : green; +} + + /****************************************************************************** * Styles globaux à l'application *****************************************************************************/ @@ -170,6 +185,13 @@ margin-right: 5px; } +form.filters-form .form-actions { + clear: both; + margin-top: 0px; + border: none; + background-color: white; +} + /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli *****************************************************************************/ @@ -230,21 +252,11 @@ background-color: beige; } -.compact-view .only-in-full-view, -.full-view .only-in-compact-view, -.show-estimated .real, -.show-real .estimated { - display: none; +table.sampling-plan td.effort { + text-align: center; } -td.effort .lower-than-expected { - color : red; +table.sampling-plan .actions .dropdown-menu { + left: -200px } -td.effort .higher-than-expected { - color : green; -} - -td.effort { - text-align: center; -} \ No newline at end of file