Author: bleny Date: 2014-05-19 14:00:44 +0200 (Mon, 19 May 2014) New Revision: 1961 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1961 Log: fixes #5096 fix order of columns in contacts Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 11:37:20 UTC (rev 1960) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 12:00:44 UTC (rev 1961) @@ -336,8 +336,8 @@ <th class="date-time"><s:text name="wao.ui.field.Contact.beginDate"/></th> <th class="date-time"><s:text name="wao.ui.field.Contact.endDate"/></th> <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> + <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th class="date"><s:text name="wao.ui.field.Contact.restitution"/></th> - <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th><s:text name="wao.ui.contacts.observations"/></th> <th><s:text name="wao.ui.field.Contact.comment"/></th> <th><s:text name="wao.ui.field.Contact.commentCompany"/></th> @@ -437,16 +437,16 @@ <s:property value="dataInputDate"/> </s:if> </td> + <td> + <s:if test="observedDataControl != null"> + <s:text name="%{observedDataControl.i18nKey}"/> + </s:if> + </td> <td class="date"> <s:if test="restitution != null"> <s:property value="restitution"/> </s:if> </td> - <td> - <s:if test="observedDataControl != null"> - <s:text name="%{observedDataControl.i18nKey}"/> - </s:if> - </td> <td class="align-center"> <s:if test="mammalsObservation"> <i class="fa fa-eye"