Author: tchemit Date: 2012-09-04 14:43:19 +0200 (Tue, 04 Sep 2012) New Revision: 2410 Url: http://nuiton.org/repositories/revision/nuiton-utils/2410 Log: fixes #2298: updates to nuiton-i18n 2.5 improve site (use fluido 1.3.0 + clean site descriptors) Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-csv/src/site/site_fr.xml trunk/nuiton-profiling/src/site/site_fr.xml trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml trunk/nuiton-utils/pom.xml trunk/nuiton-utils/src/site/site_fr.xml trunk/nuiton-validator/pom.xml trunk/nuiton-validator/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-csv/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -120,7 +120,7 @@ <!-- plugin i18n --> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> <bundles>fr_FR,en_GB,es_ES</bundles> Modified: trunk/nuiton-csv/src/site/site_fr.xml =================================================================== --- trunk/nuiton-csv/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-csv/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -35,8 +35,17 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/nuiton-utils/nuiton-csv/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="modules"/> @@ -49,20 +58,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-profiling/src/site/site_fr.xml =================================================================== --- trunk/nuiton-profiling/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-profiling/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -33,6 +33,15 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -59,20 +68,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -119,7 +119,7 @@ <!-- plugin i18n --> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> <bundles>fr_FR,en_GB,es_ES</bundles> Modified: trunk/nuiton-utils/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -33,6 +33,15 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -60,20 +69,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> Modified: trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-utils-maven-report-plugin/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -29,9 +29,17 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="parent"/> @@ -46,20 +54,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-validator/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -128,7 +128,7 @@ <!-- plugin i18n --> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <silent>true</silent> </configuration> Modified: trunk/nuiton-validator/src/site/site_fr.xml =================================================================== --- trunk/nuiton-validator/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/nuiton-validator/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -29,13 +29,22 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu ref="parent"/> @@ -60,20 +69,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/pom.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -129,7 +129,7 @@ <projectId>nuiton-utils</projectId> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <aspectjVersion>1.6.12</aspectjVersion> <xworkVersion>2.3.4</xworkVersion> <doxiaVersion>1.3</doxiaVersion> @@ -137,6 +137,9 @@ <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + <!-- Documentation is in apt format --> + <siteSourcesType>apt</siteSourcesType> + </properties> <dependencyManagement> @@ -314,7 +317,7 @@ <!-- plugin i18n --> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> @@ -365,6 +368,7 @@ <report>issue-tracking</report> <report>license</report> <report>scm</report> + <report>dependency-report</report> <report>dependencies</report> <report>dependency-convergence</report> <report>plugin-management</report> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-02 16:36:14 UTC (rev 2409) +++ trunk/src/site/site_fr.xml 2012-09-04 12:43:19 UTC (rev 2410) @@ -30,14 +30,14 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -57,20 +57,23 @@ <version position="right" /> <poweredBy> + <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> - - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> - </poweredBy> <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <links> <item name="Nuiton.org" href="http://nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -92,20 +95,16 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body>