January 2010 - Maven-nuiton-skin-commits - mailman.cloud.codelutin.com

r588 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:07:19 +0100 (Tue, 26 Jan 2010) New Revision: 588 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 20:34:20 UTC (rev 587) +++ trunk/pom.xml 2010-01-26 21:07:19 UTC (rev 588) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <artifactId>maven-nuiton-skin</artifactId>

1 0

r587 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:34:20 +0100 (Tue, 26 Jan 2010) New Revision: 587 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 20:34:19 UTC (rev 586) +++ trunk/pom.xml 2010-01-26 20:34:20 UTC (rev 587) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.3</version> + <version>1.0.4-SNAPSHOT</version> <name>Maven Nuiton Skin</name> @@ -77,9 +77,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> </project>

1 0

r586 - in tags: . maven-nuiton-skin-1.0.3
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:34:19 +0100 (Tue, 26 Jan 2010) New Revision: 586 Added: tags/maven-nuiton-skin-1.0.3/ Log: [maven-scm] copy for tag maven-nuiton-skin-1.0.3 Property changes on: tags/maven-nuiton-skin-1.0.3 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin *.iml Added: svn:mergeinfo +

1 0

r585 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:34:16 +0100 (Tue, 26 Jan 2010) New Revision: 585 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-nuiton-skin-1.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 20:33:30 UTC (rev 584) +++ trunk/pom.xml 2010-01-26 20:34:16 UTC (rev 585) @@ -10,7 +10,7 @@ </parent> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version> <name>Maven Nuiton Skin</name> @@ -77,9 +77,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> </scm> </project>

1 0

r584 - trunk
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:33:30 +0100 (Tue, 26 Jan 2010) New Revision: 584 Modified: trunk/pom.xml Log: clean pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 20:31:41 UTC (rev 583) +++ trunk/pom.xml 2010-01-26 20:33:30 UTC (rev 584) @@ -16,7 +16,7 @@ <description>Theme Nuiton pour les sites maven.</description> <inceptionYear>2006</inceptionYear> - <url>http://maven-site.nuiton.org/${project.artifactId}</url> + <url>http://maven-site.nuiton.org/maven-nuiton-skin</url> <developers> @@ -27,7 +27,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Developer</role> </roles> </developer>

1 0

r583 - in trunk/src/site: . apt en/apt
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:31:41 +0100 (Tue, 26 Jan 2010) New Revision: 583 Modified: 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 Log: add site file headers + update doc Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-01-26 20:02:21 UTC (rev 582) +++ trunk/src/site/apt/index.apt 2010-01-26 20:31:41 UTC (rev 583) @@ -1,3 +1,22 @@ +~~~ *##% +~~~ Maven Nuiton Skin +~~~ Copyright (C) 2006 - 2010 CodeLutin +~~~ +~~~ This program is free software: you can redistribute it and/or modify +~~~ it under the terms of the GNU Lesser General Public License as +~~~ published by the Free Software Foundation, either version 3 of the +~~~ License, or (at your option) any later version. +~~~ +~~~ This program is distributed in the hope that it will be useful, +~~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~~ GNU General Lesser Public License for more details. +~~~ +~~~ You should have received a copy of the GNU General Lesser Public +~~~ License along with this program. If not, see +~~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~~ ##%* + ------ Nuiton skin ------ @@ -20,7 +39,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.1</version> + <version>1.0.3</version> </skin> ------------------------------------------------------------------- Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-01-26 20:02:21 UTC (rev 582) +++ trunk/src/site/en/apt/index.apt 2010-01-26 20:31:41 UTC (rev 583) @@ -1,3 +1,22 @@ +~~~ *##% +~~~ Maven Nuiton Skin +~~~ Copyright (C) 2006 - 2010 CodeLutin +~~~ +~~~ This program is free software: you can redistribute it and/or modify +~~~ it under the terms of the GNU Lesser General Public License as +~~~ published by the Free Software Foundation, either version 3 of the +~~~ License, or (at your option) any later version. +~~~ +~~~ This program is distributed in the hope that it will be useful, +~~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~~ GNU General Lesser Public License for more details. +~~~ +~~~ You should have received a copy of the GNU General Lesser Public +~~~ License along with this program. If not, see +~~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~~ ##%* + ------ Nuiton skin ------ @@ -20,7 +39,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.1</version> + <version>1.0.3</version> </skin> ------------------------------------------------------------------- Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-26 20:02:21 UTC (rev 582) +++ trunk/src/site/site_en.xml 2010-01-26 20:31:41 UTC (rev 583) @@ -1,11 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> + <project name="${project.name}"> - -  <bannerLeft> <name>${project.name}</name> @@ -13,30 +27,17 @@ <href>index.html</href> </bannerLeft> -  - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> -  </poweredBy> <body> <links> -  <item name="[fr" href="../index.html"/> <item name="en]" href="index.html"/> </links> <breadcrumbs> -  <item name="${project.name}" href="index.html" /> </breadcrumbs> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-26 20:02:21 UTC (rev 582) +++ trunk/src/site/site_fr.xml 2010-01-26 20:31:41 UTC (rev 583) @@ -1,13 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> + <project name="${project.name}"> -  + </skin> <bannerLeft> <name>${project.name}</name> @@ -15,30 +33,17 @@ <href>index.html</href> </bannerLeft> -  - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> -  </poweredBy> <body> <links> -  <item name="[fr" href="${project.url}/index.html"/> <item name="en]" href="/en/index.html"/> </links> <breadcrumbs> -  <item name="${project.name}" href="index.html" /> </breadcrumbs>

1 0

r582 - in trunk/src/main/resources: . META-INF/maven
by tchemit＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:02:21 +0100 (Tue, 26 Jan 2010) New Revision: 582 Modified: trunk/src/main/resources/META-INF/maven/site.vm trunk/src/main/resources/maven-nuiton-skin.properties trunk/src/main/resources/maven-nuiton-skin_fr.properties Log: - Anomalie #273: Don't generate "edit" link for private ssh key autentication (scmwebeditor) - Anomalie #281: Fix scmwebeditor link for none default locale - Evolution #279: Add a link (in top-right links) to site map Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2010-01-24 23:36:18 UTC (rev 581) +++ trunk/src/main/resources/META-INF/maven/site.vm 2010-01-26 20:02:21 UTC (rev 582) @@ -52,19 +52,30 @@ #end #macro ( links $links ) + #computeDefaultLocale( $siteLocales ) + #set ( $sitemapUrl = $PathTool.calculateLink( "./sitemap.html", $relativePath ) ) + #set ( $sitemapUrl = $sitemapUrl.replaceAll( "\\", "/" ) ) + #set ( $sitemapLabel = $i18n.getString( "maven-nuiton-skin", $locale, "goto.sitemap" ) ) + #link( $sitemapUrl $sitemapLabel ) + + ##<a href="$sitemapUrl">$sitemapLabel</a> + #set ( $counter = 0 ) #foreach( $item in $links ) - #set ( $counter = $counter + 1 ) - #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) ) - #link( $currentItemHref $item.name ) - #if ( $links.size() > $counter ) + #set ( $counter = $counter + 1 ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) ) + | + #link( $currentItemHref $item.name ) + ##if ( $links.size() > $counter ) + ## | + ##end + #end + ## #computeDefaultLocale( $siteLocales ) + #if ( "$scmwebeditorEnabled" != "false" ) | - #end - #end - #computeDefaultLocale( $siteLocales ) - <a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=$alignedFileName&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$firstLocale&format=$project.properties.siteSourcesType" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> - ##| <a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=$alignedFileName&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$project.properties.defaultLocale&format=$project.properties.siteSourcesType" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a> + #link ( "$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=$alignedFileName&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$firstLocale&format=$project.properties.siteSourcesType" , $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" ) ) + #end #end #macro ( breadcrumbs $breadcrumbs ) @@ -147,11 +158,11 @@ #end #macro ( mainMenu $menus ) - #computeDefaultLocale( $siteLocales ) - #set ($xmlExtention = ".xml") - <a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=site_$locale$xmlExtention&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$firstLocale" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" )</a> - ##<a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=site_$locale$xmlExtention&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$project.properties.defaultLocale" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" )</a> - + #if ( "$scmwebeditorEnabled" != "false" ) + #computeDefaultLocale( $siteLocales ) + #set ($xmlExtention = ".xml") + #link ( "$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=site_$locale$xmlExtention&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$locale", $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" ) ) + #end #foreach( $menu in $menus ) ##set ($xmlExtention = ".xml") ##<a href="$project.properties.scmwebeditorUrl?adresse=$project.scm.developerConnection&file_name=site_$locale$xmlExtention&project_url=$project.url/$locale/$alignedFileName&lang=$locale&defaultLang=$project.properties.defaultLocale" class="externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" )</a> Modified: trunk/src/main/resources/maven-nuiton-skin.properties =================================================================== --- trunk/src/main/resources/maven-nuiton-skin.properties 2010-01-24 23:36:18 UTC (rev 581) +++ trunk/src/main/resources/maven-nuiton-skin.properties 2010-01-26 20:02:21 UTC (rev 582) @@ -1,4 +1,5 @@ whymakedonate=Why make a donate whymakedonate.url=http://www.codelutin.com/whymakedonate/en edit.scm.page=Edit page -edit.scm.menu=Edit menu \ No newline at end of file +edit.scm.menu=Edit menu +goto.sitemap=Sitemap \ No newline at end of file Modified: trunk/src/main/resources/maven-nuiton-skin_fr.properties =================================================================== --- trunk/src/main/resources/maven-nuiton-skin_fr.properties 2010-01-24 23:36:18 UTC (rev 581) +++ trunk/src/main/resources/maven-nuiton-skin_fr.properties 2010-01-26 20:02:21 UTC (rev 582) @@ -1,4 +1,5 @@ whymakedonate=Pourquoi faire un don whymakedonate.url=http://www.codelutin.com/whymakedonate/fr edit.scm.page=Editer la page -edit.scm.menu=Editer le menu \ No newline at end of file +edit.scm.menu=Editer le menu +goto.sitemap=Plan du site \ No newline at end of file

1 0

r581 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-25 00:36:18 +0100 (Mon, 25 Jan 2010) New Revision: 581 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 12:37:19 UTC (rev 580) +++ trunk/pom.xml 2010-01-24 23:36:18 UTC (rev 581) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>maven-nuiton-skin</artifactId>

1 0

r580 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-24 13:37:19 +0100 (Sun, 24 Jan 2010) New Revision: 580 Modified: trunk/pom.xml Log: clean pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-23 16:47:49 UTC (rev 579) +++ trunk/pom.xml 2010-01-24 12:37:19 UTC (rev 580) @@ -9,7 +9,6 @@ <version>2.0.2</version> </parent> -  <artifactId>maven-nuiton-skin</artifactId> <version>1.0.3-SNAPSHOT</version> @@ -19,19 +18,6 @@ <inceptionYear>2006</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url> -  - -  - <developers> <developer> @@ -85,139 +71,15 @@ <properties> - <maven.site.locales>fr,en</maven.site.locales> + <siteLocales>fr,en</siteLocales> <siteSourcesType>apt</siteSourcesType> -  -  -  -  - -  -  + </properties> - <build> - <pluginManagement> - <plugins> - -  - -  - - </plugins> - </pluginManagement> - </build> - -  - <scm> <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> -  - </project>

1 0

r579 - trunk
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 17:47:49 +0100 (Sat, 23 Jan 2010) New Revision: 579 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-23 16:47:48 UTC (rev 578) +++ trunk/pom.xml 2010-01-23 16:47:49 UTC (rev 579) @@ -11,7 +11,7 @@  <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <name>Maven Nuiton Skin</name> @@ -164,9 +164,9 @@ </reporting--> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/tags/maven-nuiton-skin-…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/tags/maven-nuit…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> <!--issueManagement>

1 0