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