You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/10/01 14:55:56 UTC
[maven-fluido-skin] 01/03: Rename $decoration to $site
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch site-model-rework
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit f7dc2c1fd8badba0ede566297b0ba89340afa121
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 1 15:10:20 2023 +0200
Rename $decoration to $site
---
src/main/resources/META-INF/maven/site-macros.vm | 100 +++++++++++------------
src/main/resources/META-INF/maven/site.vm | 80 +++++++++---------
2 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 2cf84a7..cbdacde 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -56,7 +56,7 @@
#**##end
#**##if( $link.href || $dotSlashOnEmptyHref == "always" )
#* *##set ( $href = $link.href )
-#* *##if ( !$decoration.isLink( $href ) )
+#* *##if ( !$site.isLink( $href ) )
#* *##set ( $href = $PathTool.calculateLink( $href, $relativePath ) )
#* *##set ( $href = $href.replaceAll( '\\', '/' ) )
#* *##if ( $href == "" && ( $dotSlashOnEmptyHref == "set" || $dotSlashOnEmptyHref == "always" ) )
@@ -115,7 +115,7 @@
#end
##
#macro ( image2 $image $class )
-#* *##if ( !$decoration.isLink( $image.src ) )
+#* *##if ( !$site.isLink( $image.src ) )
#* *##set ( $src = $PathTool.calculateLink( $image.src, $relativePath ) )
#* *##set ( $src = $src.replace( '\\', '/' ) )
#* *##set ( $src = ' src="' + $src + '"' )
@@ -172,7 +172,7 @@
#end
##
#macro ( breadcrumbs $breadcrumbs $cssClass )
-#**##set ( $breadcrumbDivider = $decoration.getCustomValue( 'fluidoSkin.breadcrumbDivider', '/' ) )
+#**##set ( $breadcrumbDivider = $site.getCustomValue( 'fluidoSkin.breadcrumbDivider', '/' ) )
#**##foreach( $item in $breadcrumbs )
<li#if ( $cssClass )class="$cssClass"#end>##
#* *##link2( $item false false "a" "always" )
@@ -180,8 +180,8 @@
#* *#</li>
#**##end
#**### add Edit button if content is editable
-#**##if( $decoration.edit && $docRenderingContext.editable )
-#* *##set ( $edit = ' <a href="' + $docRenderingContext.getDoxiaSourcePath( $decoration.edit ) + '"><img src="' + $relativePath + '/images/accessories-text-editor.png" alt="' + $text.get( "template.edit" ) + '" /></a>' )
+#**##if( $site.edit && $docRenderingContext.editable )
+#* *##set ( $edit = ' <a href="' + $docRenderingContext.getDoxiaSourcePath( $site.edit ) + '"><img src="' + $relativePath + '/images/accessories-text-editor.png" alt="' + $text.get( "template.edit" ) + '" /></a>' )
#**##end
#**##if ( $shortTitle )
<li class="active $cssClass">$esc.xml( $shortTitle )$!edit</li>
@@ -282,22 +282,22 @@ $indent </ul>##
#**##end
#end
##
-#macro ( publishDate $position $decorationPublishDate $version )
+#macro ( publishDate $position $sitePublishDate $version )
#**##if ( $publishDate )
#* *##set ( $dateValue = $date.format( $publishDate ) )
#**##else
#* *##set ( $dateValue = $date )
#**##end
##
-#**##set ( $datePosition = $decorationPublishDate.position )
+#**##set ( $datePosition = $sitePublishDate.position )
#**##set ( $versionPosition = $version.position )
##
-#**##set ( $breadcrumbs = $decoration.body.breadcrumbs )
-#**##set ( $links = $decoration.body.links )
+#**##set ( $breadcrumbs = $site.body.breadcrumbs )
+#**##set ( $links = $site.body.links )
##
#**##if ( $datePosition.equalsIgnoreCase( "right" ) && ( $versionPosition.equalsIgnoreCase( "right" ) || !$topBarEnabled
- && $decoration.body.links
- && $decoration.body.links.size() > 0 ) )
+ && $site.body.links
+ && $site.body.links.size() > 0 ) )
#* *##set ( $prefix = '<span class="divider">|</span> ' )
#**##else
#* *##set ( $prefix = "" )
@@ -309,8 +309,8 @@ $indent </ul>##
#* *##if ( $versionPosition.equalsIgnoreCase( $position ) )
<li id="projectVersion" class="pull-right">##
#* *##if ( !$topBarEnabled
- && $decoration.body.links
- && $decoration.body.links.size() > 0 )
+ && $site.body.links
+ && $site.body.links.size() > 0 )
#* *#<span class="divider">|</span>##
#* *##end
#* *#$text.get( "template.version" ): ${project.version}##
@@ -380,7 +380,7 @@ $indent </ul>##
#end
##
#macro ( googleAnalytics )
-#set ( $accountId = $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.accountId' ) )
+#set ( $accountId = $site.getCustomValue( 'fluidoSkin.googleAnalytics.accountId' ) )
#**##if( $accountId && $accountId != "" )
<!-- Google Analytics -->
<script>
@@ -390,10 +390,10 @@ $indent </ul>##
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '$accountId', 'auto');
ga('send', 'pageview');
-#**##if( $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.anonymizeIp', 'true' ) ) )
+#**##if( $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.googleAnalytics.anonymizeIp', 'true' ) ) )
ga('set', 'anonymizeIp', true);
#**##end
-#**##if( $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.googleAnalytics.forceSSL', 'true' ) ) )
+#**##if( $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.googleAnalytics.forceSSL', 'true' ) ) )
ga('set', 'forceSSL', true);
#**##end
</script>
@@ -401,13 +401,13 @@ $indent </ul>##
#end
#macro ( matomo )
-#**##if ( $decoration.getCustomValue( 'matomo.url' ) && $decoration.getCustomValue( 'matomo.url' ) != ''
-&& $decoration.getCustomValue( 'matomo.siteId' ) && $decoration.getCustomValue( 'matomo.siteId' ) != '')
+#**##if ( $site.getCustomValue( 'matomo.url' ) && $site.getCustomValue( 'matomo.url' ) != ''
+&& $site.getCustomValue( 'matomo.siteId' ) && $site.getCustomValue( 'matomo.siteId' ) != '')
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
-#* *##foreach( $option in $decoration.getCustomChild( 'matomo.options' ).getChildren() )
+#* *##foreach( $option in $site.getCustomChild( 'matomo.options' ).getChildren() )
#* *##if( $option.value && $option.value != "" )
_paq.push(['$option.name', '$option.value']);
#* *##else
@@ -416,9 +416,9 @@ $indent </ul>##
#* *##end
(function() {
- var u="$decoration.getCustomValue( 'matomo.url' )";
+ var u="$site.getCustomValue( 'matomo.url' )";
_paq.push(['setTrackerUrl', u+'/matomo.php']);
- _paq.push(['setSiteId', '$decoration.getCustomValue( 'matomo.siteId' )']);
+ _paq.push(['setSiteId', '$site.getCustomValue( 'matomo.siteId' )']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
})();
@@ -430,8 +430,8 @@ $indent </ul>##
##
#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.getCustomChild( 'fluidoSkin.googleSearch.sitesearch' ) )
-#* *##set( $sitesearchValue = $decoration.getCustomValue( 'fluidoSkin.googleSearch.sitesearch' ) )
+#**##if( $site.getCustomChild( 'fluidoSkin.googleSearch.sitesearch' ) )
+#* *##set( $sitesearchValue = $site.getCustomValue( 'fluidoSkin.googleSearch.sitesearch' ) )
#**##else
#* *##set( $startIndex = $project.url.indexOf("://") + 3 )
#* *##set( $sitesearchValue = $project.url.substring( $startIndex, $project.url.length() ) )
@@ -444,7 +444,7 @@ $indent </ul>##
#macro ( forkMeOnGitHubHead )
##
#* *##set ( $ribbonColor = 'red' )
-#* *##set ( $definedRibbonColor = $decoration.getCustomChild( 'fluidoSkin.gitHub.ribbonColor' ) )
+#* *##set ( $definedRibbonColor = $site.getCustomChild( 'fluidoSkin.gitHub.ribbonColor' ) )
##
#* *##if ( $definedRibbonColor
&& ($definedRibbonColor.getValue().equalsIgnoreCase( "green" )
@@ -457,22 +457,22 @@ $indent </ul>##
#end
##
#macro ( forkMeOnGitHub )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.gitHub.projectId' ) )
+#**##if ( $site.getCustomChild( 'fluidoSkin.gitHub.projectId' ) )
##
-#* *##set ( $gitHubProjectId = $decoration.getCustomValue( 'fluidoSkin.gitHub.projectId' ) )
+#* *##set ( $gitHubProjectId = $site.getCustomValue( 'fluidoSkin.gitHub.projectId' ) )
##
#* *##set ( $ribbonOrientation = 'left-top' )
-#* *##if ( $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right' )
- || $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right-top' ) )
+#* *##if ( $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right' )
+ || $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right-top' ) )
#* *##set ( $ribbonOrientation = 'right-top' )
#* *##end
-#* *##if ( $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left' )
- || $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left-top' ) )
+#* *##if ( $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left' )
+ || $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left-top' ) )
#* *##set ( $ribbonOrientation = 'left-top' )
#* *##end
-#* *##if ( $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right-bottom' )
- || $decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left-bottom' ) )
-#* *##set ( $ribbonOrientation = "$decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation' ) fixed" )
+#* *##if ( $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'right-bottom' )
+ || $site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation', '' ).equalsIgnoreCase( 'left-bottom' ) )
+#* *##set ( $ribbonOrientation = "$site.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation' ) fixed" )
#* *##end
##
<a class="github-fork-ribbon $ribbonOrientation" href="https://github.com/$gitHubProjectId" data-ribbon="Fork me on GitHub">Fork me on GitHub</a>
@@ -481,7 +481,7 @@ $indent </ul>##
##
## activate profile background image if custom.fluidoSkin.profile value set to "retired", "pre-release" or "sandbox"
#macro ( prjProfile )
-#**##set ( $profile = $decoration.getCustomValue( 'fluidoSkin.profile', '' ) )
+#**##set ( $profile = $site.getCustomValue( 'fluidoSkin.profile', '' ) )
#**##if ( $profile.equalsIgnoreCase( "retired" )
|| $profile.equalsIgnoreCase( "pre-release" )
|| $profile.equalsIgnoreCase( "sandbox" ) )
@@ -490,7 +490,7 @@ $indent </ul>##
#end
##
#macro ( facebookLoadSDK )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
+#**##if ( $site.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
<!-- Load Facebook SDK for JavaScript -->
<div id="fb-root"></div>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/#if ( $locale.toString() )$locale#{else}en#end/sdk.js#xfbml=1&version=v6.0"></script>
@@ -498,30 +498,30 @@ $indent </ul>##
#end
##
#macro ( facebookLike $sideBarEnabled )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
+#**##if ( $site.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
##
#* *##set( $layout = 'box_count' )
#* *##if( !$sideBarEnabled )
#* *##set( $layout = 'button_count' )
#* *##end
-#* *##set( $layout = $decoration.getCustomValue( 'fluidoSkin.facebookLike.layout', $layout ) )
+#* *##set( $layout = $site.getCustomValue( 'fluidoSkin.facebookLike.layout', $layout ) )
##
#* *##set( $action = 'like' )
-#* *##if ( $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.facebookLike.recommend', 'false' ) ) )
+#* *##if ( $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.facebookLike.recommend', 'false' ) ) )
#* *##set( $action = 'recommend' )
#* *##end
##
-#* *##set( $shareButton = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.facebookLike.shareButton', 'false' ) ) )
+#* *##set( $shareButton = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.facebookLike.shareButton', 'false' ) ) )
##
<div class="fb-like#if( !$sideBarEnabled ) pull-right#end" style="border:none; margin-top: 10px" data-href="$project.url" data-layout="$layout" data-show-faces="false" data-action="$action" data-share="$shareButton"></div>
#**##end
#end
##
#macro ( followTwitter $sideBarEnabled )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.twitter.user' ) )
-#* *##set( $user = $decoration.getCustomValue( 'fluidoSkin.twitter.user' ) )
-#* *##set( $showUser = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.twitter.showUser', 'false' ) ) )
-#* *##set( $showFollowers = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.twitter.showFollowers', 'false' ) ) )
+#**##if ( $site.getCustomChild( 'fluidoSkin.twitter.user' ) )
+#* *##set( $user = $site.getCustomValue( 'fluidoSkin.twitter.user' ) )
+#* *##set( $showUser = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.twitter.showUser', 'false' ) ) )
+#* *##set( $showFollowers = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.twitter.showFollowers', 'false' ) ) )
##
#* *##if ( $sideBarEnabled )
#* *##set( $dataSize = "medium" )
@@ -545,8 +545,8 @@ $indent </ul>##
#end
##
#macro ( flattrHead )
-#**##if ( $decoration.getCustomChild( 'fluidoSkin.flattr.thing' )
- && ( $decoration.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) )
+#**##if ( $site.getCustomChild( 'fluidoSkin.flattr.thing' )
+ && ( $site.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) )
<script>
/* <![CDATA[ */
(function() {
@@ -560,13 +560,13 @@ $indent </ul>##
#end
##
#macro ( flattrBody $sideBarEnabled )
-#**##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 ) )
+#**##if ( $site.getCustomChild( 'fluidoSkin.flattr.thing' )
+ && ( $site.getCustomChild( 'fluidoSkin.flattr.url' ) || $project.url ) )
+#* *##set ( $flattrThing = $site.getCustomValue( 'fluidoSkin.flattr.thing' ) )
+#* *##set ( $flattrUrl = $site.getCustomValue( 'fluidoSkin.flattr.url', $project.url ) )
##
#* *##set ( $styleModifier = '' )
-#* *##if ( $decoration.getCustomValue( 'fluidoSkin.flattr.style', '' ).equalsIgnoreCase( 'compact' ) )
+#* *##if ( $site.getCustomValue( 'fluidoSkin.flattr.style', '' ).equalsIgnoreCase( 'compact' ) )
#* *##set ( $styleModifier = 'rev="flattr;button:compact;"' )
#* *##end
##
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 515e5b0..6b8fbb9 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -17,7 +17,7 @@
## under the License.
##
#parse( "site-macros.vm" )
-#set ( $skipGenerationDate = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.skipGenerationDate', 'false' ) ) )
+#set ( $skipGenerationDate = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.skipGenerationDate', 'false' ) ) )
<!--
| Generated by #generatedBy()
#if( $docRenderingContext && ( $docRenderingContext.generator || $docRenderingContext.doxiaSource ) ) from##
@@ -47,8 +47,8 @@
<link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
#**##prjProfile()
<script src="$relativePath/js/apache-maven-fluido-@project.version@.min.js"></script>
-#**##if( $decoration.body.head )
-#* *#$render.eval( $decoration.body.head )
+#**##if( $site.body.head )
+#* *#$render.eval( $site.body.head )
#**##end
#**##if( $headContent )$headContent#end
#**##googleAnalytics()
@@ -56,7 +56,7 @@
#**##flattrHead()
#**##forkMeOnGitHubHead()
</head>
-#**##set ( $topBarEnabled = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.topBarEnabled', 'false' ) ) && ! $standalone )
+#**##set ( $topBarEnabled = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.topBarEnabled', 'false' ) ) && ! $standalone )
#**##if ( $topBarEnabled )
<body class="topBarEnabled">
#**##else
@@ -65,12 +65,12 @@
#**##forkMeOnGitHub()
#**##facebookLoadSDK()
##
-#**##set ( $sideBarEnabled = $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.sideBarEnabled', 'true' ) ) && ! $standalone )
-#**##set ( $searchEnabled = $decoration.getCustomChild( 'fluidoSkin.googleSearch' )
- && ( $decoration.getCustomValue( 'fluidoSkin.googleSearch.sitesearch' ) || $project.url ) )
+#**##set ( $sideBarEnabled = $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.sideBarEnabled', 'true' ) ) && ! $standalone )
+#**##set ( $searchEnabled = $site.getCustomChild( 'fluidoSkin.googleSearch' )
+ && ( $site.getCustomValue( 'fluidoSkin.googleSearch.sitesearch' ) || $project.url ) )
##
#**##if ( $topBarEnabled )
-#* *##set ( $navBarStyle = $decoration.getCustomValue( 'fluidoSkin.navBarStyle', '' ) )
+#* *##set ( $navBarStyle = $site.getCustomValue( 'fluidoSkin.navBarStyle', '' ) )
<header id="topbar" class="navbar navbar-fixed-top $navBarStyle">
<div class="navbar-inner">
#* *##if ( $sideBarEnabled )
@@ -81,8 +81,8 @@
<span class="icon-bar"></span>
</a>
#* *##else
-#* *##if ( $decoration.getCustomValue( 'fluidoSkin.topBarContainerStyle' ) )
- <div class="container" style="$decoration.getCustomValue( 'fluidoSkin.topBarContainerStyle' )">
+#* *##if ( $site.getCustomValue( 'fluidoSkin.topBarContainerStyle' ) )
+ <div class="container" style="$site.getCustomValue( 'fluidoSkin.topBarContainerStyle' )">
<a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -99,12 +99,12 @@
<nav class="nav-collapse">
#* *##end
#* *##end
-#* *##if ( $decoration.getCustomChild( 'fluidoSkin.topBarIcon' ) )
-#* *##set ( $topBarIcon = $decoration.getCustomChild( 'fluidoSkin.topBarIcon' ) )
+#* *##if ( $site.getCustomChild( 'fluidoSkin.topBarIcon' ) )
+#* *##set ( $topBarIcon = $site.getCustomChild( 'fluidoSkin.topBarIcon' ) )
##
#* *##if ( $topBarIcon.getChild( 'href' ) )
#* *##set ( $hrf = $topBarIcon.getChild( 'href' ).getValue() )
-#* *##if ( !$decoration.isLink( $hrf ) )
+#* *##if ( !$site.isLink( $hrf ) )
#* *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
#* *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
#* *##if ( ( $hrf == '' ) )
@@ -113,15 +113,15 @@
#* *##end
#* *#<a class="brand" href="$hrf">##
##
-#* *##set ( $topBarIconName = $decoration.getCustomValue( 'fluidoSkin.topBarIcon.name', $project.name ) )
+#* *##set ( $topBarIconName = $site.getCustomValue( 'fluidoSkin.topBarIcon.name', $project.name ) )
##
#* *##if( $topBarIcon.getChild( 'src' ) )
#* *##set ( $src = $topBarIcon.getChild( 'src' ).getValue() )
-#* *##if ( !$decoration.isLink( $src ) )
+#* *##if ( !$site.isLink( $src ) )
#* *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
#* *##set ( $src = $src.replaceAll( '\\', '/' ) )
#* *##end
-#* *##set ( $alt = $decoration.getCustomValue( 'fluidoSkin.topBarIcon.alt', $topBarIconName ) )
+#* *##set ( $alt = $site.getCustomValue( 'fluidoSkin.topBarIcon.alt', $topBarIconName ) )
#* *#<img src="$src" #if( $alt ) alt="$esc.xml( $alt )"#end />
#* *##else
#* *#$esc.xml( $topBarIconName )
@@ -132,9 +132,9 @@
#* *##end
##
## ## MSKINS-31
-#* *##if( $decoration.body && $decoration.body.menus )
+#* *##if( $site.body && $site.body.menus )
<ul class="nav">
-#* *##topMenu( $decoration.body.menus )
+#* *##topMenu( $site.body.menus )
</ul>
#* *##end
##
@@ -154,14 +154,14 @@
#* *##end
##
## ## MSKINS-31
-#* *##if( $decoration.body
- && $decoration.body.links
- && $decoration.body.links.size() > 0 )
+#* *##if( $site.body
+ && $site.body.links
+ && $site.body.links.size() > 0 )
<ul class="nav pull-right">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown">$text.get( "template.externallinks" ) <b class="caret"></b></a>
<ul class="dropdown-menu">
-#* *##topLinks( $decoration.body.links )
+#* *##topLinks( $site.body.links )
</ul>
</li>
</ul>
@@ -183,16 +183,16 @@
#**##end
<header>
<div id="banner">
- <div class="pull-left">#banner( $decoration.bannerLeft "bannerLeft" )</div>
- <div class="pull-right">#banner( $decoration.bannerRight "bannerRight" )</div>
+ <div class="pull-left">#banner( $site.bannerLeft "bannerLeft" )</div>
+ <div class="pull-right">#banner( $site.bannerRight "bannerRight" )</div>
<div class="clear"><hr/></div>
</div>
-#* *##set ( $publishDateLeftContent = "#publishDate( 'left' $decoration.publishDate $decoration.version )" )
-#* *##set ( $publishDateRightContent = "#publishDate( 'right' $decoration.publishDate $decoration.version )" )
+#* *##set ( $publishDateLeftContent = "#publishDate( 'left' $site.publishDate $site.version )" )
+#* *##set ( $publishDateRightContent = "#publishDate( 'right' $site.publishDate $site.version )" )
#* *### MSITE-44
#* *##if ( !$topBarEnabled )
-#* *##set ( $linksContent = "#links( $decoration.body.links )" )
+#* *##set ( $linksContent = "#links( $site.body.links )" )
#* *##end
#* *##if ( $publishDateLeftContent.length() > 0 || $publishDateRightContent.length() > 0 ||
( $linksContent && $linksContent.length() > 0 ) )
@@ -208,14 +208,14 @@
</header>
##
#* *##if ( $sideBarEnabled )
-#* *##set ( $leftColumnClass = $decoration.getCustomValue( 'fluidoSkin.leftColumnClass', 'span2' ) )
+#* *##set ( $leftColumnClass = $site.getCustomValue( 'fluidoSkin.leftColumnClass', 'span2' ) )
##
<div class="row-fluid">
<header id="leftColumn" class="$leftColumnClass">
<nav class="well sidebar-nav">
-#* *##publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-#* *##mainMenu( $decoration.body.menus )
-#* *##publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
+#* *##publishDate( "navigation-top" $site.publishDate $site.version )
+#* *##mainMenu( $site.body.menus )
+#* *##publishDate( "navigation-bottom" $site.publishDate $site.version )
</nav>
<div class="well sidebar-nav">
#* *##if ( $searchEnabled )
@@ -228,16 +228,16 @@
<div class="clear"></div>
#* *##flattrBody( $sideBarEnabled )
<div class="clear"></div>
-#* *##builtByLogo( $decoration.poweredBy )
+#* *##builtByLogo( $site.poweredBy )
</div>
</div>
</header>
#* *##end
##
-#* *##set ( $bodyColumnClass = $decoration.getCustomValue( 'fluidoSkin.bodyColumnClass', 'span10' ) )
+#* *##set ( $bodyColumnClass = $site.getCustomValue( 'fluidoSkin.bodyColumnClass', 'span10' ) )
##
<main id="bodyColumn" #if ( $sideBarEnabled ) class="$bodyColumnClass" #end>
-#* *##if ( $convert.toBoolean( $decoration.getCustomValue( 'fluidoSkin.sourceLineNumbersEnabled', 'false' ) ) )
+#* *##if ( $convert.toBoolean( $site.getCustomValue( 'fluidoSkin.sourceLineNumbersEnabled', 'false' ) ) )
#* *##set ( $sourceStyle = "prettyprint linenums" )
#* *##else
#* *##set ( $sourceStyle = "prettyprint" )
@@ -261,19 +261,19 @@
#* *##else
<div class="row">
#* *##end
-#* *##if ( $decoration.body.footer )
-#* *#$render.eval( $decoration.body.footer )
+#* *##if ( $site.body.footer )
+#* *#$render.eval( $site.body.footer )
#* *##else
-#* *##if ( $decoration.getCustomChild( 'fluidoSkin.copyrightClass' ) )
-#* *##set ( $copyrightClass = ' class="' + $decoration.getCustomValue( 'fluidoSkin.copyrightClass' ) + '"' )
+#* *##if ( $site.getCustomChild( 'fluidoSkin.copyrightClass' ) )
+#* *##set ( $copyrightClass = ' class="' + $site.getCustomValue( 'fluidoSkin.copyrightClass' ) + '"' )
#* *##end
- <p$!copyrightClass>$esc.unicode( '\u00A9' )#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
+ <p$!copyrightClass>$esc.unicode( '\u00A9' )#copyright()#publishDate( "bottom" $site.publishDate $site.version )</p>
#* *##end
</div>
##
#* *##if ( !$sideBarEnabled )
<p id="poweredBy" class="pull-right">##
-#* *##builtByLogo( $decoration.poweredBy )
+#* *##builtByLogo( $site.poweredBy )
#* *#</p>
#* *##end
</div>