r769 - in trunk: . mavenpom4labs/src/site mavenpom4redmine/src/site src/site
Author: tchemit Date: 2010-01-17 14:02:16 +0100 (Sun, 17 Jan 2010) New Revision: 769 Modified: trunk/mavenpom4labs/src/site/site_en.xml trunk/mavenpom4labs/src/site/site_fr.xml trunk/mavenpom4redmine/src/site/site_en.xml trunk/mavenpom4redmine/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: Anomalie #215: les urls du breadcrumbs ne sont pas bonnes Anomalie #222: Ne pas utilisers les menus parent et modules pour le site anglais Modified: trunk/mavenpom4labs/src/site/site_en.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4labs/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -12,21 +12,30 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> - <menu ref="parent"/> - + + <!-- TC-20100117 : ne fonctionne pas sur une langue non principale --> + <!--<menu ref="parent"/>--> + <menu name="Parent Projet"> + <item name="Mavenpom" href="../../en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom4labs"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> <item name="Profiles" href="profiles.html"/> </menu> + <menu name="Dev"> <item name="Make a release" href="release.html"/> <item name="Todo" href="Todo.html"/> </menu> <menu name="Links"> - <item name="mavenpom4labs (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-license-plugin" href="http://maven-site.nuiton.org/maven-license-plugin"/> Modified: trunk/mavenpom4labs/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -13,7 +13,11 @@ </breadcrumbs> <menu ref="parent"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom4labs"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -26,7 +30,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom4labs (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-license-plugin" href="http://maven-site.nuiton.org/maven-license-plugin"/> Modified: trunk/mavenpom4redmine/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -9,11 +9,19 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/> </breadcrumbs> - <menu ref="parent"/> - + <!-- TC-20100117 : ne fonctionne pas sur une langue non principale --> + <!--<menu ref="parent"/>--> + <menu name="Parent Projet"> + <item name="Mavenpom" href="../../en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom4redmine"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> @@ -26,7 +34,6 @@ </menu> <menu name="Links"> - <item name="mavenpom4redmine (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/mavenpom4redmine/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -9,11 +9,15 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/> </breadcrumbs> <menu ref="parent"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom4redmine"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -26,7 +30,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom4redmine (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/pom.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -1515,10 +1515,6 @@ <!-- extra files to include in release --> <redmine.releaseFiles /> - <!-- always force user to add -DdryRun to perform redmine actions --> - <dryRun>true</dryRun> - <redmine.dryRun>${dryRun}</redmine.dryRun> - </properties> <build> @@ -1536,6 +1532,24 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.1</version> + <!--configuration> + <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> + <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> + <generateReports>${maven.reports.generate}</generateReports> + <locales>${maven.site.locales}</locales> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${skin.version}</version> + </dependency> + </dependencies--> + </plugin> + </plugins> </pluginManagement> @@ -1672,6 +1686,12 @@ </property> </activation> + <properties> + <!-- always force user to add -DdryRun to perform redmine actions --> + <dryRun>true</dryRun> + <redmine.dryRun>${dryRun}</redmine.dryRun> + </properties> + <build> <defaultGoal>generate-sources</defaultGoal> @@ -1725,6 +1745,12 @@ </property> </activation> + <properties> + <!-- always force user to add -DdryRun to perform redmine actions --> + <dryRun>true</dryRun> + <redmine.dryRun>${dryRun}</redmine.dryRun> + </properties> + <build> <defaultGoal>generate-sources</defaultGoal> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/src/site/site_en.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -28,17 +28,26 @@ <item name="maven nuiton repository" href="${repository.home.url}"/> </links> - <breadcrumbs> + <!--breadcrumbs> <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/index.html"/> - </breadcrumbs> + </breadcrumbs--> - <menu ref="modules"/> - + <!-- TC-20100117 : ne fonctionne pas sur une langue non principale --> + <!--<menu ref="modules"/>--> + <menu name="Modules"> + <item name="Mavenpom4redmine" href="../mavenpom4redmine/en/index.html"/> + <item name="Mavenpom4labs" href="../mavenpom4labs/en/index.html"/> + </menu> + + <menu name="Language"> + <item name="Version française" href="/../index.html"/> + </menu> + <menu name="Inside mavenpom"> <item name="Home" href="/index.html"/> <item name="Properties" href="properties.html"/> <item name="Profiles" href="profiles.html"/> - <item name="Plugins" href="plugins-detail.html"/> + <item name="Plugins" href="plugins-detail.html"/> </menu> <menu name="Dev"> @@ -48,7 +57,6 @@ </menu> <menu name="Links"> - <item name="mavenpom (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-16 18:38:18 UTC (rev 768) +++ trunk/src/site/site_fr.xml 2010-01-17 13:02:16 UTC (rev 769) @@ -28,12 +28,16 @@ <item name="dépôt maven" href="${repository.home.url}"/> </links> - <breadcrumbs> + <!--breadcrumbs> <item name="${project.name}" href="http://maven-site.nuiton.org/mavenpom/index.html"/> - </breadcrumbs> + </breadcrumbs--> <menu ref="modules"/> - + + <menu name="Langue"> + <item name="English version" href="/en/index.html"/> + </menu> + <menu name="Inside mavenpom"> <item name="Accueil" href="index.html"/> <item name="Propriétés" href="properties.html"/> @@ -48,7 +52,6 @@ </menu> <menu name="Liens"> - <item name="mavenpom (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/>
participants (1)
-
tchemit＠users.nuiton.org