Author: bleny Date: 2011-01-05 21:43:16 +0000 (Wed, 05 Jan 2011) New Revision: 895 Log: fix CSS for filters of Boats and Contacts pages Modified: trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-05 21:33:59 UTC (rev 894) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-05 21:43:16 UTC (rev 895) @@ -53,26 +53,26 @@ <div class="t-beaneditor"> <div> <!-- Sampling filter --> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName}:</label> + <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" title="${message:wao.ui.filters.refresh}"/>  - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName}</label>: + <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" title="${message:wao.ui.filters.refresh}"/>  - <label for="sampleRow">${message:wao.ui.field.SampleRow.code}:</label> + <label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label> <select t:type="select" t:id="sampleRow" t:disabled="sampleRowExists" t:model="sampleRowSelectModel" value="sampleRowId" /> </div><p> </p> <div> <!-- Boat filter --> - <label for="boatName">${message:wao.ui.field.Boat.name}</label> + <label for="boatName">${message:wao.ui.field.Boat.name} :</label> <input t:type="textfield" t:id="boatName" class="width150" t:value="boatFilter.boatName" t:mixins="Autocomplete" /> - <span>${message:wao.ui.field.Boat.immatriculation}</span> + <span style="margin-left: 15px;">${message:wao.ui.field.Boat.immatriculation} :</span> <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="boatFilter.boatImmatriculation" /> - <span>${message:wao.ui.field.BoatDistrict.code}</span> + <span style="margin-left: 15px;">${message:wao.ui.field.BoatDistrict.code} :</span> <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="boatFilter.boatDistrictCode" /> - <span>${message:wao.ui.field.Boat.shipOwner}</span> + <span style="margin-left: 15px;">${message:wao.ui.field.Boat.shipOwner} :</span> <input t:type="textfield" t:id="shipOwnerName" class="width150" t:value="boatFilter.shipOwnerName" t:mixins="Autocomplete" /> </div> <div class="t-beaneditor-row aright"> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 21:33:59 UTC (rev 894) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 21:43:16 UTC (rev 895) @@ -68,6 +68,8 @@ <div> <t:label t:for="fromDate" />: <input t:type="datefield" class="width70" t:id="fromDate" value="contactFilter.fromDate" />  + <t:label t:for="state" />: + <select t:type="select" t:id="state" value="contactFilter.state"/>  <t:if t:test="user.admin"> <t:label t:for="company" />: <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  @@ -78,13 +80,11 @@ <select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> </div><p> </p> <div> - <!-- Boat filter --> <label>Navire </label> <t:label t:for="boatImmatriculation" />: <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="contactFilter.boatImmatriculation" />  <t:label t:for="boatDistrictCode" />: <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="contactFilter.boatDistrictCode" />  - <!-- Sampling filter --> <t:label t:for="facadeName" />: <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" />  <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" @@ -95,7 +95,8 @@ title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  <t:label t:for="sampleRow" />: <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" t:mixins="ck/onEvent" t:event="change" />  - <!-- Contact filter --> + </div><p> </p> + <div> <label>Observations: </label> <input t:type="checkbox" t:id="mammalsObservation1" value="contactFilter.mammalsObservation" /> <t:label t:for="mammalsObservation1"> @@ -106,10 +107,6 @@ <t:label t:for="mammalsCapture1"> <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> </t:label> - </div><p> </p> - <div> - <t:label t:for="state" />: - <select t:type="select" t:id="state" value="contactFilter.state"/>  <label>Validation société: </label> <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> <t:label t:for="companyAccepted"> @@ -151,7 +148,7 @@ <label for="commentAdmin">programme</label> </t:if> </div> - <div style="margin-top: 15px;"> + <div class="fleft" style="margin-top: 15px;"> <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> </div> <div class="t-beaneditor-row aright">