r1981 - in trunk: i18n-maven-plugin/src/site nuiton-i18n/src/site src/site src/site/apt src/site/en/apt - I18n-commits

4 Sep 2012

Author: tchemit
Date: 2012-09-04 11:26:32 +0200 (Tue, 04 Sep 2012)
New Revision: 1981

Url: http://nuiton.org/repositories/revision/i18n/1981

Log:
improve site generation

Modified:
   trunk/i18n-maven-plugin/src/site/site_en.xml
   trunk/i18n-maven-plugin/src/site/site_fr.xml
   trunk/nuiton-i18n/src/site/site_en.xml
   trunk/nuiton-i18n/src/site/site_fr.xml
   trunk/src/site/apt/index.apt
   trunk/src/site/en/apt/index.apt
   trunk/src/site/site_en.xml
   trunk/src/site/site_fr.xml

Modified: trunk/i18n-maven-plugin/src/site/site_en.xml
===================================================================

--- trunk/i18n-maven-plugin/src/site/site_en.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/i18n-maven-plugin/src/site/site_en.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -28,53 +28,38 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <href>index.html</href>
+    <href>./index.html</href>
   </bannerLeft>
 
-  <bannerRight>
-    <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-    <href>http://www.codelutin.com</href>
-  </bannerRight>
+  <body>
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.2.1</version>
-  </skin>
+    <head>
+      <script type="text/javascript"
+              src="http://maven-site.chorem.org/public/js/mavenpom-site.js">
+      </script>
 
-  <custom>
-    <fluidoSkin>
-      <topBarEnabled>true</topBarEnabled>
-      <googleSearch/>
-      <sideBarEnabled>false</sideBarEnabled>
-      <searchEnabled>true</searchEnabled>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-    </fluidoSkin>
-  </custom>
+      <link rel="stylesheet" type="text/css"
+            href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/>
+    </head>
 
-  <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"/>
-  </poweredBy>
-
-  <body>
-
     <breadcrumbs>
-      <item name="${project.name}" href="index.html"/>
+      <item name="${project.name}" href="./index.html"/>
     </breadcrumbs>
 
-    <links>
+    <!--links>
       <item name="[fr" href="../index.html"/>
       <item name="en]" href="index.html"/>
-    </links>
+    </links-->
 
     <menu name="Project Parent">
         <item name="I18n" href="../../en/index.html"/>
     </menu>
-    
+
+    <menu name="Language">
+      <item name="Version Française" href="../index.html"/>
+      <item name="English Version" href="./index.html"/>
+    </menu>
+
     <menu name="User">
       <item name="Home" href="index.html"/>
       <item name="Usages" href="usages.html"/>
@@ -99,26 +84,10 @@
       </item>
     </menu>
 
-    <menu name="Downloads">
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
-        name="Librairie (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
-        name="Javadoc (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
-        name="Sources (jar)"/>
-    </menu>
-
     <menu ref="reports"/>
 
     <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}'

Modified: trunk/i18n-maven-plugin/src/site/site_fr.xml
===================================================================
--- trunk/i18n-maven-plugin/src/site/site_fr.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/i18n-maven-plugin/src/site/site_fr.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -28,51 +28,36 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <href>index.html</href>
+    <href>./index.html</href>
   </bannerLeft>
 
-  <bannerRight>
-    <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-    <href>http://www.codelutin.com</href>
-  </bannerRight>
+  <body>
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.2.1</version>
-  </skin>
+    <head>
+      <script type="text/javascript"
+              src="http://maven-site.chorem.org/public/js/mavenpom-site.js">
+      </script>
 
-  <custom>
-    <fluidoSkin>
-      <topBarEnabled>true</topBarEnabled>
-      <googleSearch/>
-      <sideBarEnabled>false</sideBarEnabled>
-      <searchEnabled>true</searchEnabled>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-    </fluidoSkin>
-  </custom>
+      <link rel="stylesheet" type="text/css"
+            href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/>
+    </head>
 
-  <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"/>
-  </poweredBy>
-
-  <body>
-
     <breadcrumbs>
-      <item name="${project.name}" href="index.html"/>
+      <item name="${project.name}" href="./index.html"/>
     </breadcrumbs>
 
-    <links>
+    <!--links>
       <item name="[fr" href="index.html"/>
       <item name="en]" href="en/index.html"/>
-    </links>
+    </links-->
 
     <menu ref="parent"/>
 
+    <menu name="Language">
+      <item name="Version Française" href="./index.html"/>
+      <item name="English Version" href="./en/index.html"/>
+    </menu>
+
     <menu name="Utilisateur">
       <item name="Introduction" href="index.html"/>
       <item name="Usages" href="usages.html"/>
@@ -97,26 +82,10 @@
       </item>
     </menu>
 
-    <menu name="Téléchargement">
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
-        name="Librairie (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
-        name="Javadoc (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
-        name="Sources (jar)"/>
-    </menu>
-
     <menu ref="reports"/>
 
     <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}'

Modified: trunk/nuiton-i18n/src/site/site_en.xml
===================================================================
--- trunk/nuiton-i18n/src/site/site_en.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/nuiton-i18n/src/site/site_en.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -28,53 +28,38 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <href>index.html</href>
+    <href>./index.html</href>
   </bannerLeft>
 
-  <bannerRight>
-    <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-    <href>http://www.codelutin.com</href>
-  </bannerRight>
+  <body>
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.2.1</version>
-  </skin>
+    <head>
+      <script type="text/javascript"
+              src="http://maven-site.chorem.org/public/js/mavenpom-site.js">
+      </script>
 
-  <custom>
-    <fluidoSkin>
-      <topBarEnabled>true</topBarEnabled>
-      <googleSearch/>
-      <sideBarEnabled>false</sideBarEnabled>
-      <searchEnabled>true</searchEnabled>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-    </fluidoSkin>
-  </custom>
+      <link rel="stylesheet" type="text/css"
+            href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/>
+    </head>
 
-  <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"/>
-  </poweredBy>
-
-  <body>
-
     <breadcrumbs>
       <item name="${project.name}" href="index.html"/>
     </breadcrumbs>
 
-    <links>
+    <!--links>
       <item name="[fr" href="../index.html"/>
-      <item name="en]" href="index.html"/>
-    </links>
+      <item name="en]" href="./index.html"/>
+    </links-->
 
     <menu name="Project Parent">
-        <item name="I18n" href="../../en/index.html"/>
+      <item name="I18n" href="../../en/index.html"/>
     </menu>
 
+    <menu name="Language">
+      <item name="Version Française" href="../index.html"/>
+      <item name="English Version" href="./index.html"/>
+    </menu>
+
     <menu name="User">
       <item name="Home" href="index.html"/>
     </menu>
@@ -95,10 +80,6 @@
 
     <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}'

Modified: trunk/nuiton-i18n/src/site/site_fr.xml
===================================================================
--- trunk/nuiton-i18n/src/site/site_fr.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/nuiton-i18n/src/site/site_fr.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -28,51 +28,36 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <href>index.html</href>
+    <href>./index.html</href>
   </bannerLeft>
 
-  <bannerRight>
-    <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-    <href>http://www.codelutin.com</href>
-  </bannerRight>
+  <body>
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.2.1</version>
-  </skin>
+    <head>
+      <script type="text/javascript"
+              src="http://maven-site.chorem.org/public/js/mavenpom-site.js">
+      </script>
 
-  <custom>
-    <fluidoSkin>
-      <topBarEnabled>true</topBarEnabled>
-      <googleSearch/>
-      <sideBarEnabled>false</sideBarEnabled>
-      <searchEnabled>true</searchEnabled>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-    </fluidoSkin>
-  </custom>
+      <link rel="stylesheet" type="text/css"
+            href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/>
+    </head>
 
-  <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"/>
-  </poweredBy>
-
-  <body>
-
     <breadcrumbs>
       <item name="${project.name}" href="index.html"/>
     </breadcrumbs>
 
-    <links>
+    <!--links>
       <item name="[fr" href="index.html"/>
       <item name="en]" href="en/index.html"/>
-    </links>
+    </links-->
 
     <menu ref="parent"/>
 
+    <menu name="Language">
+      <item name="Version Française" href="./index.html"/>
+      <item name="English Version" href="./en/index.html"/>
+    </menu>
+
     <menu name="Utilisateur">
       <item name="Accueil" href="index.html"/>
     </menu>
@@ -93,10 +78,6 @@
 
     <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}'

Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/src/site/apt/index.apt	2012-09-04 09:26:32 UTC (rev 1981)
@@ -61,7 +61,7 @@
 * Ajout d'un parseur pour les jsp de struts2
 
   Ce nouveau parseur scan les fichier jsp et extrait toutes les clefs
-  contenues dans des attributs text name='xxx' ou label='xxx' ou %{getText("xxx".
+  contenues dans des attributs text name='xxx' ou label='xxx' ou %\{getText("xxx".
 
   Malheureusement il n'est pas possible de faire mieux que ça et il se peut
   alors de récupérer trop de clefs. Pour limiter cet effet indésirable il est

Modified: trunk/src/site/en/apt/index.apt
===================================================================
--- trunk/src/site/en/apt/index.apt	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/src/site/en/apt/index.apt	2012-09-04 09:26:32 UTC (rev 1981)
@@ -62,7 +62,7 @@
 * Add a struts2 jsp parser
 
   this new parseur scan jsp files to extract keys which match these forms:
-  text name='xxx' or label='xxx' or %{getText("xxx".
+  text name='xxx' or label='xxx' or %\{getText("xxx".
 
   Unfortunatly, we can't do better than this, and still we detects too much keys.
   To avoid this problem we had a new paramter (see next section) to restrict

Modified: trunk/src/site/site_en.xml
===================================================================
--- trunk/src/site/site_en.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/src/site/site_en.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -39,14 +39,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>
@@ -62,13 +62,22 @@
 
   <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>
 
     <menu name="Language">
-      <item name="French" href="../index.html"/>
-      <item name="English" href="index.html"/>
+      <item name="Version Française" href="../index.html"/>
+      <item name="English Version" href="./index.html"/>
     </menu>
 
     <links>
@@ -96,20 +105,18 @@
       <item name="Extend Initializer" href="extendInitializer.html"/>
     </menu>
 
-    <menu name="Modules">
+    <menu ref="modules"/>
+
+    <!--menu name="Modules">
       <item name="I18n :: Api" href="../nuiton-i18n/en/index.html"/>
       <item name="I18n :: Maven Plugin"
             href="../maven-i18n-plugin/en/index.html"/>
-    </menu>
+    </menu-->
 
     <menu ref="reports"/>
 
     <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}'

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2012-09-04 09:25:48 UTC (rev 1980)
+++ trunk/src/site/site_fr.xml	2012-09-04 09:26:32 UTC (rev 1981)
@@ -39,14 +39,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>
@@ -62,6 +62,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>
@@ -70,13 +79,11 @@
       <item name="nuiton.org" href="http://www.nuiton.org"/>
       <item name="CodeLutin" href="http://codelutin.com"/>
       <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
-      <!--item name="[fr" href="index.html" />
-      <item name="en]" href="en/index.html" /-->
     </links>
 
     <menu name="Langue">
-      <item name="French" href="index.html"/>
-      <item name="English" href="./en/index.html"/>
+      <item name="Version Française" href="./index.html"/>
+      <item name="English Version" href="./en/index.html"/>
     </menu>
 
     <menu name="Utilisateur">
@@ -102,10 +109,6 @@
 
     <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}'

    

r1981 - in trunk: i18n-maven-plugin/src/site nuiton-i18n/src/site src/site src/site/apt src/site/en/apt

tchemit＠users.nuiton.org

tags

participants (1)