branch develop updated (2ee9318 -> 32dd88d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from 2ee9318 Update libs (security) new 6dff7c6 Fixes #10083 - Mise à jour Struts vers 2.3.35 new 561ff06 Fixes #10086 - Index - Supprimer le chapitre "Membres du groupe..." Fixes #10087 - Index - Supprimer lien vers documents et page associée new 5848fb0 Fixes #10084 : Manuel des protocoles Medits, Version 9, 2017 - nouvelle cible du lien new 32dd88d fixes #1 fixes #2 fixes #3 fixes #5 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32dd88d55bc2c5db9cd54c6a8d54b7ff5de6babb Author: jcouteau <couteau@codelutin.com> Date: Fri Dec 21 12:06:39 2018 +0100 fixes #1 fixes #2 fixes #3 fixes #5 commit 5848fb0001554b08f61b957a4071fd131e3cad93 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 17:39:51 2018 +0200 Fixes #10084 : Manuel des protocoles Medits, Version 9, 2017 - nouvelle cible du lien commit 561ff06f125767649acb79691b041a5e8531d14c Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 16:53:39 2018 +0200 Fixes #10086 - Index - Supprimer le chapitre "Membres du groupe..." Fixes #10087 - Index - Supprimer lien vers documents et page associée commit 6dff7c6fef123f75709d291b87a32a40f1e9339a Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 16:50:34 2018 +0200 Fixes #10083 - Mise à jour Struts vers 2.3.35 Summary of changes: .../ifremer/coser/web/actions/DocumentsAction.java | 35 ---------- .../main/resources/i18n/coser-web_en_GB.properties | 5 ++ .../main/resources/i18n/coser-web_fr_FR.properties | 7 +- .../src/main/webapp/WEB-INF/content/documents.jsp | 77 --------------------- .../main/webapp/WEB-INF/content/index-success.jsp | 8 +-- .../src/main/webapp/WEB-INF/content/pop/facade.jsp | 2 +- .../src/main/webapp/WEB-INF/content/survey.jsp | 5 ++ .../Medits_Handbook_2017_version_9_5-60417r.pdf | Bin 0 -> 3775720 bytes ...stPopInd_PresentationIndic_FR_Revu_15022018.pdf | Bin 0 -> 160508 bytes pom.xml | 2 +- 10 files changed, 22 insertions(+), 119 deletions(-) delete mode 100644 coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java delete mode 100644 coser-web/src/main/webapp/WEB-INF/content/documents.jsp create mode 100644 coser-web/src/main/webapp/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf create mode 100644 coser-web/src/main/webapp/pdf/Web_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 6dff7c6fef123f75709d291b87a32a40f1e9339a Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 16:50:34 2018 +0200 Fixes #10083 - Mise à jour Struts vers 2.3.35 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ef1de8..cafd642 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ <jaxxVersion>2.8.6</jaxxVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion> - <strutsVersion>2.3.34</strutsVersion> + <strutsVersion>2.3.35</strutsVersion> <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> <!-- Site configuration --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 561ff06f125767649acb79691b041a5e8531d14c Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 16:53:39 2018 +0200 Fixes #10086 - Index - Supprimer le chapitre "Membres du groupe..." Fixes #10087 - Index - Supprimer lien vers documents et page associée --- .../ifremer/coser/web/actions/DocumentsAction.java | 35 ---------- .../src/main/webapp/WEB-INF/content/documents.jsp | 77 ---------------------- .../main/webapp/WEB-INF/content/index-success.jsp | 8 +-- 3 files changed, 4 insertions(+), 116 deletions(-) diff --git a/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java b/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java deleted file mode 100644 index 9d86d44..0000000 --- a/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * #%L - * Coser :: Web - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -package fr.ifremer.coser.web.actions; - -import fr.ifremer.coser.web.actions.common.AbstractCoserJspAction; - -/** - * Documents action. - * - * @author chatellier - */ -public class DocumentsAction extends AbstractCoserJspAction { - - private static final long serialVersionUID = 1663244944108703571L; - -} diff --git a/coser-web/src/main/webapp/WEB-INF/content/documents.jsp b/coser-web/src/main/webapp/WEB-INF/content/documents.jsp deleted file mode 100644 index ec535b0..0000000 --- a/coser-web/src/main/webapp/WEB-INF/content/documents.jsp +++ /dev/null @@ -1,77 +0,0 @@ -<!-- - #%L - Coser :: Web - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@taglib uri="/struts-tags" prefix="s" %> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title><s:text name="message.documents.title" /></title> - </head> - <body> - - <h2><s:text name="message.documents.title" /></h2> - - <h3><s:text name="message.documents.gentitle1" /></h3> - - <p> - <s:text name="message.documents.genparagraph1"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph2"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6160/">http://archimer.ifremer.fr/doc/00000/6160/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph3"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/7293/">http://archimer.ifremer.fr/doc/00000/7293/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph4"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/2327/">http://archimer.ifremer.fr/doc/00000/2327/</a></s:param> - </s:text> - </p> - - <h3><s:text name="message.documents.activitytitle2" /></h3> - <p><s:text name="message.documents.activityparagraph1" /></p> - <p><s:text name="message.documents.activityparagraph2" /></p> - <p><s:text name="message.documents.activityparagraph3" /></p> - <p><s:text name="message.documents.activityparagraph4" /></p> - <p><s:text name="message.documents.activityparagraph5" /></p> - <p><s:text name="message.documents.activityparagraph6" /></p> - <p> - <s:text name="message.documents.activityparagraph7"> - <s:param><a href="http://dx.doi.org/10.1111/j.1365-2664.2010.01841.x">http://dx.doi.org/10.1111/j.1365-2664.2010.01841.x</a></s:param> - <s:param><a href="http://archimer.ifremer.fr/doc/00008/11925/">http://archimer.ifremer.fr/doc/00008/11925/</a></s:param> - </s:text> - </p> - <p><s:text name="message.documents.activityparagraph8" /></p> - - <h3><s:text name="message.documents.indicatortitle3" /></h3> - <p><s:text name="message.documents.indicatorparagraph1" /></p> - - </body> -</html> diff --git a/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp b/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp index f67203e..bfd3d53 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp @@ -64,20 +64,20 @@ <s:text name="message.index.thanksparagraph1" /> </p> - <p> + <!--p> <h2><s:text name="message.index.partnertitle" /></h2> <s:text name="message.index.partnerparagraph1" /> - </p> + </p--> <p> <span style="font-weight:bold"><s:text name="message.index.qualitytitle"/> :</span> <s:a action="quality"><s:text name="message.index.qualitymessage" /></s:a> </p> - <p> + <!--p> <span style="font-weight:bold"><s:text name="message.index.documentstitle"/> :</span> <s:a action="documents"><s:text name="message.index.documentsmessage" /></s:a> - </p> + </p--> <p class="annotations"> <span style="font-weight:bold"><s:text name="message.index.quotetitle"/> :</span> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 5848fb0001554b08f61b957a4071fd131e3cad93 Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 17:39:51 2018 +0200 Fixes #10084 : Manuel des protocoles Medits, Version 9, 2017 - nouvelle cible du lien --- coser-web/src/main/resources/i18n/coser-web_en_GB.properties | 2 ++ coser-web/src/main/resources/i18n/coser-web_fr_FR.properties | 4 ++-- coser-web/src/main/webapp/WEB-INF/content/survey.jsp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coser-web/src/main/resources/i18n/coser-web_en_GB.properties b/coser-web/src/main/resources/i18n/coser-web_en_GB.properties index e23b613..986a31e 100644 --- a/coser-web/src/main/resources/i18n/coser-web_en_GB.properties +++ b/coser-web/src/main/resources/i18n/coser-web_en_GB.properties @@ -180,6 +180,7 @@ message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Versi message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) +message.survey.mediterranee.estcorse.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.estcorse.plus=For more information on the Medits surveys message.survey.mediterranee.golfelion=Gulf of Lions message.survey.mediterranee.golfelion.desc=French contribution to the internationally coordinated Medits (International bottom Trawl Surveys in the Mediterranean) survey, lasting one month in the second quarter every year since 1994 using a GOV bottom trawl with short wings. On average 69 hauls are carried out; haul duration is half an hour above 200 m depth which corresponds to 0.05 km² and one hour for bottom depths greater than 200 m (0.1 km²). Medits provides a representative picture [...] @@ -189,6 +190,7 @@ message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Vers message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) +message.survey.mediterranee.golfelion.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.golfelion.plus=For more information on the Medits surveys message.survey.merdunord=North Sea message.survey.merdunord.sudmerdunord=Southern North Sea diff --git a/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties b/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties index b3c8a0d..83e5b5b 100644 --- a/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties +++ b/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties @@ -179,7 +179,7 @@ message.survey.mediterranee.estcorse.medits2=Manuel des protocoles Medits, Versi message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) -message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) +message.survey.mediterranee.estcorse.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.golfelion=Golfe du Lion message.survey.mediterranee.golfelion.desc=Contribution française aux campagnes internationales Medits (International bottom Trawl Surveys in the Mediterranean), d'un mois au deuxième trimestre tous les ans depuis 1994 au chalut de fond à grande ouverture verticale à ailes courtes. En moyenne 69 chalutages sont réalisés, d'une demi-heure couvrant une surface d'environ 0,05 km² chacun pour les profondeurs inférieures à 200 mètres et d'une heure (surface d'environ 0,1 km²) pour les profond [...] @@ -188,7 +188,7 @@ message.survey.mediterranee.golfelion.medits2=Manuel des protocoles Medits, Vers message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) -message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) +message.survey.mediterranee.golfelion.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits message.survey.merdunord=Façade Mer du Nord message.survey.merdunord.sudmerdunord=Sud mer du Nord diff --git a/coser-web/src/main/webapp/WEB-INF/content/survey.jsp b/coser-web/src/main/webapp/WEB-INF/content/survey.jsp index 7c2ba44..b3d7d2f 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/survey.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/survey.jsp @@ -240,7 +240,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits5" /></a></li> - <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits6" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits9" /></a></li> </ul> </p> @@ -257,7 +257,7 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits5" /></a></li> - <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits6" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits9" /></a></li> </ul> </p> </body> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 32dd88d55bc2c5db9cd54c6a8d54b7ff5de6babb Author: jcouteau <couteau@codelutin.com> Date: Fri Dec 21 12:06:39 2018 +0100 fixes #1 fixes #2 fixes #3 fixes #5 --- .../main/resources/i18n/coser-web_en_GB.properties | 3 +++ .../main/resources/i18n/coser-web_fr_FR.properties | 7 ++++++- .../src/main/webapp/WEB-INF/content/pop/facade.jsp | 2 +- coser-web/src/main/webapp/WEB-INF/content/survey.jsp | 9 +++++++-- .../pdf/Medits_Handbook_2017_version_9_5-60417r.pdf | Bin 0 -> 3775720 bytes ...b_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf | Bin 0 -> 160508 bytes pom.xml | 2 +- 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/coser-web/src/main/resources/i18n/coser-web_en_GB.properties b/coser-web/src/main/resources/i18n/coser-web_en_GB.properties index 986a31e..9ffd247 100644 --- a/coser-web/src/main/resources/i18n/coser-web_en_GB.properties +++ b/coser-web/src/main/resources/i18n/coser-web_en_GB.properties @@ -146,6 +146,7 @@ message.survey.atlantique.gascogne.pelgas1=Manuel des protocoles PELGAS - Versio message.survey.atlantique.vilaine=Vilaine river bay message.survey.atlantique.vilaine.desc=Survey in the nursery area of the Vilaine river bay (NourVil) lasted one week every year in autumn from 1980 à 2010, except 1991, 1994, 1995, 1998, 1999, 2006 and 2007. It used a 3m-beam trawl. On average 30 15-min hauls were carried out covering each about 0.0041 km². This survey provides a representative picture of the 330 km² of the Vilaine bay. message.survey.atlantique.vilaine.nourvil1=Manuel des protocoles Nourriceries Gascogne - V 1.0 (2002) +message.survey.atlantique.vilaine.nourvil2=Manuel des protocoles des campagnes « Nourriceries » message.survey.atlantique.vilaine.plus=For more information on the Nourvil survey message.survey.dataengincasier=Pots for the assessment of large crustaceans, in particular lobster, around Cap de Flamanville. message.survey.dataenginfond=Variants of a GOV (grande ouverture verticale) trawl for observing demersal species on the continental shelfs and upper slopes in the North Sea, Eastern English channel, Celtic Sea, Bay of Biscay, Gulf of Lions and East Corsica, @@ -162,10 +163,12 @@ message.survey.mancheorientale=Eastern English Channel message.survey.mancheorientale.baiedeseine=Seine river bay message.survey.mancheorientale.baiedeseine.desc=Yearly surveys carried on in the Seine estuary and the eastern bay of Seine (NourSeine), principally in autumn from 1995 to 2002. The main objective was to identify the coastal fish nurseries and to assess the fish and macro-benthos richness. About 45 hauls are done during each survey, using a standard beam trawl. message.survey.mancheorientale.baiedeseine.nourseine1=Manuel des protocoles de campagne halieutique. Campagnes Nourriceries en Estuaire de Seine (NourSei). V 1.0 (2004) +message.survey.mancheorientale.baiedeseine.nourseine2=Manuel des protocoles des campagnes « Nourriceries » message.survey.mancheorientale.baiedeseine.plus=For more information on the NourSeine survey message.survey.mancheorientale.baiedesomme=Somme river bay message.survey.mancheorientale.baiedesomme.desc=The survey in the nursery area of the Somme rive bay (NourSomme) lasts one week in September-October each year since 1995, using a 2m-beam trawl in the estuary and a 3m-beam trawl in the more open areas. On average 50 hauls are carried out. Haul duration is 7 minutes covering 0.001 km² in the estuary part and 15 minutes covering 0.004 km² in the more open part. This survey provides a representative picture of the 720 km² of the Somme baie. message.survey.mancheorientale.baiedesomme.noursomme1=Manuel des protocoles Nourriceries Somme - V 1.0 (2002) +message.survey.mancheorientale.baiedesomme.noursomme2=Manuel des protocoles des campagnes « Nourriceries » message.survey.mancheorientale.baiedesomme.plus=For more information on the NourSomme survey message.survey.mancheorientale.mancheorientale=Eastern English Channel message.survey.mancheorientale.mancheorientale.cgfs1=Manuel des protocoles CGFS - Version 1.0 (2002) diff --git a/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties b/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties index 83e5b5b..7ad1f9d 100644 --- a/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties +++ b/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties @@ -146,6 +146,7 @@ message.survey.atlantique.gascogne.pelgas1=Manuel des protocoles PELGAS - Versio message.survey.atlantique.vilaine=Baie de Vilaine message.survey.atlantique.vilaine.desc=Campagne sur la nourricerie de la baie de Vilaine (NourVil), d'une semaine à l'automne, tous les ans de 1980 à 2010, sauf en 1991, 1994, 1995, 1998, 1999, 2006 et 2007, au chalut à perche de 3 mètres de large. En moyenne, 30 chalutages de 15 minutes sont réalisés. Chaque trait couvre une surface d'environ 0,0041 km². Cette campagne est représentative des 330 km² de la baie. message.survey.atlantique.vilaine.nourvil1=Manuel des protocoles Nourriceries Gascogne - V 1.0 (2002) +message.survey.atlantique.vilaine.nourvil2=Manuel des protocoles des campagnes « Nourriceries » message.survey.atlantique.vilaine.plus=Pour en savoir plus sur les campagnes Nourvil message.survey.dataengincasier=Un échantillonnage au casier pour les campagnes d'évaluation des grands crustacés, en particulier le homard, aux abords du cap de Flamanville. message.survey.dataenginfond=Un chalut de fond à grande ouverture verticale pour l'observation des ressources démersales, sur les plateaux continentaux et le haut des pentes continentales (accores) en mer du Nord, Manche orientale, mer Celtique, golfe de Gascogne, golfe du Lion et Est de la Corse, @@ -162,10 +163,12 @@ message.survey.mancheorientale=Façade Manche orientale message.survey.mancheorientale.baiedeseine=Baie de Seine message.survey.mancheorientale.baiedeseine.desc=Campagnes annuelles de prospection sur les nourriceries de l'estuaire de Seine et de la baie de Seine orientale (NourSeine) effectuées essentiellement à l'automne, de 1995 à 2002. L'objectif premier était d'identifier les nourriceries côtières de ce site et d'en évaluer la richesse halieutique et macro-épibenthique. Environ 45 traits effectués à chaque campagne, à l'aide d'un chalut à perche standard. message.survey.mancheorientale.baiedeseine.nourseine1=Manuel des protocoles de campagne halieutique. Campagnes Nourriceries en Estuaire de Seine (NourSei). V 1.0 (2004) +message.survey.mancheorientale.baiedeseine.nourseine2=Manuel des protocoles des campagnes « Nourriceries » message.survey.mancheorientale.baiedeseine.plus=Pour en savoir plus sur les campagnes NourSeine message.survey.mancheorientale.baiedesomme=Baie de Somme message.survey.mancheorientale.baiedesomme.desc=Campagne de pêche sur la nourricerie de la baie de Somme (NourSomme) d'une semaine en septembre-octobre, tous les ans depuis 1995, aux chaluts à perche de 2 mètres de large dans la partie la plus estuarienne de la baie et 3 mètres dans la partie externe, plus marine. En moyenne 50 chalutages sont réalisés chaque année. Ils durent en moyenne 7 minutes sur une surface de 0,001 km² chacun dans la partie interne de la baie et 15 minutes sur une [...] message.survey.mancheorientale.baiedesomme.noursomme1=Manuel des protocoles Nourriceries Somme - V 1.0 (2002) +message.survey.mancheorientale.baiedesomme.noursomme2=Manuel des protocoles des campagnes « Nourriceries » message.survey.mancheorientale.baiedesomme.plus=Pour en savoir plus sur les campagnes NourSomme message.survey.mancheorientale.mancheorientale=Manche orientale message.survey.mancheorientale.mancheorientale.cgfs1=Manuel des protocoles CGFS - Version 1.0 (2002) @@ -179,6 +182,7 @@ message.survey.mediterranee.estcorse.medits2=Manuel des protocoles Medits, Versi message.survey.mediterranee.estcorse.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.estcorse.medits4=Manuel des protocoles Medits, Version 4 (2001) message.survey.mediterranee.estcorse.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.estcorse.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.estcorse.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.estcorse.plus=Pour en savoir plus sur les campagnes Medits message.survey.mediterranee.golfelion=Golfe du Lion @@ -187,7 +191,8 @@ message.survey.mediterranee.golfelion.medits1=Manuel des protocoles Medits, Vers message.survey.mediterranee.golfelion.medits2=Manuel des protocoles Medits, Version 2 (1995) message.survey.mediterranee.golfelion.medits3=Manuel des protocoles Medits, Version 3 (1999) message.survey.mediterranee.golfelion.medits4=Manuel des protocoles Medits, Version 4 (2001) -message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits5=Manuel des protocoles Medits, Version 5 (2007) +message.survey.mediterranee.golfelion.medits6=Manuel des protocoles Medits, Version 6 (2012) message.survey.mediterranee.golfelion.medits9=Manuel des protocoles Medits, Version 9 (2017) message.survey.mediterranee.golfelion.plus=Pour en savoir plus sur les campagnes Medits message.survey.merdunord=Façade Mer du Nord diff --git a/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp b/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp index 1320921..e6a4964 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/pop/facade.jsp @@ -51,7 +51,7 @@ <p> <a href="<s:if test='locale.language == "fr"'> - <s:url value='/pdf/Web_EstPopInd_PresentationIndic_FR.pdf' /> + <s:url value='/pdf/Web_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf' /> </s:if><s:else> <s:url value='/pdf/Web_EstPopInd_PresentationIndic_EN.pdf' /> </s:else>"> diff --git a/coser-web/src/main/webapp/WEB-INF/content/survey.jsp b/coser-web/src/main/webapp/WEB-INF/content/survey.jsp index b3d7d2f..88b74de 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/survey.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/survey.jsp @@ -146,6 +146,7 @@ <s:text name="message.survey.mancheorientale.baiedesomme.plus" /> <ul> <li><a href="http://archimer.ifremer.fr/doc/00036/14710/" target="_blank"><s:text name="message.survey.mancheorientale.baiedesomme.noursomme1" /></a></li> + <li><a href="https://archimer.ifremer.fr/doc/00435/54610/" target="_blank"><s:text name="message.survey.mancheorientale.baiedesomme.noursomme2" /></a></li> </ul> </p> @@ -158,6 +159,7 @@ <s:text name="message.survey.mancheorientale.baiedeseine.plus" /> <ul> <li><a href="http://archimer.ifremer.fr/doc/00036/14714/" target="_blank"><s:text name="message.survey.mancheorientale.baiedeseine.nourseine1" /></a></li> + <li><a href="https://archimer.ifremer.fr/doc/00435/54610/" target="_blank"><s:text name="message.survey.mancheorientale.baiedeseine.nourseine2" /></a></li> </ul> </p> @@ -221,6 +223,7 @@ <s:text name="message.survey.atlantique.vilaine.plus" /> <ul> <li><a href="http://archimer.ifremer.fr/doc/00036/14713/" target="_blank"><s:text name="message.survey.atlantique.vilaine.nourvil1" /></a></li> + <li><a href="https://archimer.ifremer.fr/doc/00435/54610/" target="_blank"><s:text name="message.survey.atlantique.vilaine.nourvil2" /></a></li> </ul> </p> @@ -240,7 +243,8 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits5" /></a></li> - <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits9" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits6" /></a></li> + <li><a href="<s:url value='/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf' />" target="_blank"><s:text name="message.survey.mediterranee.golfelion.medits9" /></a></li> </ul> </p> @@ -257,7 +261,8 @@ <li><a href="http://www.sibm.it/SITO%20MEDITS/file.doc/MEDITS-Manual_V3-1999.pdf" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits3" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00036/14712/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits4" /></a></li> <li><a href="http://archimer.ifremer.fr/doc/00002/11321/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits5" /></a></li> - <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits9" /></a></li> + <li><a href="http://archimer.ifremer.fr/doc/00117/22783/" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits6" /></a></li> + <li><a href="<s:url value='/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf' />" target="_blank"><s:text name="message.survey.mediterranee.estcorse.medits9" /></a></li> </ul> </p> </body> diff --git a/coser-web/src/main/webapp/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf b/coser-web/src/main/webapp/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf new file mode 100644 index 0000000..fd77ebf Binary files /dev/null and b/coser-web/src/main/webapp/pdf/Medits_Handbook_2017_version_9_5-60417r.pdf differ diff --git a/coser-web/src/main/webapp/pdf/Web_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf b/coser-web/src/main/webapp/pdf/Web_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf new file mode 100644 index 0000000..e975bcf Binary files /dev/null and b/coser-web/src/main/webapp/pdf/Web_EstPopInd_PresentationIndic_FR_Revu_15022018.pdf differ diff --git a/pom.xml b/pom.xml index cafd642..2d8058f 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ <jaxxVersion>2.8.6</jaxxVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion> - <strutsVersion>2.3.35</strutsVersion> + <strutsVersion>2.3.36</strutsVersion> <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> <!-- Site configuration --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm