From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:38 2026
From: bleny@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r1378 - in trunk:	wao-business/src/main/filters
	wao-ui/src/main/resources/fr/ifremer/wao/ui/components	wao-ui/src/main/webapp
Date: Tue, 19 Jul 2011 15:24:33 +0200
Message-ID: <20110719132433.D1EF32F1B4@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1780234699875825586=="

--===============1780234699875825586==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bleny
Date: 2011-07-19 13:24:33 +0000 (Tue, 19 Jul 2011)
New Revision: 1378

Log:
fix wao explosion

Modified:
   trunk/wao-business/src/main/filters/Wao.properties
   trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml
   trunk/wao-ui/src/main/webapp/Cartography.tml
   trunk/wao-ui/src/main/webapp/Connexion.tml
   trunk/wao-ui/src/main/webapp/Contacts.tml

Modified: trunk/wao-business/src/main/filters/Wao.properties
=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-business/src/main/filters/Wao.properties	2011-07-18 14:15:21 UT=
C (rev 1377)
+++ trunk/wao-business/src/main/filters/Wao.properties	2011-07-19 13:24:33 UT=
C (rev 1378)
@@ -31,6 +31,7 @@
 hibernate.connection.driver_class=3Dorg.h2.Driver
 ## Database location in user home
 hibernate.connection.url=3Djdbc:h2:file:~/.local/wao/h2data
+hibernate.connection.provider_class=3Dorg.nuiton.topia.framework.TopiaConnec=
tionProvider
=20
 ## Logs for activityCalendar in wao.log.home
 ## wao.log.home must be defined when starting server

Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout=
.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/Layout.tml	2=
011-07-18 14:15:21 UTC (rev 1377)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml	2=
011-07-19 13:24:33 UTC (rev 1378)
@@ -53,8 +53,8 @@
         </t:unless>
         <div id=3D"so-session" class=3D"clearfix">
             <div class=3D"fleft">
-                <a t:type=3D"pagelink" t:page=3D"index" title=3D"{$mesage:wa=
o.ui.page.Index.title}">
-                    <img src=3D"${asset:context:img/logo-wao-48px.png}" alt=
=3D"{$mesage:wao.ui.page.Index.title}" title=3D"{$mesage:wao.ui.page.Index.ti=
tle}"/>
+                <a t:type=3D"pagelink" t:page=3D"index" title=3D"${message:w=
ao.ui.page.Index.title}">
+                    <img src=3D"${asset:context:img/logo-wao-48px.png}" alt=
=3D"${message:wao.ui.page.Index.title}" />
                 </a>&nbsp;
             </div>
             <t:if test=3D"connectedUser.obsMer">

Modified: trunk/wao-ui/src/main/webapp/Cartography.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/Cartography.tml	2011-07-18 14:15:21 UTC (rev=
 1377)
+++ trunk/wao-ui/src/main/webapp/Cartography.tml	2011-07-19 13:24:33 UTC (rev=
 1378)
@@ -112,7 +112,7 @@
                 <t:if test=3D"user.obsMer">
                     <div class=3D"acenter mtop30">
                         <a href=3D"mailto:obsmer at ifremer.fr" title=3D"${m=
essage:wao.ui.action.contactAdmin}">
-                            <img style=3D"height: 22px;" src=3D"${asset:cont=
ext:img/MiniLogo.jpg}" alt=3D"Obsmer logo"/>
+                            <img src=3D"${asset:context:img/MiniLogo.jpg}" s=
tyle=3D"height: 22px;" alt=3D"Obsmer logo"/>
                         </a>
                     </div>
                 </t:if>

Modified: trunk/wao-ui/src/main/webapp/Connexion.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/Connexion.tml	2011-07-18 14:15:21 UTC (rev 1=
377)
+++ trunk/wao-ui/src/main/webapp/Connexion.tml	2011-07-19 13:24:33 UTC (rev 1=
378)
@@ -55,8 +55,8 @@
                     <p><label t:for=3D"email">${message:wao.ui.field.WaoUser=
.login}</label> : </p>
                     <p>
                         <input t:type=3D"textfield" t:id=3D"login" t:value=
=3D"login" t:validate=3D"required"/>&nbsp;
-                        <img class=3D"hidden" id=3D"loginValid" src=3D"${ass=
et:context:img/valid-16px.png}" alt=3D"${message:wao.ui.validLogin}" title=3D=
"${message:wao.ui.validLogin}" />
-                        <img class=3D"hidden" id=3D"loginInvalid" src=3D"${a=
sset:context:img/invalid-16px.png}" alt=3D"${message:wao.ui.invalidLogin}" ti=
tle=3D"${message:wao.ui.invalidLogin}" />
+                        <img src=3D"${asset:context:img/valid-16px.png}" cla=
ss=3D"hidden" id=3D"loginValid" alt=3D"${message:wao.ui.validLogin}" title=3D=
"${message:wao.ui.validLogin}" />
+                        <img src=3D"${asset:context:img/invalid-16px.png}" c=
lass=3D"hidden" id=3D"loginInvalid" alt=3D"${message:wao.ui.invalidLogin}" ti=
tle=3D"${message:wao.ui.invalidLogin}" />
                     </p>
                     <p><label for=3D"password">${message:wao.ui.field.WaoUse=
r.password}</label> : </p>
                     <p><input t:type=3D"passwordfield" t:id=3D"password" t:v=
alue=3D"password" t:validate=3D"required"/></p>

Modified: trunk/wao-ui/src/main/webapp/Contacts.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/Contacts.tml	2011-07-18 14:15:21 UTC (rev 13=
77)
+++ trunk/wao-ui/src/main/webapp/Contacts.tml	2011-07-19 13:24:33 UTC (rev 13=
78)
@@ -62,155 +62,7 @@
                           t:visibleOnStartup=3D"false"
                           t:user=3D"user"
                           t:serviceContact=3D"serviceContact"/>
-<!-- FILTRES -->
-<!--div t:type=3D"zone" class=3D"so-filters" t:id=3D"filtersZone" t:visible=
=3D"prop:filtersVisible" id=3D"so-contacts-filters">
-    <fieldset>
-        <legend>${message:wao.ui.misc.advancedSearch}</legend>
-        <div class=3D"so-filters-form">
-            <form t:type=3D"form" t:id=3D"filtersForm" t:zone=3D"so-contacts=
-filters">
-                <t:errors />
-                <div class=3D"t-beaneditor">
-                    <div>
-                        <label for=3D"fromDate">${message:wao.ui.misc.since}=
 :</label>
-                        <input t:type=3D"datefield" class=3D"width70" t:id=
=3D"fromDate" value=3D"contactFilter.fromDate" />&nbsp;
-                        <label for=3D"state">${message:wao.ui.field.Contact.=
contactState} :</label>
-                        <select t:type=3D"select"
-                                t:id=3D"state"
-                                value=3D"contactFilter.state"
-                                t:model=3D"contactStateSelectModel"
-                                t:zone=3D"so-contacts-filters" />&nbsp;
-                        <t:if test=3D"contactStateMotifSelectModel">
-                            <label for=3D"stateMotif">${message:wao.ui.field=
.Contact.contactStateMotif} :</label>
-                            <input t:type=3D"select"
-                                   t:id=3D"stateMotif"
-                                   t:value=3D"contactStateMotifId"
-                                   t:model=3D"contactStateMotifSelectModel" =
/>
-                        </t:if>
-                        <t:if t:test=3D"user.admin">
-                            <label for=3D"company">${message:wao.ui.entity.C=
ompany} :</label>
-                            <input t:type=3D"select" t:id=3D"company" t:mode=
l=3D"companySelectModel" value=3D"companyId"/>&nbsp;
-                            <input t:type=3D"submit" class=3D"ico22px refres=
h" t:id=3D"refreshByCompany" value=3D"Refresh"
-                                  title=3D"Rafra=C3=AEchir les filtres en fo=
nction de la soci=C3=A9t=C3=A9 s=C3=A9lectionn=C3=A9e"/>&nbsp;
-                        </t:if>
-                        <label for=3D"observer">${message:wao.ui.misc.observ=
er} :</label>
-                        <select t:type=3D"select" t:id=3D"observer" t:model=
=3D"observerSelectModel" value=3D"observerId" />
-                    </div>
-                    <p>&nbsp;</p>
-                    <div>
-                        <label>${message:wao.ui.entity.Boat} </label>
-                        <label t:for=3D"boatImmatriculation">${message:wao.u=
i.field.Boat.immatriculation} :</label>
-                        <input t:type=3D"textfield" t:id=3D"boatImmatriculat=
ion" class=3D"width50" t:value=3D"contactFilter.boatImmatriculation" />&nbsp;
-                        <label t:for=3D"boatDistrictCode">${message:wao.ui.f=
ield.Boat.districtCode} :</label>
-                        <input t:type=3D"textfield" t:id=3D"boatDistrictCode=
" class=3D"width50" t:value=3D"contactFilter.boatDistrictCode" />&nbsp;
-                        <label t:for=3D"facadeName">${message:wao.ui.field.F=
ishingZone.facadeName} :</label>
-                        <select t:type=3D"select" t:id=3D"facadeName" t:mode=
l=3D"facadeSelectModel" value=3D"contactFilter.facadeName" />&nbsp;
-                        <input t:type=3D"submit" class=3D"ico22px refresh" t=
:id=3D"refreshByFacade" value=3D"${message:wao.ui.action.refresh}" />&nbsp;
-                        <label for=3D"sectorName">${message:wao.ui.field.Fis=
hingZone.sectorName} :</label>
-                        <select t:type=3D"select" t:id=3D"sectorName" t:mode=
l=3D"sectorSelectModel" value=3D"contactFilter.sectorName" />&nbsp;
-                        <input t:type=3D"submit" class=3D"ico22px refresh" t=
:id=3D"refreshBySector" value=3D"Refresh"
-                               title=3D"Rafra=C3=AEchir les m=C3=A9tiers en =
fonction de la zone s=C3=A9lectionn=C3=A9e"/>&nbsp;
-                        <label for=3D"sampleRow">${message:wao.ui.field.Samp=
leRow.code} :</label>
-                        <input t:type=3D"select" t:id=3D"sampleRow" t:model=
=3D"sampleRowSelectModel" value=3D"sampleRowId" t:mixins=3D"ck/onEvent" t:eve=
nt=3D"change" />&nbsp;
-                    </div>
-                    <p>&nbsp;</p>
-                    <t:if test=3D"user.obsVente">
-                        <div>
-                        <label>${message:wao.ui.field.SampleRow.terrestrialL=
ocation}&nbsp;:</label>
-                        <input t:type=3D"select" t:id=3D"terrestrialDistrict=
" t:zone=3D"so-contacts-filters" t:model=3D"terrestrialDistrictSelectModel" t=
:value=3D"terrestrialDistrictId" />
-                        <t:if test=3D"terrestrialDistrictId">
-                            <label style=3D"margin-left: 10px;">${message:wa=
o.ui.field.Contact.terrestrialLocation}&nbsp;:</label>
-                            <input t:type=3D"select" t:model=3D"terrestrialL=
ocationSelectModel" t:value=3D"terrestrialLocationId" />
-                        </t:if>
-                        </div>
-                        <p>&nbsp;</p>
-                    </t:if>
-                    <div>
-                        <t:if test=3D"user.obsMer">
-                            <label>${message:wao.ui.misc.observations} :</la=
bel>
-                            <input t:type=3D"checkbox" t:id=3D"mammalsObserv=
ation" value=3D"contactFilter.mammalsObservation" />
-                            <label for=3D"mammalsObservation">
-                                <img src=3D"${asset:context:img/eye-22px.png=
}" alt=3D"${message:wao.ui.field.Contact.mammalsObservation}" />
-                            </label>&nbsp;
-                            <label>${message:wao.ui.field.Contact.mammalsCap=
ture} :</label>
-                            <input t:type=3D"checkbox" t:id=3D"mammalsCaptur=
e" value=3D"contactFilter.mammalsCapture" />
-                            <label for=3D"mammalsCapture">
-                                <img src=3D"${asset:context:img/fishing-net-=
22px.png}" alt=3D"${message:wao.ui.field.Contact.mammalsCapture}" />
-                            </label>
-                        </t:if>
-                        <label>${message:wao.ui.field.Contact.validationComp=
any} :</label>
-                        <input t:type=3D"checkbox" t:id=3D"companyAccepted" =
value=3D"contactFilter.companyAccepted" />
-                        <label for=3D"companyAccepted">
-                            <img src=3D"${asset:context:img/true-22px.png}" =
alt=3D"${message:wao.ui.misc.accepted}" />
-                        </label>&nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"companyRefused" v=
alue=3D"contactFilter.companyRefused" />
-                        <label t:for=3D"companyRefused">
-                            <img src=3D"${asset:context:img/false-22px.png}"=
 alt=3D"${message:wao.ui.misc.refused}" />
-                        </label>&nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"companyUndefined"=
 value=3D"contactFilter.companyUndefined" />
-                        <label t:for=3D"companyUndefined">
-                            <img src=3D"${asset:context:img/help-22px.png}" =
alt=3D"${message:wao.ui.misc.undefined}" />
-                        </label>
-                        <label>${message:wao.ui.field.Contact.validationProg=
ram} :</label>
-                        <input t:type=3D"checkbox" t:id=3D"programAccepted" =
value=3D"contactFilter.programAccepted" />
-                        <label t:for=3D"programAccepted">
-                            <img src=3D"${asset:context:img/true-22px.png}" =
alt=3D"${message:wao.ui.misc.accepted}" />
-                        </label>&nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"programRefused" v=
alue=3D"contactFilter.programRefused" />
-                        <label t:for=3D"programRefused">
-                            <img src=3D"${asset:context:img/false-22px.png}"=
 alt=3D"${message:wao.ui.misc.refused}" />
-                        </label>&nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"programUndefined"=
 value=3D"contactFilter.programUndefined" />
-                        <label t:for=3D"programUndefined">
-                            <img src=3D"${asset:context:img/help-22px.png}" =
alt=3D"${message:wao.ui.misc.undefined}" />
-                        </label>
-                        <t:if test=3D"user.obsMer">
-                        <t:unless t:test=3D"user.observer">
-                            <label for=3D"reliabilityFilter">${message:wao.u=
i.field.Contact.dataReliability} :</label>
-                            <select t:type=3D"select" t:id=3D"reliabilityFil=
ter" value=3D"contactFilter.dataReliability"/>&nbsp;
-                        </t:unless>
-                        </t:if>
-                        <span style=3D"margin-left: 15px;">${message:wao.ui.=
misc.comments} :</span>
-                        <input t:type=3D"checkbox" t:id=3D"commentFilter" va=
lue=3D"contactFilter.comment" />
-                        <label for=3D"commentFilter" style=3D"margin-right: =
5px;">${message:wao.ui.field.Contact.mainObserver}</label>
-                        &nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"commentCompany" v=
alue=3D"contactFilter.commentCompany" />
-                        <label for=3D"commentCompany" style=3D"margin-right:=
 5px;">${message:wao.ui.entity.Company}</label>&nbsp;
-                        &nbsp;
-                        <input t:type=3D"checkbox" t:id=3D"commentAdmin" val=
ue=3D"contactFilter.commentAdmin" />
-                        <label for=3D"commentAdmin" style=3D"margin-right: 5=
px;">${message:wao.ui.form.program}</label>
-                    </div>
-                    <t:if t:test=3D"user.obsVente">
-                        <label for=3D"samplingStrategy">${message:wao.ui.fie=
ld.SampleRow.samplingStrategy}</label>
-                        <input t:type=3D"select" t:id=3D"samplingStrategy" v=
alue=3D"contactFilter.samplingStrategy" />
-                        <label for=3D"actualSamplingStrategy">${message:wao.=
ui.field.Contact.samplingStrategy}</label>
-                        <input t:type=3D"select" t:id=3D"actualSamplingStrat=
egy" value=3D"contactFilter.actualSamplingStrategy" />
-                        <label>${message:wao.ui.field.Contact.completeSampli=
ng}</label>
-                        <input t:type=3D"checkbox" t:id=3D"completeSampling"=
 value=3D"contactFilter.completeSampling" />
-                        <label for=3D"completeSampling">
-                            <img src=3D"${asset:context:img/true-22px.png}" =
alt=3D"${message:wao.ui.misc.yes}" />
-                        </label>
-                        <input t:type=3D"checkbox" t:id=3D"incompleteSamplin=
g" value=3D"contactFilter.incompleteSampling" />
-                        <label t:for=3D"incompleteSampling">
-                            <img src=3D"${asset:context:img/false-22px.png}"=
 alt=3D"${message:wao.ui.misc.no}" />
-                        </label>
-                        <input t:type=3D"checkbox" t:id=3D"noSamplingComplet=
eness" value=3D"contactFilter.noSamplingCompleteness" />
-                        <label t:for=3D"noSamplingCompleteness">
-                            <img src=3D"${asset:context:img/help-22px.png}" =
alt=3D"${message:wao.ui.misc.undefined}" />
-                        </label>
-                    </t:if>
-                    <div class=3D"fleft" style=3D"margin-top: 15px;">
-                        <input t:type=3D"checkbox" t:id=3D"sortedByBoardingD=
ate" value=3D"contactFilter.sortedByBoardingDate" />
-                        <label for=3D"sortedByBoardingDate">${message:wao.ui=
.form.sortByTideBegin}</label>
-                    </div>
-                    <div class=3D"t-beaneditor-row aright">
-                        <input t:type=3D"submit" class=3D"ico search-32px" t=
:id=3D"search" value=3D"${message:wao.ui.action.runSearch}" title=3D"${messag=
e:wao.ui.action.runSearch}" />&nbsp;
-                        <input t:type=3D"submit" class=3D"ico undo" t:id=3D"=
reset" value=3D"${message:wao.ui.action.resetFields}" title=3D"${message:wao.=
ui.action.resetFields}" />
-                    </div>
-                </div>
-            </form>
-        </div>
-    </fieldset>
-</div-->
+
 <!-- IMPORT/EXPORT -->
 <div t:type=3D"zone" class=3D"so-filters" t:id=3D"importExportZone" t:update=
=3D"show" t:visible=3D"false" id=3D"so-contacts-importexport">
     <fieldset>


--===============1780234699875825586==--