Author: bleny Date: 2010-11-12 14:24:58 +0000 (Fri, 12 Nov 2010) New Revision: 765 Log: trying to fix sample row form CSS :-( Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-12 14:21:07 UTC (rev 764) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-12 14:24:58 UTC (rev 765) @@ -1,3 +1,4 @@ +DCF.gear.=Not specified DCF.gear.DRB=Boat dredges DCF.gear.DRH=Hand dredges DCF.gear.FAR=Aerial traps @@ -59,6 +60,7 @@ DCF.gear.TM=Midwater trawls (not specified) DCF.gear.TMS=Shrimp trawls DCF.gear.TX=Other trawls (not specified) +DCF.species.=Not specified wao.business.bean.DataReliability.doubtful=doubtful wao.business.bean.DataReliability.not_reliable=not reliable wao.business.bean.DataReliability.reliable=reliable Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-12 14:21:07 UTC (rev 764) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-12 14:24:58 UTC (rev 765) @@ -1,3 +1,4 @@ +DCF.gear.=Non spécifié DCF.gear.DRB=Dragues remorqu\u00E9es par bateau DCF.gear.DRH=Dragues \u00E0 main DCF.gear.FAR=Pi\u00E8ges a\u00E9riens @@ -60,6 +61,7 @@ DCF.gear.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) DCF.gear.TMS=Chalut \u00E0 crevettes DCF.gear.TX=Autre chalut (non sp\u00E9cifi\u00E9) +DCF.species.=Non spécifié DCF.species.ALG=Algues DCF.species.CAT=Esp\u00E8ces catadromes DCF.species.CRU=Crustac\u00E9s Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 14:21:07 UTC (rev 764) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-11-12 14:24:58 UTC (rev 765) @@ -60,28 +60,29 @@ <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" t:include="codeDCF5, meshSize, size, other, libelle, species" /> </div> - <div class="t-beaneditor"> - <t:zone id="so-sampleRowForm-dcf5CodeZone" t:id="dcf5CodeZone" t:update="show"> - <t:nuiton.subForm t:visible="refreshDcf5CodeZone"> - <!--<t:label t:for="selectedDcf5Code" />: - <select t:type="select" t:id="selectedSampleRow" t:value="selectedSampleRow" t:model="sampleRowSelectModel" - t:mixins="ck/onEvent" t:event="change"/--> - <input t:type="textfield" t:value="currentDCFGear" size="3" t:id="currentDCFGear" t:mixins="ck/onEvent" t:event="change" />_<input t:type="textfield" t:value="currentDCFSpecies" size="3" t:id="currentDCFSpecies" t:mixins="ck/onEvent" t:event="change" /> - <a t:type="actionlink" t:id="addCurrentDcf5Code" title="Ajouter ce code DCF5" t:zone="so-sampleRowForm-dcf5CodeZone"> - <img src="${asset:context:img/add-16px.png}" /> - </a>  - <ul> - <li t:type="loop" t:source="rowDCF5codes" t:value="dcf5Code" t:index="dcf5CodeIndex" t:volatile="true"> - <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> - ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} - </span> - <a t:type="actionlink" t:id="removeDcf5Code" t:context="dcf5CodeIndex" title="Supprimer ce code DCF5" t:zone="so-sampleRowForm-dcf5CodeZone"> - <img src="${asset:context:img/remove-22px.png}" /> - </a> - </li> - </ul> - </t:nuiton.subForm> - </t:zone> + <div class="t-beaneditor acenter"> + <div class="t-beaneditor-row"> + <t:zone id="so-sampleRowForm-dcf5CodeZone" t:id="dcf5CodeZone" t:update="show"> + <t:nuiton.subForm t:visible="refreshDcf5CodeZone"> + <t:label t:for="currentDCFGear" /> : + <input t:type="textfield" t:value="currentDCFGear" size="3" t:id="currentDCFGear" t:mixins="ck/onEvent" t:event="change" />_<input t:type="textfield" t:value="currentDCFSpecies" size="3" t:id="currentDCFSpecies" t:mixins="ck/onEvent" t:event="change" /> + <a t:type="actionlink" t:id="addCurrentDcf5Code" title="Ajouter ce code DCF5" t:zone="so-sampleRowForm-dcf5CodeZone"> + <img src="${asset:context:img/add-16px.png}" /> + </a> + + <ul> + <li t:type="loop" t:source="rowDCF5codes" t:value="dcf5Code" t:index="dcf5CodeIndex" t:volatile="true"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + ${dcf5Code.fishingGearDCF}_${dcf5Code.targetSpeciesDCF} + </span> + <a t:type="actionlink" t:id="removeDcf5Code" t:context="dcf5CodeIndex" title="Supprimer ce code DCF5" t:zone="so-sampleRowForm-dcf5CodeZone"> + <img src="${asset:context:img/remove-22px.png}" /> + </a> + </li> + </ul> + </t:nuiton.subForm> + </t:zone> + </div> </div> </p:else> </t:if>