This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 1e64613064f1fc898e27d3086c690a2076515c18 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 13 20:41:48 2015 +0100 Passage sur codelutinpom-5 --- pom.xml | 10 +++------- src/site/site_en.xml | 22 +++++++++++----------- src/site/site_fr.xml | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 16f6e19..35d39c9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>3</version> + <version>5-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -162,8 +162,8 @@ <echobaseI18nBundle>echobase-i18n</echobaseI18nBundle> <!--Site configuration --> - <!--<locales>fr,en</locales>--> - <locales>fr</locales> + <locales>fr,en</locales> + <siteSourcesType>rst</siteSourcesType> <!-- name of embedded war file basename --> <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> @@ -172,10 +172,6 @@ <lizmapVersion>2.9.4</lizmapVersion> <qgisMapServerVersion>2.8.4</qgisMapServerVersion> - <scmwebeditorenabled>true</scmwebeditorenabled> - <scmwebeditorUrl>http://demo.codelutin.com/scmwebeditor-staging/edit.action</scmwebeditorUrl> - <siteSourcesType>rst</siteSourcesType> - </properties> <dependencyManagement> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 8074879..e10d0e0 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -54,7 +54,9 @@ <body> <head> - <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"></script> + <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"> + + </script> <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> </head> @@ -110,16 +112,14 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' - projectversion='${project.version}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - scmwebeditor_skipDefaultFiles="true" - scmwebeditor_vmFiles=",install,update,usage,configure," - locale='en'> - </div> + <div id='projectMetas' locale='en' + platform='${project.platform}' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmUrl='${project.scm.connection}' + editorUrl='${project.scmwebeditorUrl}' + scmwebeditor_vmFiles=",install,update,usage,configure,"/> </footer> </body> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 183afc5..2842d88 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -55,7 +55,9 @@ <body> <head> - <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"></script> + <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"> + + </script> <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> </head> @@ -112,16 +114,14 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' - projectversion='${project.version}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - scmwebeditor_skipDefaultFiles="true" - scmwebeditor_vmFiles=",install,update,usage,configure," - locale='fr'> - </div> + <div id='projectMetas' locale='fr' + platform='${project.platform}' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmUrl='${project.scm.connection}' + editorUrl='${project.scmwebeditorUrl}' + scmwebeditor_vmFiles=",install,update,usage,configure,"/> </footer> </body> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.