Author: bleny Date: 2011-04-06 17:49:48 +0000 (Wed, 06 Apr 2011) New Revision: 1150 Log: fix boat page CSS and refresh Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/css/common.css Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2011-04-06 15:45:15 UTC (rev 1149) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2011-04-06 17:49:48 UTC (rev 1150) @@ -28,22 +28,8 @@ <form t:type="form" t:id="filtersForm" t:zone="so-filters-form" action="post"> <t:errors /> - <div class="t-beaneditor"> - <div> - <!-- Sampling filter --> - <div style="float: left; margin-right: 15px;"> - <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" /--> - <t:topiaEntitySelector t:id="sampleRow" - t:multiple="true" - t:clazzName="SampleRow" - t:labelPropertyName="code" - t:values="possibleValuesForFilter.sampleRowsAsList" - t:selectedValues="filter.sampleRows" - size="6"/> - <!--t:disabled="sampleRowExists" --> - - </div> + <div style="table-layout: auto;"> + <div style="white-space: nowrap;"> <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <t:simpleSelector t:id="facadeName" t:values="possibleValuesForFilter.facadeNamesAsList" @@ -59,7 +45,7 @@ value="Refresh" title="${message:wao.ui.filters.refresh}"/--> - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> + <label for="sectorName" style="margin-left: 15px;">${message:wao.ui.field.FishingZone.sectorName} :</label> <t:simpleSelector t:id="sectorName" t:values="possibleValuesForFilter.sectorsNamesAsList" t:selectedValue="filter.sectorName"/> @@ -74,36 +60,42 @@ value="Refresh" title="${message:wao.ui.filters.refresh}"/--> - </div><p> </p> - <div> + <label for="sampleRow" style="margin-left: 15px;">${message:wao.ui.field.SampleRow.code} :</label> + <t:topiaEntitySelector t:id="sampleRow" + t:clazzName="SampleRow" + t:labelPropertyName="code" + t:values="possibleValuesForFilter.sampleRowsAsList" + t:selectedValue="filter.sampleRow" /> + </div> + <div style="white-space: nowrap;"> <!-- Boat filter --> - <label for="boatName">${message:wao.ui.field.Boat.name} :</label> + <label for="boatName" style="margin-left: 15px;">${message:wao.ui.field.Boat.name} :</label> <input t:type="textfield" t:id="boatName" class="width150" t:value="filter.boatName" t:mixins="Autocomplete" /> - <span style="margin-left: 15px;">${message:wao.ui.field.Boat.immatriculation} :</span> + <label for="boatImmatriculation" style="margin-left: 15px;">${message:wao.ui.field.Boat.immatriculation} :</label> <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="filter.boatImmatriculation" /> - <span style="margin-left: 15px;">${message:wao.ui.field.BoatDistrict.code} :</span> + <label for="boatDistrictCode" style="margin-left: 15px;">${message:wao.ui.field.BoatDistrict.code} :</label> <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" /> - <span style="margin-left: 15px;">${message:wao.ui.field.Boat.shipOwner} :</span> + <label for="shipOwnerName" style="margin-left: 15px;">${message:wao.ui.field.Boat.shipOwner} :</label> <input t:type="textfield" t:id="shipOwnerName" class="width150" t:value="filter.shipOwnerName" t:mixins="Autocomplete" /> </div> - <div class="t-beaneditor-row aright"> + <div class="aright"> <input t:type="submit" class="ico22px refresh" t:id="refresh" value="${message:wao.ui.filters.refresh}" title="${message:wao.ui.filters.refresh}"/> Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-06 15:45:15 UTC (rev 1149) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-06 17:49:48 UTC (rev 1150) @@ -33,7 +33,7 @@ <div> <fieldset> <legend>${message:wao.ui.misc.advancedSearch}</legend> - <div class="aright"> + <!--div class="aright"> <a t:type="actionlink" t:id="showFilters"> <t:if t:test="filtersVisible"> <img src="${asset:context:}/img/downarrow.png" title="${message:wao.ui.action.showFilters}" /> @@ -42,7 +42,7 @@ </p:else> </t:if> </a> - </div> + </div--> <t:boatFilterComponent t:id="filterComponent" t:filterManager="filterManager"/> </fieldset> @@ -146,7 +146,6 @@ <t:unless t:test="user.readOnly"> <form t:type="form" t:id="companySelectForm" t:zone="so-boats-boat-infos"> <label for="company">${message:wao.ui.entity.Company} :</label> - <!--input t:type="select" t:id="company" t:model="companies" t:value="companySelectedId" /--> <t:topiaEntitySelector t:id="company" t:clazzName="Company" t:labelPropertyName="name" @@ -220,7 +219,7 @@ <dl t:type="beandisplay" t:id="boatInfosLastContact" t:object="companyBoatInfos.lastContact" t:include="referenceDate, state" t:add="createdBy, sampleRowCode"> <p:state> - ${getLabelForEnum(companyBoatInfos.lastContact.contactState)} + ${companyBoatInfos.lastContact.contactState} </p:state> <p:createdBy> ${companyBoatInfos.lastContact.mainObserver.fullName} Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2011-04-06 15:45:15 UTC (rev 1149) +++ trunk/wao-ui/src/main/webapp/css/common.css 2011-04-06 17:49:48 UTC (rev 1150) @@ -340,7 +340,6 @@ background-color: transparent; } -div#so-boats label, div.so-filters-form div.t-beaneditor label, div.so-filters-form div.t-beaneditor span { width: 120px;