Author: bleny Date: 2014-06-17 17:18:33 +0200 (Tue, 17 Jun 2014) New Revision: 2054 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2054 Log: fixes #5254 add tooltip Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-17 15:18:33 UTC (rev 2054) @@ -167,6 +167,13 @@ return invocation.invoke(); + } catch (java.lang.OutOfMemoryError e) { + + if (log.isErrorEnabled()) { + log.error("", e); + } + throw e; + } finally { serviceContext.getPersistenceContext().close(); Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 15:18:33 UTC (rev 2054) @@ -345,6 +345,7 @@ wao.ui.form.estimatedTides=View estimated effort wao.ui.form.estimatedTides.description=The estimated observation effort is the number of contact that are validated by the company or not. Contacts refused by program are ignored. wao.ui.form.filterOnObservationBeginDate=Filter contacts on the observation begin date +wao.ui.form.filterOnObservationBeginDate.tooltip=By default, the application filter on the date of the contact creation. By checking this box, the filter will apply on observation begin date. Thus, only contacts with an observation begin date will be considered. wao.ui.form.generatePassword=Generate password wao.ui.form.mapType=Map wao.ui.form.otherBoatInfos=Other boat infos Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 15:18:33 UTC (rev 2054) @@ -345,6 +345,7 @@ wao.ui.form.estimatedTides=Voir l'effort d'observations estimé wao.ui.form.estimatedTides.description=L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte. wao.ui.form.filterOnObservationBeginDate=Filtrer selon la date de début d'observation +wao.ui.form.filterOnObservationBeginDate.tooltip=Par défaut, l'application filtre selon les dates de création des contacts en cochant cette option l'application va filtrer sur la date de début d'observation, de fait seuls les contacts dans l'état Observation réalisée sont pris en compte. wao.ui.form.generatePassword=Générer le mot de passe wao.ui.form.mapType=Carte wao.ui.form.otherBoatInfos=Autres informations sur le navire Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 15:18:33 UTC (rev 2054) @@ -179,8 +179,10 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + </div> </fieldset> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 15:18:33 UTC (rev 2054) @@ -118,8 +118,10 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + </div> </fieldset>