Author: bleny Date: 2011-03-21 23:53:13 +0000 (Mon, 21 Mar 2011) New Revision: 1081 Log: fix sampling plan layout Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/css/sampling.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:53:13 UTC (rev 1081) @@ -140,7 +140,7 @@ Object onSuccessFromFiltersForm() { if (refresh) { getModelFactory().updateSearchFields(); - return filtersForm; + return filtersZone.getBody(); } if (reset) { // Don't reset period in filters Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-21 23:53:13 UTC (rev 1081) @@ -1,73 +1,71 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" - xmlns:p="tapestry:parameter"> - <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> - <fieldset> - <legend>${legendMsg}</legend> - <div class="so-filters-form"> - <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> - <t:errors/> - <div class="t-beaneditor"> - <div> - <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:format="MM/yyyy" - t:validate="required"/> - <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:format="MM/yyyy" - t:validate="required"/> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> + <fieldset> + <legend>${legendMsg}</legend> + <div class="so-filters-form"> + <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> + <t:errors/> + <div style="float: left; margin-right: 15px;"> + <label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label><br /> + <select t:type="ck/MultipleSelect" t:id="sampleRow" + t:model="modelFactory.sampleRowSelectModel" t:value="filter.sampleRows" size="6" + t:encoder="modelFactory.sampleRowSelectModel"/> + </div> + <div> + <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:format="MM/yyyy" + t:validate="required"/> + <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:format="MM/yyyy" + t:validate="required"/> + </div> + <div> + <t:if t:test="modelFactory.user.admin"> + <label for="company">${message:wao.ui.entity.Company} :</label> + <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/> + </t:if> + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> + <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/> + + </div> + <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> + <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> + <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/> + <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> + <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/> + <t:if test="modelFactory.user.obsVente"> + <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> + <input t:type="select" t:id="terrestrialDistrict" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/> + </t:if> + </div> + <div> + <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> + <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/> + <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> + <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/> + <t:if test="modelFactory.user.obsVente"> + <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> + <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> + </t:if> + </div> + <t:if test="showEstimatedTides"> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" /> + <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> + </div> + </t:if> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico22px refresh" t:id="refresh" + value="${message:wao.ui.filters.refresh}" + title="${message:wao.ui.filters.refresh}"/> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" + title="Rechercher les lignes du plan correspondants aux filtres saisies"/> + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" + title="Remettre les filtres par défaut"/> + </div> + </form> </div> - <div> - <t:if t:test="modelFactory.user.admin"> - <label for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/> - </t:if> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/> - - </div> - <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/> - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/> - <t:if test="modelFactory.user.obsVente"> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <input t:type="select" t:id="terrestrialDistrict" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/> - </t:if> - <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label> - - <select t:type="ck/MultipleSelect" t:id="sampleRow" - t:model="modelFactory.sampleRowSelectModel" t:value="filter.sampleRows" size="4" - t:encoder="modelFactory.sampleRowSelectModel"/> - </div> - <div> - <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/> - <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/> - <t:if test="modelFactory.user.obsVente"> - <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> - <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> - </t:if> - </div> - <t:if test="showEstimatedTides"> - <div class="filterRow"> - <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" /> - <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> - </div> - </t:if> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico22px refresh" t:id="refresh" - value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" - title="Rechercher les lignes du plan correspondants aux filtres saisies"/> - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" - title="Remettre les filtres par défaut"/> - </div> - </div> - </form> - </div> - </fieldset> - </div> + </fieldset> + </div> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:53:13 UTC (rev 1081) @@ -277,7 +277,7 @@ </t:if> </td> <!-- Actions --> - <td class="${actionsClass} bright"> + <td class="${actionsClass} bright" style="white-space: nowrap;"> <t:unless t:test="user.guest"> <t:if t:test="rowNotFinished"> <a t:type="pagelink" t:page="boats" t:context="row.topiaId"> Modified: trunk/wao-ui/src/main/webapp/css/sampling.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:53:13 UTC (rev 1081) @@ -33,19 +33,6 @@ margin-top: 10px; } -div#so-sampling div.user { - width: 95%; - margin-left: auto; - margin-right: auto; - font-size: 0.8em; -} - -div#so-sampling div.admin { - width: 2200px; - margin-left: 10px; - font-size: 0.8em; -} - div#so-sampling span { margin-left: 5px; } @@ -66,7 +53,8 @@ } div#so-sampling-filters { - width: 60%; + margin-left: auto; + margin-right: auto; } div#so-sampling-filters div.t-beaneditor div { @@ -210,7 +198,6 @@ /* SAMPLE ROW FORM */ div#so-samplerow-form { - width: 60%; margin-left: auto; margin-right: auto; margin-top: 20px;