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

23 Jan 2010

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

    

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

tchemit＠users.nuiton.org

tags

participants (1)