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 =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-business/src/main/filters/Wao.properties 2011-07-19 13:24:33 UTC (rev 1378) @@ -31,6 +31,7 @@ hibernate.connection.driver_class=org.h2.Driver ## Database location in user home hibernate.connection.url=jdbc:h2:file:~/.local/wao/h2data +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider ## 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 =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -53,8 +53,8 @@ </t:unless> <div id="so-session" class="clearfix"> <div class="fleft"> - <a t:type="pagelink" t:page="index" title="{$mesage:wao.ui.page.Index.title}"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="{$mesage:wao.ui.page.Index.title}" title="{$mesage:wao.ui.page.Index.title}"/> + <a t:type="pagelink" t:page="index" title="${message:wao.ui.page.Index.title}"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="${message:wao.ui.page.Index.title}" /> </a> </div> <t:if test="connectedUser.obsMer"> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- 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="user.obsMer"> <div class="acenter mtop30"> <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> - <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + <img src="${asset:context:img/MiniLogo.jpg}" style="height: 22px;" alt="Obsmer logo"/> </a> </div> </t:if> Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -55,8 +55,8 @@ <p><label t:for="email">${message:wao.ui.field.WaoUser.login}</label> : </p> <p> <input t:type="textfield" t:id="login" t:value="login" t:validate="required"/> - <img class="hidden" id="loginValid" src="${asset:context:img/valid-16px.png}" alt="${message:wao.ui.validLogin}" title="${message:wao.ui.validLogin}" /> - <img class="hidden" id="loginInvalid" src="${asset:context:img/invalid-16px.png}" alt="${message:wao.ui.invalidLogin}" title="${message:wao.ui.invalidLogin}" /> + <img src="${asset:context:img/valid-16px.png}" class="hidden" id="loginValid" alt="${message:wao.ui.validLogin}" title="${message:wao.ui.validLogin}" /> + <img src="${asset:context:img/invalid-16px.png}" class="hidden" id="loginInvalid" alt="${message:wao.ui.invalidLogin}" title="${message:wao.ui.invalidLogin}" /> </p> <p><label for="password">${message:wao.ui.field.WaoUser.password}</label> : </p> <p><input t:type="passwordfield" t:id="password" t:value="password" t:validate="required"/></p> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-07-18 14:15:21 UTC (rev 1377) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-07-19 13:24:33 UTC (rev 1378) @@ -62,155 +62,7 @@ t:visibleOnStartup="false" t:user="user" t:serviceContact="serviceContact"/> -<!-- FILTRES --> -<!--div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters"> - <fieldset> - <legend>${message:wao.ui.misc.advancedSearch}</legend> - <div class="so-filters-form"> - <form t:type="form" t:id="filtersForm" t:zone="so-contacts-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div> - <label for="fromDate">${message:wao.ui.misc.since} :</label> - <input t:type="datefield" class="width70" t:id="fromDate" value="contactFilter.fromDate" /> - <label for="state">${message:wao.ui.field.Contact.contactState} :</label> - <select t:type="select" - t:id="state" - value="contactFilter.state" - t:model="contactStateSelectModel" - t:zone="so-contacts-filters" /> - <t:if test="contactStateMotifSelectModel"> - <label for="stateMotif">${message:wao.ui.field.Contact.contactStateMotif} :</label> - <input t:type="select" - t:id="stateMotif" - t:value="contactStateMotifId" - t:model="contactStateMotifSelectModel" /> - </t:if> - <t:if t:test="user.admin"> - <label for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/> - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" - title="Rafraîchir les filtres en fonction de la société sélectionnée"/> - </t:if> - <label for="observer">${message:wao.ui.misc.observer} :</label> - <select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> - </div> - <p> </p> - <div> - <label>${message:wao.ui.entity.Boat} </label> - <label t:for="boatImmatriculation">${message:wao.ui.field.Boat.immatriculation} :</label> - <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="contactFilter.boatImmatriculation" /> - <label t:for="boatDistrictCode">${message:wao.ui.field.Boat.districtCode} :</label> - <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="contactFilter.boatDistrictCode" /> - <label t:for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" /> - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="${message:wao.ui.action.refresh}" /> - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="contactFilter.sectorName" /> - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="Rafraîchir les métiers en fonction de la zone sélectionnée"/> - <label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label> - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" t:mixins="ck/onEvent" t:event="change" /> - </div> - <p> </p> - <t:if test="user.obsVente"> - <div> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <input t:type="select" t:id="terrestrialDistrict" t:zone="so-contacts-filters" t:model="terrestrialDistrictSelectModel" t:value="terrestrialDistrictId" /> - <t:if test="terrestrialDistrictId"> - <label style="margin-left: 10px;">${message:wao.ui.field.Contact.terrestrialLocation} :</label> - <input t:type="select" t:model="terrestrialLocationSelectModel" t:value="terrestrialLocationId" /> - </t:if> - </div> - <p> </p> - </t:if> - <div> - <t:if test="user.obsMer"> - <label>${message:wao.ui.misc.observations} :</label> - <input t:type="checkbox" t:id="mammalsObservation" value="contactFilter.mammalsObservation" /> - <label for="mammalsObservation"> - <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> - </label> - <label>${message:wao.ui.field.Contact.mammalsCapture} :</label> - <input t:type="checkbox" t:id="mammalsCapture" value="contactFilter.mammalsCapture" /> - <label for="mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> - </label> - </t:if> - <label>${message:wao.ui.field.Contact.validationCompany} :</label> - <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> - <label for="companyAccepted"> - <img src="${asset:context:img/true-22px.png}" alt="${message:wao.ui.misc.accepted}" /> - </label> - <input t:type="checkbox" t:id="companyRefused" value="contactFilter.companyRefused" /> - <label t:for="companyRefused"> - <img src="${asset:context:img/false-22px.png}" alt="${message:wao.ui.misc.refused}" /> - </label> - <input t:type="checkbox" t:id="companyUndefined" value="contactFilter.companyUndefined" /> - <label t:for="companyUndefined"> - <img src="${asset:context:img/help-22px.png}" alt="${message:wao.ui.misc.undefined}" /> - </label> - <label>${message:wao.ui.field.Contact.validationProgram} :</label> - <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> - <label t:for="programAccepted"> - <img src="${asset:context:img/true-22px.png}" alt="${message:wao.ui.misc.accepted}" /> - </label> - <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> - <label t:for="programRefused"> - <img src="${asset:context:img/false-22px.png}" alt="${message:wao.ui.misc.refused}" /> - </label> - <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> - <label t:for="programUndefined"> - <img src="${asset:context:img/help-22px.png}" alt="${message:wao.ui.misc.undefined}" /> - </label> - <t:if test="user.obsMer"> - <t:unless t:test="user.observer"> - <label for="reliabilityFilter">${message:wao.ui.field.Contact.dataReliability} :</label> - <select t:type="select" t:id="reliabilityFilter" value="contactFilter.dataReliability"/> - </t:unless> - </t:if> - <span style="margin-left: 15px;">${message:wao.ui.misc.comments} :</span> - <input t:type="checkbox" t:id="commentFilter" value="contactFilter.comment" /> - <label for="commentFilter" style="margin-right: 5px;">${message:wao.ui.field.Contact.mainObserver}</label> - - <input t:type="checkbox" t:id="commentCompany" value="contactFilter.commentCompany" /> - <label for="commentCompany" style="margin-right: 5px;">${message:wao.ui.entity.Company}</label> - - <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" /> - <label for="commentAdmin" style="margin-right: 5px;">${message:wao.ui.form.program}</label> - </div> - <t:if t:test="user.obsVente"> - <label for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy}</label> - <input t:type="select" t:id="samplingStrategy" value="contactFilter.samplingStrategy" /> - <label for="actualSamplingStrategy">${message:wao.ui.field.Contact.samplingStrategy}</label> - <input t:type="select" t:id="actualSamplingStrategy" value="contactFilter.actualSamplingStrategy" /> - <label>${message:wao.ui.field.Contact.completeSampling}</label> - <input t:type="checkbox" t:id="completeSampling" value="contactFilter.completeSampling" /> - <label for="completeSampling"> - <img src="${asset:context:img/true-22px.png}" alt="${message:wao.ui.misc.yes}" /> - </label> - <input t:type="checkbox" t:id="incompleteSampling" value="contactFilter.incompleteSampling" /> - <label t:for="incompleteSampling"> - <img src="${asset:context:img/false-22px.png}" alt="${message:wao.ui.misc.no}" /> - </label> - <input t:type="checkbox" t:id="noSamplingCompleteness" value="contactFilter.noSamplingCompleteness" /> - <label t:for="noSamplingCompleteness"> - <img src="${asset:context:img/help-22px.png}" alt="${message:wao.ui.misc.undefined}" /> - </label> - </t:if> - <div class="fleft" style="margin-top: 15px;"> - <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> - <label for="sortedByBoardingDate">${message:wao.ui.form.sortByTideBegin}</label> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="${message:wao.ui.action.runSearch}" title="${message:wao.ui.action.runSearch}" /> - <input t:type="submit" class="ico undo" t:id="reset" value="${message:wao.ui.action.resetFields}" title="${message:wao.ui.action.resetFields}" /> - </div> - </div> - </form> - </div> - </fieldset> -</div--> + <!-- IMPORT/EXPORT --> <div t:type="zone" class="so-filters" t:id="importExportZone" t:update="show" t:visible="false" id="so-contacts-importexport"> <fieldset>