r598 - trunk/src/main/resources/META-INF/maven - Maven-nuiton-skin-commits

21 May 2010

Author: tchemit
Date: 2010-05-21 10:26:45 +0200 (Fri, 21 May 2010)
New Revision: 598

Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/598

Log:
Evolution #629: Use maven site variable 'locales' instead of our 'siteLocales'

Modified:
   trunk/src/main/resources/META-INF/maven/site.vm

Modified: trunk/src/main/resources/META-INF/maven/site.vm
===================================================================

--- trunk/src/main/resources/META-INF/maven/site.vm	2010-05-09 12:34:20 UTC (rev 597)
+++ trunk/src/main/resources/META-INF/maven/site.vm	2010-05-21 08:26:45 UTC (rev 598)
@@ -1,6 +1,6 @@
 <!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
+## set in global variable firstLocale the first (says main) locale of site
 #macro ( computeDefaultLocale $locales )
   #set ( $myindex = $locales.trim().indexOf(",") )
   #if ( $myindex == -1 )
@@ -52,7 +52,7 @@
 #end
 
 #macro ( links $links )
-  #computeDefaultLocale( $siteLocales )
+  #computeDefaultLocale( $locales )
   #set ( $sitemapUrl = $PathTool.calculateLink( "./sitemap.html", $relativePath ) )
   #set ( $sitemapUrl = $sitemapUrl.replaceAll( "\\", "/" ) )
   #set ( $sitemapLabel = $i18n.getString( "maven-nuiton-skin", $locale, "goto.sitemap" ) )
@@ -71,7 +71,6 @@
       ##  |
       ##end
     #end
-    ##  #computeDefaultLocale( $siteLocales )
     #if ( "$scmwebeditorEnabled" != "false" )
       |
       #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" ) )
@@ -159,7 +158,7 @@
 
 #macro ( mainMenu $menus )
   #if ( "$scmwebeditorEnabled" != "false" )
-    #computeDefaultLocale( $siteLocales )
+    #computeDefaultLocale( $locales )
     #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

    

r598 - trunk/src/main/resources/META-INF/maven

tchemit＠users.nuiton.org

tags

participants (1)