This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit eae22a333e0f243c96c520deb640a3c73a9c6497 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 19 09:04:01 2014 +0200 review site --- src/site/site_en.xml | 67 ++++++++++----------------------------------------- src/site/site_fr.xml | 68 ++++++++++------------------------------------------ 2 files changed, 26 insertions(+), 109 deletions(-) diff --git a/src/site/site_en.xml b/src/site/site_en.xml index df8bd51..5930057 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -35,64 +35,37 @@ <href>http://www.codelutin.com</href> </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="MM/dd/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/common/0.2/images/logos/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> - </head> - <breadcrumbs> - <item name="${project.name}" href="./index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="chorem.org" href="http://www.chorem.org"/> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> @@ -109,7 +82,9 @@ <menu name="Public instances"> <item name="Official instance (Use last stable version of Pollen, No data loss)" href="http://pollen.chorem.org/"/> - <item name="Test instance (Use last dev version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen"/> + <item name="Test instance (latest) (Use last dev version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-latest"/> + <item name="Test instance (staging) (Use next release version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-staging"/> + <item name="Test instance (stable) (Use last stable release version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-stable"/> </menu> <menu name="Language"> @@ -124,22 +99,6 @@ <menu ref="reports"/> - <footer> - <div id='projectMetas' locale='en' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",install.html," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 8ebbc51..3b23714 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -35,64 +35,37 @@ <href>http://www.codelutin.com</href> </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> - </head> - <breadcrumbs> - <item name="${project.name}" href="./index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="chorem.org" href="http://www.chorem.org"/> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> @@ -109,7 +82,9 @@ <menu name="Instances publiques"> <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="http://pollen.chorem.org/"/> - <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/> + <item name="Instance de tests (latest) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-latest"/> + <item name="Instance de tests (staging) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-staging"/> + <item name="Instance de tests (stable) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-stable"/> </menu> <menu name="Langue"> @@ -119,23 +94,6 @@ <menu ref="reports"/> - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",install.html," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.