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 ad9a93929f5bc58c5654d115cc7b77430a4e7f5a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 19 13:20:32 2014 +0200 fixes #1127: Fix project url and site urls --- pom.xml | 2 +- src/site/site_en.xml | 12 ++++++------ src/site/site_fr.xml | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 5d26f69..9418435 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ <name>Pollen</name> <description>Application de vote Pollen</description> - <url>http://doc.chorem.org/pollen</url> + <url>https://pollen.chorem.org</url> <inceptionYear>2009</inceptionYear> <licenses> <license> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 3d6361b..6d58c21 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -25,7 +25,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">${project.url}/logo.jpg</src> + <src alt="Pollen">${project.url}/v/${siteDeployClassifier}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -59,8 +59,8 @@ <body> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${project.url}/s/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <links> @@ -81,9 +81,9 @@ </menu> <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 (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="Official instance (Use last stable version of Pollen, No data loss)" href="https://pollen.chorem.org/"/> + <item name="Test instance (staging) (Use next release version of Pollen)" href="https://demo.codelutin.com/pollen-staging"/> + <item name="Test instance (latest) (Use last dev version of Pollen)" href="https://demo.codelutin.com/pollen-latest"/> </menu> <menu name="Language"> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index fe1ca4b..0835f43 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -25,7 +25,7 @@ <project name="${project.name}"> <bannerLeft> - <src alt="Pollen">${project.url}/logo.jpg</src> + <src alt="Pollen">${project.url}/v/${siteDeployClassifier}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> @@ -60,7 +60,7 @@ <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/fr/index.html"/> </breadcrumbs> <links> @@ -82,8 +82,8 @@ <menu name="Instances publiques"> <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="https://pollen.chorem.org/"/> - <item name="Instance de tests (latest) (utilise la dernière version de dev, pour tests uniquement)" href="https://demo.codelutin.com/pollen-latest"/> - <item name="Instance de tests (staging) (utilise la dernière version stable avant diffusion publique, pour tests uniquement)" href="https://demo.codelutin.com/pollen-staging"/> + <item name="Instance de tests (staging) (utilise la dernière version stable avant diffusion publique)" href="https://demo.codelutin.com/pollen-staging"/> + <item name="Instance de tests (latest) (utilise la dernière version de dev)" href="https://demo.codelutin.com/pollen-latest"/> </menu> <menu name="Langue"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.