Author: olamy
Date: Tue Oct 11 21:39:21 2011
New Revision: 1182101
URL: http://svn.apache.org/viewvc?rev=1182101&view=rev
Log:
fix using position right: prefer bootstrap class pull-left/right
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1182101&r1=1182100&r2=1182101&view=diff
==============================================================================
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Tue Oct 11 21:39:21 2011
@@ -113,7 +113,7 @@
#end
#end
##
-#macro ( breadcrumbs $breadcrumbs )
+#macro ( breadcrumbs $breadcrumbs $cssClass )
#foreach( $item in $breadcrumbs )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href,
$relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
@@ -121,12 +121,12 @@
#set ( $currentItemHref = './' )
#end
##
- <li>
+ <li class="$cssClass">
#link( $currentItemHref $item.name $item.target $item.img $item.position
$item.alt $item.border $item.width $item.height )
- <span class="divider">></span>
+ <li class="divider $cssClass">></li>
</li>
#end
- $title
+ <li class="$cssClass">$title</li>
#end
##
#macro ( displayTree $display $item )
@@ -320,57 +320,51 @@
#set ( $links = $decoration.body.links )
#if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() >
0 )
- #set ( $prefix = " <span class=\"divider\">/</span>" )
+ #set ( $prefix = " <span class="divider pull-right">/</span>" )
#else
#set ( $prefix = "" )
#end
##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || (
$datePosition.equalsIgnoreCase( "bottom" ) ) )
- <div class="xright">
- $prefix <span id="publishDate">$i18n.getString( "site-renderer",
$locale, "template.lastpublished" ): $dateToday</span>
- </div>
+ $prefix <li id="publishDate" class="pull-right">$i18n.getString(
"site-renderer", $locale, "template.lastpublished" ): $dateToday</li>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- <span class="divider">|</span> <span
id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
+ <li class="divider pull-right">|</li> <li id="projectVersion"
class="pull-right">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</li>
#end
#elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || (
$datePosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
<span id="publishDate">$i18n.getString( "site-renderer", $locale,
"template.lastpublished" ): $dateToday</span>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- <span class="divider">|</span> <span
id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
+ <span class="divider foo">|</span> <span
id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
#end
</div>
#elseif ( $datePosition.equalsIgnoreCase("left") )
- <div class="xleft">
- <span id="publishDate">$i18n.getString( "site-renderer", $locale,
"template.lastpublished" ): $dateToday</span>
+ <li id="publishDate" class="pull-left">$i18n.getString(
"site-renderer", $locale, "template.lastpublished" ): $dateToday</li>
#if ( $versionPosition.equalsIgnoreCase( $position ) )
- <span class="divider">|</span> <span
id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
+ <li class="divider pull-left">|</li> <li id="projectVersion"
class="pull-left">$i18n.getString( "site-renderer", $locale, "template.version"
): ${project.version}</li>
#end
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- <span class="divider">|</span> #breadcrumbs( $breadcrumbs )
+ <li class="divider">|</li> #breadcrumbs( $breadcrumbs "pull-left" )
#end
- </div>
#end
#elseif ( $versionPosition.equalsIgnoreCase( $position ) )
- #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || (
$versionPosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix <span id="projectVersion">$i18n.getString( "site-renderer",
$locale, "template.version" ): ${project.version}</span>
+ #if ( $versionPosition.equalsIgnoreCase( "right" ) )
+ $prefix <li id="projectVersion" class="pull-right">$i18n.getString(
"site-renderer", $locale, "template.version" ): ${project.version}</li>
+ #elseif ( $versionPosition.equalsIgnoreCase( "bottom" ) )
+ $prefix <span id="projectVersion">$i18n.getString( "site-renderer",
$locale, "template.version" ): ${project.version}</span>
#elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) ||
( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
<div id="lastPublished">
<span id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
</div>
#elseif ( $versionPosition.equalsIgnoreCase("left") )
- <div class="xleft">
- <span id="projectVersion">$i18n.getString( "site-renderer", $locale,
"template.version" ): ${project.version}</span>
+ <li id="projectVersion" class="pull-left">$i18n.getString(
"site-renderer", $locale, "template.version" ): ${project.version}</li>
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
+ | #breadcrumbs( $breadcrumbs "pull-left")
#end
- </div>
#end
#elseif ( $position.equalsIgnoreCase( "left" ) )
#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- <div class="xleft">
- #breadcrumbs( $breadcrumbs )
- </div>
+ #breadcrumbs( $breadcrumbs "pull-left" )
#end
#end
#end
@@ -533,7 +527,7 @@
<div class="container-fluid">
<a class="brand" href="$relativePath/index.html">$project.name</a>
<ul class="nav">
- #links( $decoration.body.links )#publishDate( "right"
$decoration.publishDate $decoration.version )
+ #links( $decoration.body.links )
</ul>
</div>
</div>
@@ -549,6 +543,7 @@
<div id="breadcrumbs">
<ul class="breadcrumb">
#publishDate( "left" $decoration.publishDate $decoration.version )
+ #publishDate( "right" $decoration.publishDate $decoration.version )
</ul>
</div>
