Author: bleny Date: 2014-06-10 15:46:37 +0200 (Tue, 10 Jun 2014) New Revision: 2018 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2018 Log: refs #4483 better th for observationTimesInDays Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-06-10 13:34:51 UTC (rev 2017) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-10 13:46:37 UTC (rev 2018) @@ -248,7 +248,18 @@ <!-- Other columns --> <th> <s:text name="wao.ui.samplingPlan.observationTimesInDays"/> - [ <s:text name="wao.ui.samplingPlan.expected"/><em>(<s:text name="wao.ui.samplingPlan.actual"/><s:if test="estimatedTides"> + <s:text name="wao.ui.samplingPlan.estimated"/></s:if>)</em> ] + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + [ + <span class="estimated"> + (<s:text name="wao.ui.samplingPlan.actual" /> + <s:text name="wao.ui.samplingPlan.estimated" />) + </span> + <span class="real"> + <s:text name="wao.ui.samplingPlan.actual" /> + </span> + / + <s:text name="wao.ui.samplingPlan.expected"/> + ] + </s:if> </th> <th> <s:text name="wao.ui.samplingPlan.averageTideTime"/>