From tchemit@users.nuiton.org Tue Jan 26 21:02:24 2010
From: tchemit@users.nuiton.org
To: maven-nuiton-skin-commits@list.nuiton.org
Subject: [Maven-nuiton-skin-commits] r582 - in trunk/src/main/resources: .
	META-INF/maven
Date: Tue, 26 Jan 2010 21:02:23 +0100
Message-ID: <20100126200224.1328115D69@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0671648730405077025=="

--===============0671648730405077025==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
=20
 #macro ( links $links )
+  #computeDefaultLocale( $siteLocales )
+  #set ( $sitemapUrl =3D $PathTool.calculateLink( "./sitemap.html", $relativ=
ePath ) )
+  #set ( $sitemapUrl =3D $sitemapUrl.replaceAll( "\\", "/" ) )
+  #set ( $sitemapLabel =3D $i18n.getString( "maven-nuiton-skin", $locale, "g=
oto.sitemap" ) )
+  #link( $sitemapUrl $sitemapLabel )
+
+  ##<a href=3D"$sitemapUrl">$sitemapLabel</a>
+
   #set ( $counter =3D 0 )
     #foreach( $item in $links )
-    #set ( $counter =3D $counter + 1 )
-    #set ( $currentItemHref =3D $PathTool.calculateLink( $item.href, $relati=
vePath ) )
-    #set ( $currentItemHref =3D $currentItemHref.replaceAll( "\\", "/" ) )
-    #link( $currentItemHref $item.name )
-    #if ( $links.size() > $counter )
+      #set ( $counter =3D $counter + 1 )
+      #set ( $currentItemHref =3D $PathTool.calculateLink( $item.href, $rela=
tivePath ) )
+      #set ( $currentItemHref =3D $currentItemHref.replaceAll( "\\", "/" ) )
+       |
+      #link( $currentItemHref $item.name )
+      ##if ( $links.size() > $counter )
+      ##  |
+      ##end
+    #end
+    ##  #computeDefaultLocale( $siteLocales )
+    #if ( "$scmwebeditorEnabled" !=3D "false" )
       |
-     #end
-     #end
-     #computeDefaultLocale( $siteLocales )
-     <a href=3D"$project.properties.scmwebeditorUrl?adresse=3D$project.scm.d=
eveloperConnection&amp;file_name=3D$alignedFileName&amp;project_url=3D$projec=
t.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=3D$firstLoc=
ale&amp;format=3D$project.properties.siteSourcesType" class=3D"externalLink">=
$i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.page" )</a>
-      ##| <a href=3D"$project.properties.scmwebeditorUrl?adresse=3D$project.=
scm.developerConnection&amp;file_name=3D$alignedFileName&amp;project_url=3D$p=
roject.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=3D$pro=
ject.properties.defaultLocale&amp;format=3D$project.properties.siteSourcesTyp=
e" class=3D"externalLink">$i18n.getString( "maven-nuiton-skin", $locale, "edi=
t.scm.page" )</a>
+      #link ( "$project.properties.scmwebeditorUrl?adresse=3D$project.scm.de=
veloperConnection&amp;file_name=3D$alignedFileName&amp;project_url=3D$project=
.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=3D$firstLoca=
le&amp;format=3D$project.properties.siteSourcesType" , $i18n.getString( "mave=
n-nuiton-skin", $locale, "edit.scm.page" ) )
+    #end
 #end
=20
 #macro ( breadcrumbs $breadcrumbs )
@@ -147,11 +158,11 @@
 #end
=20
 #macro ( mainMenu $menus )
-  #computeDefaultLocale( $siteLocales )
-  #set ($xmlExtention =3D ".xml")
-  <a href=3D"$project.properties.scmwebeditorUrl?adresse=3D$project.scm.deve=
loperConnection&amp;file_name=3Dsite_$locale$xmlExtention&amp;project_url=3D$=
project.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=3D$fi=
rstLocale" class=3D"externalLink">$i18n.getString( "maven-nuiton-skin", $loca=
le, "edit.scm.menu" )</a>
-  ##<a href=3D"$project.properties.scmwebeditorUrl?adresse=3D$project.scm.de=
veloperConnection&amp;file_name=3Dsite_$locale$xmlExtention&amp;project_url=
=3D$project.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=
=3D$project.properties.defaultLocale" class=3D"externalLink">$i18n.getString(=
 "maven-nuiton-skin", $locale, "edit.scm.menu" )</a>
-
+  #if ( "$scmwebeditorEnabled" !=3D "false" )
+    #computeDefaultLocale( $siteLocales )
+    #set ($xmlExtention =3D ".xml")
+    #link ( "$project.properties.scmwebeditorUrl?adresse=3D$project.scm.deve=
loperConnection&amp;file_name=3Dsite_$locale$xmlExtention&amp;project_url=3D$=
project.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=3D$lo=
cale", $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" ) )
+  #end
   #foreach( $menu in $menus )
     ##set ($xmlExtention =3D ".xml")
     ##<a href=3D"$project.properties.scmwebeditorUrl?adresse=3D$project.scm.=
developerConnection&amp;file_name=3Dsite_$locale$xmlExtention&amp;project_url=
=3D$project.url/$locale/$alignedFileName&amp;lang=3D$locale&amp;defaultLang=
=3D$project.properties.defaultLocale" class=3D"externalLink">$i18n.getString(=
 "maven-nuiton-skin", $locale, "edit.scm.menu" )</a>

Modified: trunk/src/main/resources/maven-nuiton-skin.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3DWhy make a donate
 whymakedonate.url=3Dhttp://www.codelutin.com/whymakedonate/en
 edit.scm.page=3DEdit page
-edit.scm.menu=3DEdit menu
\ No newline at end of file
+edit.scm.menu=3DEdit menu
+goto.sitemap=3DSitemap
\ No newline at end of file

Modified: trunk/src/main/resources/maven-nuiton-skin_fr.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3DPourquoi faire un don
 whymakedonate.url=3Dhttp://www.codelutin.com/whymakedonate/fr
 edit.scm.page=3DEditer la page
-edit.scm.menu=3DEditer le menu
\ No newline at end of file
+edit.scm.menu=3DEditer le menu
+goto.sitemap=3DPlan du site
\ No newline at end of file


--===============0671648730405077025==--