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

r578 - in tags: . maven-nuiton-skin-1.0.2
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 17:47:48 +0100 (Sat, 23 Jan 2010) New Revision: 578 Added: tags/maven-nuiton-skin-1.0.2/ Log: [maven-scm] copy for tag maven-nuiton-skin-1.0.2 Property changes on: tags/maven-nuiton-skin-1.0.2 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt nbactions.xml .settings bin *.iml Added: svn:mergeinfo +

1 0

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

23 Jan '10

Author: tchemit Date: 2010-01-23 17:47:45 +0100 (Sat, 23 Jan 2010) New Revision: 577 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-nuiton-skin-1.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-23 08:17:46 UTC (rev 576) +++ trunk/pom.xml 2010-01-23 16:47:45 UTC (rev 577) @@ -11,7 +11,7 @@  <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <name>Maven Nuiton Skin</name> @@ -164,9 +164,9 @@ </reporting--> <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> <!--issueManagement>

1 0

r576 - trunk/src/main/resources/META-INF/maven
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 09:17:46 +0100 (Sat, 23 Jan 2010) New Revision: 576 Modified: trunk/src/main/resources/META-INF/maven/site.vm Log: remove YOYO... as prefix of scmwebeditor url Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2010-01-23 08:05:33 UTC (rev 575) +++ trunk/src/main/resources/META-INF/maven/site.vm 2010-01-23 08:17:46 UTC (rev 576) @@ -63,7 +63,7 @@ #end #end #computeDefaultLocale( $siteLocales ) - <a href="YOYO$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=$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> #end

1 0

r575 - trunk/src/main/resources/META-INF/maven
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 09:05:33 +0100 (Sat, 23 Jan 2010) New Revision: 575 Modified: trunk/src/main/resources/META-INF/maven/site.vm Log: Evolution #255: Calculer la defaultLocale a partir de la propriete maven.site.locales Modified: trunk/src/main/resources/META-INF/maven/site.vm =================================================================== --- trunk/src/main/resources/META-INF/maven/site.vm 2010-01-23 08:03:44 UTC (rev 574) +++ trunk/src/main/resources/META-INF/maven/site.vm 2010-01-23 08:05:33 UTC (rev 575) @@ -1,5 +1,16 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +## set in gloabal variable firstLocale the first (says main) locale of site +#macro ( computeDefaultLocale $locales ) + #set ( $myindex = $locales.trim().indexOf(",") ) + #if ( $myindex == -1 ) + #set ( $firstLocale = $locales.trim() ) + #else + ##set ( $myindex = $myindex - 1 ) + #set ( $firstLocale = $locales.trim().substring( 0, $myindex ) ) + #end +#end + #macro ( link $href $name ) #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) ) <a href="$href" class="externalLink">$name</a> @@ -51,7 +62,9 @@ | #end #end - | <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> + #computeDefaultLocale( $siteLocales ) + <a href="YOYO$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> #end #macro ( breadcrumbs $breadcrumbs ) @@ -134,9 +147,14 @@ #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> + #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> + ##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> #if ( $menu.name ) <h5>$menu.name</h5> #end

1 0

r574 - in trunk: . src/site
by tchemit＠users.nuiton.org 23 Jan '10

23 Jan '10

Author: tchemit Date: 2010-01-23 09:03:44 +0100 (Sat, 23 Jan 2010) New Revision: 574 Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: Evolution #256: Passage sur mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 10:35:54 UTC (rev 573) +++ trunk/pom.xml 2010-01-23 08:03:44 UTC (rev 574) @@ -3,9 +3,13 @@ <modelVersion>4.0.0</modelVersion> -  - - <groupId>org.nuiton</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0.2</version> + </parent> + +  <artifactId>maven-nuiton-skin</artifactId> <version>1.0.2-SNAPSHOT</version> @@ -15,19 +19,18 @@ <inceptionYear>2006</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url> - <organization> +  - <licenses> +  <url>${project.basedir}/LICENSE.txt</url> <distribution>local</distribution> </license> - </licenses> + </licenses--> <developers> @@ -49,7 +52,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Developer</role> </roles> </developer> @@ -60,7 +63,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Developer</role> </roles> </developer> @@ -72,7 +75,7 @@ <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Developer</role> </roles> </developer> @@ -82,21 +85,29 @@ <properties> - <listId>${project.artifactId}</listId> + <maven.site.locales>fr,en</maven.site.locales> + <siteSourcesType>apt</siteSourcesType> +  +  +  +  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.reports.generate>true</maven.reports.generate> -  - <repository.home.url>http://maven.nuiton.org/release</repository.home.url> +  </properties> <build> <pluginManagement> <plugins> - <plugin> +  + +  </plugins> </pluginManagement> </build> - <reporting> +  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/maven-nuiton-skin/trunk</connection> @@ -158,7 +169,7 @@ <url>http://www.nuiton.org/repositories/browse/maven-nuiton-skin/trunk</url> </scm> - <issueManagement> +  <mailingLists> <mailingList> <name>${listId}-commits</name> @@ -208,6 +218,6 @@ <post>${listId}-users(a)list.nuiton.org</post> <archive>http://list.nuiton.org/pipermail/${listId}-users/</archive> </mailingList> - </mailingLists> + </mailingLists--> </project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-12-18 10:35:54 UTC (rev 573) +++ trunk/src/site/site_en.xml 2010-01-23 08:03:44 UTC (rev 574) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <skin> +  <bannerLeft> <name>${project.name}</name> @@ -13,10 +13,10 @@ <href>index.html</href> </bannerLeft> - <bannerRight> +  <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> @@ -26,17 +26,17 @@ <body> <links> - <item name="Chorem" href="http://www.chorem.org"/> +  <item name="[fr" href="../index.html"/> <item name="en]" href="index.html"/> </links> <breadcrumbs> - <item name="Nuiton" href="http://www.nuiton.org" /> +  <item name="${project.name}" href="index.html" /> </breadcrumbs> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-12-18 10:35:54 UTC (rev 573) +++ trunk/src/site/site_fr.xml 2010-01-23 08:03:44 UTC (rev 574) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> +  <bannerLeft> <name>${project.name}</name> @@ -15,10 +15,10 @@ <href>index.html</href> </bannerLeft> - <bannerRight> +  <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> @@ -28,17 +28,17 @@ <body> <links> - <item name="Chorem" href="http://www.chorem.org"/> +  <item name="[fr" href="${project.url}/index.html"/> <item name="en]" href="/en/index.html"/> </links> <breadcrumbs> - <item name="Nuiton" href="http://www.nuiton.org" /> +  <item name="${project.name}" href="index.html" /> </breadcrumbs>

1 0