From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:27 2026 From: bleny@users.labs.libre-entreprise.org To: wao-commits@list.forge.codelutin.com Subject: [Suiviobsmer-commits] r1081 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/components resources/fr/ifremer/wao/ui/components webapp webapp/css Date: Tue, 22 Mar 2011 00:53:14 +0100 Message-ID: <20110321235314.432922F897@labs.libre-entreprise.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3329410855817740982==" --===============3329410855817740982== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/SamplingFilterComp= onent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilte= rComponent.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/SamplingFil= terComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterCom= ponent.java 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterCom= ponent.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/Sampli= ngFilterComponent.tml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilt= erComponent.tml 2011-03-21 23:17:41 UTC (rev 1080) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilt= erComponent.tml 2011-03-21 23:53:13 UTC (rev 1081) @@ -1,73 +1,71 @@ - -

-

- ${legendMsg} -

-

- -

-

- ${message:wao.ui.form.periodFrom} - - ${message:wao.ui.form.period.to} = ; - + +

+

+ ${legendMsg} +

+ + +

+ ${message:wao.ui.field.Samp= leRow.code} :
+ + ${message:wao.ui.form.perio= d.to} + +

+

+ + ${message:wao.ui.entity.C= ompany} : + &nb= sp; + + ${message:wao.ui.field.Sa= mpleRow.programName} : + + ${message:wao.ui.field.Fis= hingZone.sectorName} : + + +

+

+ ${message:wao.ui.entit= y.fishingGearDCF} : + + ${message:wao.ui.ent= ity.targetSpeciesDCF} : + + + ${message:wao.= ui.field.SampleRow.samplingStrategy} : + + +

+ +

+ + ${message:wao.ui.form.estimated= Tides} +

+ +

+ + + +

+

-

- - ${message:wao.ui.entity.Company} = ;: - - - ${message:wao.ui.field.SampleRow.pr= ogramName} : - - ${message:wao.ui.field.FishingZone.s= ectorName} : - - - ${message:wao.ui.field.SampleRow.co= de} : - - &nb= sp; - ${message:wao.ui.entity.target= SpeciesDCF} : - - - ${message:wao.ui.field.Sam= pleRow.samplingStrategy} : - - -

- -

- - ${message:wao.ui.form.estimatedTides} -

- -

- - - -

-

- -

-

-

+ + \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:17:41 UTC (re= v 1080) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:53:13 UTC (re= v 1081) @@ -277,7 +277,7 @@ - + Modified: trunk/wao-ui/src/main/webapp/css/sampling.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:17:41 UTC (re= v 1080) +++ trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:53:13 UTC (re= v 1081) @@ -33,19 +33,6 @@ margin-top: 10px; } =20 -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 @@ } =20 div#so-sampling-filters { - width: 60%; + margin-left: auto; + margin-right: auto; } =20 div#so-sampling-filters div.t-beaneditor div { @@ -210,7 +198,6 @@ =20 /* SAMPLE ROW FORM */ div#so-samplerow-form { - width: 60%; margin-left: auto; margin-right: auto; margin-top: 20px; --===============3329410855817740982==--