Author: bleny Date: 2011-06-16 09:29:27 +0000 (Thu, 16 Jun 2011) New Revision: 1340 Log: fix conflict Modified: trunk/wao-business/src/main/resources/motifs.csv trunk/wao-ui/src/main/webapp/Cartography.tml Modified: trunk/wao-business/src/main/resources/motifs.csv =================================================================== --- trunk/wao-business/src/main/resources/motifs.csv 2011-06-15 16:13:33 UTC (rev 1339) +++ trunk/wao-business/src/main/resources/motifs.csv 2011-06-16 09:29:27 UTC (rev 1340) @@ -3,3 +3,4 @@ REFUS_PROGRAMME;Rejet du programme;FF0000 REFUS_PROFESSION;Blocage de la profession;0000FF REFUS_AUTRE;Autre;DDDDDD + Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-06-15 16:13:33 UTC (rev 1339) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-06-16 09:29:27 UTC (rev 1340) @@ -68,13 +68,11 @@ <label for="periodEnd"> ${message:wao.ui.form.period.to} </label> <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:validate="required" /> </p> - <t:if t:test="user.obsMer"> <p class="mtop5"><label for="mapType">${message:wao.ui.form.mapType}</label> : </p> <p><input t:type="select" t:id="mapType" value="mapType" t:zone="cartography-filters-sampling" t:validate="required" /></p> </t:if> - <t:if t:test="user.admin"> <!-- COMPANY --> <p class="mtop5"><label for="company">${message:wao.ui.entity.Company}</label> : </p>