This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch site-37snapshot
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
The following commit(s) were added to refs/heads/site-37snapshot by this push:
new dd4c3cb [MSKINS-141] simplified custom skin configuration code
dd4c3cb is described below
commit dd4c3cb9a00114ad1e5811b58ae0baf64ba70dbb
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Thu Dec 28 17:41:25 2017 +0100
[MSKINS-141] simplified custom skin configuration code
---
src/main/resources/META-INF/maven/site-macros.vm | 103 ++++++++---------------
src/main/resources/META-INF/maven/site.vm | 87 +++++--------------
src/main/resources/META-INF/maven/skin.xml | 2 +-
3 files changed, 56 insertions(+), 136 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm
b/src/main/resources/META-INF/maven/site-macros.vm
index bf7a33a..810f170 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -224,6 +224,7 @@
##
##
#macro ( breadcrumbs $breadcrumbs $cssClass )
+#**##set ( $breadcrumbDivider = $decoration.getCustomValue(
'fluidoSkin.breadcrumbDivider', '/' ) )
#**##foreach( $item in $breadcrumbs )
#* *##set ( $currentItemHref = $PathTool.calculateLink( $item.href,
$relativePath ) )
#* *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
@@ -233,23 +234,17 @@
##
<li class="$cssClass">##
#* *##link( $currentItemHref $item.name $item.target $item.img $item.position
$item.alt $item.border $item.width $item.height false )
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'breadcrumbDivider' ) )
-#* *##set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'breadcrumbDivider' ).getValue() )
-#* *##else
-#* *##set ( $breadcrumbDivider = '/' )
-#* *##end
#* *#<span class="divider">$breadcrumbDivider</span>##
#* *#</li>
#**##end
#**### add Edit button if content is editable
-#**##set ( $edit = '' )
#**##if( $decoration.edit && $docRenderingContext.editable )
#* *##set ( $edit = ' <a href="' + $docRenderingContext.getDoxiaSourcePath(
$decoration.edit ) + '"><img src="' + $relativePath +
'/images/accessories-text-editor.png" title="Edit" /></a>' )
#**##end
#**##if ( $shortTitle )
- <li class="active $cssClass">$shortTitle$edit</li>
+ <li class="active $cssClass">$shortTitle$!edit</li>
#**##else
- <li class="active $cssClass">$title$edit</li>
+ <li class="active $cssClass">$title$!edit</li>
#**##end
#end
##
@@ -585,10 +580,10 @@
##
##
#macro ( piwik )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'piwik'
).getChild( 'piwikUrl' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'piwik'
).getChild( 'idsite' ) )
-#* *##set ( $piwikUrl = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'piwik' ).getChild( 'piwikUrl' ).getValue() )
-#* *##set ( $idsite = $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'piwik' ).getChild( 'idsite' ).getValue() )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.piwik.piwikUrl' )
+ && $decoration.getCustomChild( 'fluidoSkin.piwik.idsite' ) )
+#* *##set ( $piwikUrl = $decoration.getCustomValue(
'fluidoSkin.piwik.piwikUrl' ) )
+#* *##set ( $idsite = $decoration.getCustomValue( 'fluidoSkin.piwik.idsite'
) )
##
<!-- Piwik -->
<script type="text/javascript">
@@ -627,8 +622,8 @@
##
#macro ( googleSearch $top )
<form id="search-form" action="https://www.google.com/search"; method="get" #if
( $top ) class="navbar-search pull-right" #end>
-#**##if( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch'
).getChild( 'sitesearch' ) )
-#* *##set( $sitesearchValue = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'googleSearch' ).getChild( 'sitesearch' ).getValue() )
+#**##if( $decoration.getCustomChild( 'fluidoSkin.googleSearch.sitesearch' ) )
+#* *##set( $sitesearchValue = $decoration.getCustomValue(
'fluidoSkin.googleSearch.sitesearch' ) )
#**##else
#* *##set( $startIndex = $project.url.indexOf("://") + 3 )
#* *##set( $sitesearchValue = $project.url.substring( $startIndex,
$project.url.length() ) )
@@ -642,24 +637,22 @@
##
##
#macro ( forkMeOnGitHub )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'gitHub' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'gitHub'
).getChild( 'projectId' ) )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.gitHub.projectId' ) )
##
-#* *##set ( $gitHubProjectId = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'gitHub' ).getChild( 'projectId' ).getValue() )
+#* *##set ( $gitHubProjectId = $decoration.getCustomValue(
'fluidoSkin.gitHub.projectId' ) )
##
#* *##set ( $leftRibbon = { "red" : "forkme_left_red_aa0000.png", "green" :
"forkme_left_green_007200.png", "black" : "forkme_left_darkblue_121621.png",
"darkblue" : "forkme_left_darkblue_121621.png", "orange" :
"forkme_left_orange_ff7600.png", "gray" : "forkme_left_gray_6d6d6d.png" } )
#* *##set ( $rightRibbon = { "red" : "forkme_right_red_aa0000.png", "green" :
"forkme_right_green_007200.png", "black" : "forkme_right_darkblue_121621.png",
"darkblue" : "forkme_right_darkblue_121621.png", "orange" :
"forkme_right_orange_ff7600.png", "gray" : "forkme_right_gray_6d6d6d.png" } )
##
#* *##set ( $ribbon = $leftRibbon )
#* *##set ( $ribbonOrientation = 'left' )
-#* *##set ( $definedRibbonOrientation = $decoration.custom.getChild(
'fluidoSkin' ).getChild( 'gitHub' ).getChild( 'ribbonOrientation' ) )
-#* *##if ( $definedRibbonOrientation &&
$definedRibbonOrientation.getValue().equalsIgnoreCase( "right" ) )
+#* *##if ( $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation',
'' ).equalsIgnoreCase( 'right' ) )
#* *##set ( $ribbonOrientation = 'right' )
#* *##set ( $ribbon = $rightRibbon )
#* *##end
##
#* *##set ( $ribbonColor = 'red' )
-#* *##set ( $definedRibbonColor = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'gitHub' ).getChild( 'ribbonColor' ) )
+#* *##set ( $definedRibbonColor = $decoration.getCustomChild(
'fluidoSkin.gitHub.ribbonColor' ) )
##
#* *##if ( $definedRibbonColor
&& ( $definedRibbonColor.getValue().equalsIgnoreCase( "red" )
@@ -681,21 +674,18 @@
##
## activate profile background image if custom.fluidoSkin.profile value set to
"retired", "pre-release" or "sandbox"
#macro ( prjProfile )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'profile' ) )
-#* *##set ( $profile = $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'profile' ).getValue() )
-#* *##if ( $profile.equalsIgnoreCase( "retired" )
+#**##set ( $profile = $decoration.getCustomValue( 'fluidoSkin.profile', '' ) )
+#**##if ( $profile.equalsIgnoreCase( "retired" )
|| $profile.equalsIgnoreCase( "pre-release" )
|| $profile.equalsIgnoreCase( "sandbox" ) )
<style type="text/css">body{background-image:
url('$relativePath/images/profiles/${profile}.png');}</style>
-#* *##end
#**##end
#end
##
##
##
#macro ( googlePlusOne $sideBarEnabled )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googlePlusOne' )
- && $project.url )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.googlePlusOne' ) &&
$project.url )
#* *##set( $dataSize = 'tall' )
#* *##if( !$sideBarEnabled )
#* *##set( $dataSize = 'medium' )
@@ -714,9 +704,7 @@
##
##
#macro ( facebookLike $sideBarEnabled )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'facebookLike'
)
- && $project.url )
-#* *##set( $facebookLike = $decoration.custom.getChild( 'facebookLike' ) )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.facebookLike' ) &&
$project.url )
## ## kindly hardcoded
##
#* *##set( $layout = 'box_count' )
@@ -743,23 +731,10 @@
##
##
#macro ( followTwitter $sideBarEnabled )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter'
).getChild( 'user' ) )
-#* *##set ( $user = $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'twitter' ).getChild( 'user' ).getValue() )
-##
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter'
).getChild( 'showUser' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter'
).getChild( 'showUser' ).getValue().equalsIgnoreCase( "true" ) )
-#* *##set( $showUser = true )
-#* *##else
-#* *##set( $showUser = false )
-#* *##end
-##
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter'
).getChild( 'showFollowers' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'twitter'
).getChild( 'showFollowers' ).getValue().equalsIgnoreCase( "true" ) )
-#* *##set( $showFollowers = true )
-#* *##else
-#* *##set( $showFollowers = false )
-#* *##end
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.twitter.user' ) )
+#* *##set( $user = $decoration.getCustomValue( 'fluidoSkin.twitter.user' ) )
+#* *##set( $showUser = $decoration.getCustomValue(
'fluidoSkin.twitter.showUser', '' ).equalsIgnoreCase( 'true' ) )
+#* *##set( $showFollowers = $decoration.getCustomValue(
'fluidoSkin.twitter.showFollowers', '' ).equalsIgnoreCase( 'true' ) )
##
#* *##if ( $sideBarEnabled )
#* *##set( $dataSize = "medium" )
@@ -785,14 +760,13 @@
##
##
#macro ( ohloh )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'ohloh' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'ohloh'
).getChild( 'projectId' ) )
-#* *##set ( $projectId = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'ohloh' ).getChild( 'projectId' ).getValue() )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.ohloh.projectId' ) )
+#* *##set ( $projectId = $decoration.getCustomValue(
'fluidoSkin.ohloh.projectId' ) )
##
#* *##set( $widget = "users_logo.js" )
##
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'ohloh'
).getChild( 'widget' ) )
-#* *##set( $definedWidget = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'ohloh' ).getChild( 'widget' ).getValue() )
+#* *##if ( $decoration.getCustomChild( 'fluidoSkin.ohloh.widget' ) )
+#* *##set( $definedWidget = $decoration.getCustomValue(
'fluidoSkin.ohloh.widget' ) )
##
#* *##if ( $definedWidget.equalsIgnoreCase( "users-logo" ) )
#* *##set( $widget = "users_logo.js" )
@@ -832,10 +806,8 @@
##
##
#macro ( flattrHead )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'thing' )
- && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'url' )
- || $project.url ) )
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.flattr.thing' )
+ && ( $decoration.getCustomChild( 'fluidoSkin.flattr.url' ) ||
$project.url ) )
<script type="text/javascript">
/* <![CDATA[ */
(function() {
@@ -852,23 +824,14 @@
##
##
#macro ( flattrBody $sideBarEnabled )
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'thing' )
- && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'url' )
- || $project.url ) )
-#* *##set ( $flattrThing = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'flattr' ).getChild( 'thing' ).getValue() )
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'url' ) )
-#* *##set ( $flattrUrl = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'flattr' ).getChild( 'url' ).getValue() )
-#* *##else
-#* *##set ( $flattrUrl = $project.url )
-#* *##end
+#**##if ( $decoration.getCustomChild( 'fluidoSkin.flattr.thing' )
+ && ( $decoration.getCustomChild( 'fluidoSkin.flattr.url' ) ||
$project.url ) )
+#* *##set ( $flattrThing = $decoration.getCustomValue(
'fluidoSkin.flattr.thing' ) )
+#* *##set ( $flattrUrl = $decoration.getCustomValue( 'fluidoSkin.flattr.url',
$project.url ) )
##
#* *##set ( $styleModifier = '' )
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'flattr'
).getChild( 'style' ) )
-#* *##set ( $style = $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'flattr' ).getChild( 'style' ).getValue() )
-#* *##if ( $style.equalsIgnoreCase( 'compact' ) )
-#* *##set ( $styleModifier = 'rev="flattr;button:compact;"' )
-#* *##end
+#* *##if ( $decoration.getCustomValue( 'fluidoSkin.flattr.style', ''
).equalsIgnoreCase( 'compact' ) )
+#* *##set ( $styleModifier = 'rev="flattr;button:compact;"' )
#* *##end
##
#* *##if ( $sideBarEnabled )
diff --git a/src/main/resources/META-INF/maven/site.vm
b/src/main/resources/META-INF/maven/site.vm
index aab5710..d6ea885 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -16,18 +16,14 @@
## specific language governing permissions and limitations
## under the License.
#parse( "site-macros.vm" )
+#set ( $skipGenerationDate = 'true' == $decoration.getCustomValue(
'fluidoSkin.skipGenerationDate' ) )
<!--
-#* *##set ( $skipGenerationDate = false )
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild( 'skipGenerationDate' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'skipGenerationDate' ).getValue() == 'true' )
-#* *##set ( $skipGenerationDate = true )
-#* *##end
| Generated by Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion
) $doxiaSiteRendererVersion#end##
#if( $docRenderingContext && ( $docRenderingContext.generator ||
$docRenderingContext.doxiaSource ) ) from##
-#if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
-#if( $docRenderingContext.doxiaSource )
$docRenderingContext.doxiaSourcePath#end##
+#**##if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
+#**##if( $docRenderingContext.doxiaSource )
$docRenderingContext.doxiaSourcePath#end##
#end
-#if ( !$skipGenerationDate ) at $dateFormat.format( $currentDate ) #end
+#if ( !$skipGenerationDate ) at $dateFormat.format( $currentDate )#end
| Rendered using Apache Maven Fluido Skin @project.version@
-->
@@ -62,39 +58,20 @@
#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
#**##flattrHead()
</head>
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' )
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'topBarEnabled' )
- && 'true' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'topBarEnabled' ).getValue() )
-#**##set( $topBarEnabled = true )
+#**##set ( $topBarEnabled = 'true' == $decoration.getCustomValue(
'fluidoSkin.topBarEnabled' ) )
+#**##if ( $topBarEnabled )
<body class="topBarEnabled">
#**##else
<body class="topBarDisabled">
#**##end
#**##forkMeOnGitHub()
##
-#**##set ( $sideBarEnabled = true )
-#**##if ( $decoration.custom.getChild('fluidoSkin') )
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sideBarEnabled' )
- && 'false' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sideBarEnabled' ).getValue() )
-#* *##set ( $sideBarEnabled = false )
-#* *##end
-##
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' )
- && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'googleSearch' ).getChild( 'sitesearch' )
- || $project.url ) )
-#* *##set ( $searchEnabled = true )
-#* *##else
-#* *##set ( $searchEnabled = false )
-#* *##end
-#**##end
+#**##set ( $sideBarEnabled = 'false' != $decoration.getCustomValue(
'fluidoSkin.sideBarEnabled' ) )
+#**##set ( $searchEnabled = $decoration.getCustomChild(
'fluidoSkin.googleSearch' )
+ && ( $decoration.getCustomValue(
'fluidoSkin.googleSearch.sitesearch' ) || $project.url ) )
##
#**##if ( $topBarEnabled )
-#* *##if ( $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'navBarStyle' ) )
-#* *##set ( $navBarStyle = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'navBarStyle' ).getValue())
-#* *##else
-#* *##set ( $navBarStyle = '')
-#* *##end
+#* *##set ( $navBarStyle = $decoration.getCustomValue(
'fluidoSkin.navBarStyle', '' ) )
<div id="topbar" class="navbar navbar-fixed-top $navBarStyle">
<div class="navbar-inner">
#* *##if ( $sideBarEnabled )
@@ -105,16 +82,14 @@
<span class="icon-bar"></span>
</a>
#* *##else
-#* *##if ( $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'topBarContainerStyle' ) )
- <div class="container" style="$decoration.custom.getChild(
'fluidoSkin' ).getChild( 'topBarContainerStyle' ).getValue()"><div
class="nav-collapse">
+#* *##if ( $decoration.getCustomValue( 'fluidoSkin.topBarContainerStyle'
) )
+ <div class="container" style="$decoration.getCustomValue(
'fluidoSkin.topBarContainerStyle' )"><div class="nav-collapse">
#* *##else
<div class="container"><div class="nav-collapse">
#* *##end
#* *##end
-#* *##if ( $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'topBarIcon' ) )
-#* *##set ( $topBarIcon = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'topBarIcon' ) )
+#* *##if ( $decoration.getCustomChild( 'fluidoSkin.topBarIcon' ) )
+#* *##set ( $topBarIcon = $decoration.getCustomChild(
'fluidoSkin.topBarIcon' ) )
##
#* *##if ( $topBarIcon.getChild( 'href' ) )
#* *##set ( $hrf = $topBarIcon.getChild( 'href' ).getValue() )
@@ -127,11 +102,7 @@
#* *##end
#* *#<a class="brand" href="$hrf" #if( $topBarIcon.getChild( 'alt' ) )
title="$topBarIcon.getChild( 'alt' ).getValue()"#end>##
##
-#* *##if( $topBarIcon.getChild( 'name' ) )
-#* *##set ( $topBarIconName = $topBarIcon.getChild( 'name'
).getValue() )
-#* *##else
-#* *##set ( $topBarIconName = $project.name )
-#* *##end
+#* *##set ( $topBarIconName = $decoration.getCustomValue(
'fluidoSkin.topBarIcon.name', $project.name ) )
##
#* *##if( $topBarIcon.getChild( 'src' ) )
#* *##set ( $src = $topBarIcon.getChild( 'src' ).getValue() )
@@ -139,11 +110,7 @@
#* *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
#* *##set ( $src = $src.replaceAll( '\\', '/' ) )
#* *##end
-#* *##if ( $topBarIcon.getChild( 'alt' ) )
-#* *##set ( $alt = $topBarIcon.getChild( 'alt' ).getValue() )
-#* *##else
-#* *##set ( $alt = $topBarIconName )
-#* *##end
+#* *##set ( $alt = $decoration.getCustomValue(
'fluidoSkin.topBarIcon.alt', $topBarIconName ) )
#* *#<img src="$src" alt="$alt" />
#* *##else
#* *#$topBarIconName
@@ -232,12 +199,8 @@
</ul>
</div>
##
-#* *##if ( $sideBarEnabled )
-#* *##set ($leftColumnClass="span2")
-#* *##if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'leftColumnClass' ) )
-#* *##set ( $leftColumnClass = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'leftColumnClass' ).getValue() )
-#* *##end
+#* *##if ( $sideBarEnabled )
+#* *##set ( $leftColumnClass = $decoration.getCustomValue(
'fluidoSkin.leftColumnClass', 'span2' ) )
##
<div class="row-fluid">
<div id="leftColumn" class="$leftColumnClass">
@@ -264,19 +227,13 @@
</div>
#* *##end
##
-#* *##set ($bodyColumnClass="span10")
-#* *##if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'bodyColumnClass' ) )
-#* *##set ( $bodyColumnClass = $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'bodyColumnClass' ).getValue() )
-#* *##end
+#* *##set ( $bodyColumnClass = $decoration.getCustomValue(
'fluidoSkin.bodyColumnClass', 'span10' ) )
##
<div id="bodyColumn" #if ( $sideBarEnabled ) class="$bodyColumnClass"
#end>
#* *##if ( $title && $title.endsWith( "Project License" ) )
#* *#$bodyContent
#* *##else
-#* *##if ( $decoration.custom.getChild('fluidoSkin')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild(
'sourceLineNumbersEnabled' )
- && 'true' == $decoration.custom.getChild( 'fluidoSkin'
).getChild( 'sourceLineNumbersEnabled' ).getValue() )
+#* *##if ( 'true' == $decoration.getCustomValue(
'fluidoSkin.sourceLineNumbersEnabled' ) )
#* *##set ( $sourceStyle = "prettyprint linenums" )
#* *##else
#* *##set ( $sourceStyle = "prettyprint" )
@@ -304,8 +261,8 @@
#* *##if ( $decoration.body.footer )
#* *#$render.eval( $decoration.body.footer )
#* *##else
-#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
-#* *##set ( $copyrightClass = ' class="' + $decoration.custom.getChild(
'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
+#* *##if ( $decoration.getCustomChild( 'fluidoSkin.copyrightClass' ) )
+#* *##set ( $copyrightClass = ' class="' + $decoration.getCustomValue(
'fluidoSkin.copyrightClass' ) + '"' )
#* *##end
<p$!copyrightClass>Copyright ©#copyright()All rights
reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
#* *##end
diff --git a/src/main/resources/META-INF/maven/skin.xml
b/src/main/resources/META-INF/maven/skin.xml
index fc8ca74..b5c1d39 100644
--- a/src/main/resources/META-INF/maven/skin.xml
+++ b/src/main/resources/META-INF/maven/skin.xml
@@ -22,6 +22,6 @@ under the License.
<skin xmlns="http://maven.apache.org/SKIN/1.7.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/SKIN/1.7.0
http://maven.apache.org/xsd/skin-1.7.0.xsd";>
<prerequisites>
- <doxia-sitetools>1.7.1</doxia-sitetools>
+ <doxia-sitetools>1.8</doxia-sitetools>
</prerequisites>
</skin>
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <commits@maven.apache.org>'].
