You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2017/04/21 19:26:40 UTC

svn commit: r1792238 [8/8] - in /logging/log4net/trunk: ./ src/site/ src/site/resources/css/ src/site/resources/images/ src/site/resources/images/logos/ src/site/resources/img/ src/site/resources/js/

Modified: logging/log4net/trunk/src/site/site.vm
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/site.vm?rev=1792238&r1=1792237&r2=1792238&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/site.vm (original)
+++ logging/log4net/trunk/src/site/site.vm Fri Apr 21 19:26:40 2017
@@ -1,28 +1,50 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
 #macro ( link $href $name $target $img $position $alt $border $width $height )
-  #set ( $linkTitle = ' title="' + $name + '"' )
-  #if( $target )
-    #set ( $linkTarget = ' target="' + $target + '"' )
-  #else
-    #set ( $linkTarget = "" )
-  #end
-  #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
-    $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
-    $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
-    #set ( $linkClass = ' class="externalLink"' )
-  #else
-    #set ( $linkClass = "" )
-  #end
-  #if ( $img )
-    #if ( $position == "left" )
-      <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
-    #else
-      <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
-    #end
-  #else
-    <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
-  #end
+	#set ( $linkTitle = ' title="' + $name + '"' )
+	#if( $target )
+		#set ( $linkTarget = ' target="' + $target + '"' )
+	#else
+		#set ( $linkTarget = "" )
+	#end
+	#if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
+		$href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
+		$href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
+		#set ( $linkClass = ' class="external" target="_blank"' )
+
+		#if ( $linkTarget )
+		#else
+			#set ( $linkTarget = "_blank" )
+		#end
+
+	#else
+		#set ( $linkClass = "" )
+	#end
+	#if ( $img )
+		#if ( $position == "left" )
+			<a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
+		#else
+			<a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
+		#end
+	#else
+		<a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
+	#end
 #end
 ##
 #macro ( image $img $alt $border $width $height )
@@ -104,163 +126,129 @@
 #end
 ##
 #macro ( links $links )
-  #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 $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
-    #if ( $links.size() > $counter )
-      |
-    #end
-  #end
+	<ul class="nav">
+	#set ( $counter = 0 )
+	#foreach( $item in $links )
+		#set ( $counter = $counter + 1 )
+		#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+		#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+		#set ( $activeClass = "" )
+		#if ( $alignedFileName == $currentItemHref)
+			#set ( $activeClass = ' class="active"' )
+		#end
+		<li$activeClass>
+		#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
+		</li>
+	#end
+	</ul>
 #end
 ##
 #macro ( breadcrumbs $breadcrumbs )
-  #foreach( $item in $breadcrumbs )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-    #if ( ( $currentItemHref == '' ) )
-      #set ( $currentItemHref = './' )
-    #end
-##
-      #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
-      &gt;
-  #end
-  $title
+	#foreach( $item in $breadcrumbs )
+		#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+		#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+		#if ( ( $currentItemHref == '' ) )
+			#set ( $currentItemHref = './' )
+		#end
+##
+			#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
+			<span class="divider">&gt;</span>
+	#end
+	$title
 #end
 ##
 #macro ( displayTree $display $item )
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #foreach( $subitem in $item.items )
-      #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
-      #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
-##
-      #if ( $alignedFileName == $subitemHref )
-        #set ( $display = true )
-      #end
-##
-      #displayTree( $display $subitem )
-    #end
-  #end
-#end
-##
-#macro ( menuItem $item )
-  #set ( $collapse = "none" )
-  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-  #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-##
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #if ( $item.collapse == false )
-      #set ( $collapse = "expanded" )
-    #else
-      ## By default collapsed
-      #set ( $collapse = "collapsed" )
-    #end
-##
-    #set ( $display = false )
-    #displayTree( $display $item )
-##
-    #if ( $alignedFileName == $currentItemHref || $display )
-      #set ( $collapse = "expanded" )
-    #end
-  #end
-  <li class="$collapse">
-  #if ( $item.img )
-    #if ( $item.position == "left" )
-      #if ( $alignedFileName == $currentItemHref )
-        <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
-      #else
-        #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
-      #end
-    #else
-      #if ( $alignedFileName == $currentItemHref )
-        <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
-      #else
-        #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
-      #end
-    #end
-  #else
-    #if ( $alignedFileName == $currentItemHref )
-      <strong>$item.name</strong>
-    #else
-      #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
-    #end
-  #end
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #if ( $collapse == "expanded" )
-      <ul>
-        #foreach( $subitem in $item.items )
-          #menuItem( $subitem )
-        #end
-      </ul>
-    #end
-  #end
-  </li>
+	#if ( $item && $item.items && $item.items.size() > 0 )
+		#foreach( $subitem in $item.items )
+			#set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+			#set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
+##
+			#if ( $alignedFileName == $subitemHref )
+				#set ( $display = true )
+			#end
+##
+			#displayTree( $display $subitem )
+		#end
+	#end
+#end
+##
+#macro ( menuItem $item $isComponentDocumentation )
+	#set ( $collapse = "none" )
+	#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+	#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+##
+	#if ( $item && $item.items && $item.items.size() > 0 )
+		#if ( $item.collapse == false )
+			#set ( $collapse = "expanded" )
+		#else
+			## By default collapsed
+			#set ( $collapse = "collapsed" )
+		#end
+##
+		#set ( $display = false )
+		#displayTree( $display $item )
+##
+		#if ( $alignedFileName == $currentItemHref || $display )
+			#set ( $collapse = "expanded" )
+		#end
+	#end
+	#set ( $active = "" )
+	#if ( $alignedFileName == $currentItemHref )
+	#set ($active = " active")
+	#end
+	#set ( $thisProjectDir = "../${project.artifactId}" )
+	#if ($thisProjectDir == $PathTool.getDirectoryComponent( $item.href ))
+	#set ($active = " active")
+	#end
+	#if (${project.artifactId} != "log4net" && $isComponentDocumentation &&
+				($item.href == "team-list.html" || $item.href == "mail-lists.html"
+				|| $item.href == "issue-tracking.html" || $item.href == "license.html"
+				|| $item.href == "source-repository.html"))
+	<!-- Removing overall project item $item.name from component-specific menu -->
+	#else
+		#set ($thisItemName = $item.name)
+		#if (${project.artifactId} != "log4net" && $isComponentDocumentation )
+		#set ($thisItemName = $item.name.replace("Project Information", "Component Project"))
+		#set ($thisItemName = $item.name.replace("Project", "Component"))
+		#end
+		<li class="$collapse$active">
+		#link($currentItemHref $thisItemName $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
+		#if ( $item && $item.items && $item.items.size() > 0 )
+			#if ( $collapse == "expanded" )
+				<ul>
+					#foreach( $subitem in $item.items )
+						#menuItem( $subitem $isComponentDocumentation )
+					#end
+				</ul>
+			#end
+		#end
+		</li>
+ 	#end
 #end
 ##
 #macro ( mainMenu $menus )
-  #foreach( $menu in $menus )
-    #if ( $menu.name )
-      #if ( $menu.img )
-        #if( $menu.position )
-          #set ( $position = $menu.position )
-        #else
-          #set ( $position = "left" )
-        #end
-##
-        #if ( ! ( $menu.img.toLowerCase().startsWith("http:/") || $menu.img.toLowerCase().startsWith("https:/") ||
-                $menu.img.toLowerCase().startsWith("ftp:/") || $menu.img.toLowerCase().startsWith("mailto:/") ||
-                $menu.img.toLowerCase().startsWith("file:/") || ($menu.img.toLowerCase().indexOf("://") != -1) ) )
-          #set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
-          #set ( $src = $src.replaceAll( '\\', '/' ) )
-          #set ( $src = ' src="' + $src + '"' )
-        #else
-          #set ( $src = ' src="' + $menu.img + '"' )
-        #end
-##
-        #if( $menu.alt )
-          #set ( $alt = ' alt="' + $menu.alt + '"' )
-        #else
-          #set ( $alt = ' alt="' + $menu.name + '"' )
-        #end
-##
-        #if( $menu.border )
-          #set ( $border = ' border="' + $menu.border + '"' )
-        #else
-          #set ( $border = ' border="0"' )
-        #end
-##
-        #if( $menu.width )
-          #set ( $width = ' width="' + $menu.width + '"' )
-        #else
-          #set ( $width = "" )
-        #end
-        #if( $menu.height )
-          #set ( $height = ' height="' + $menu.height + '"' )
-        #else
-          #set ( $height = "" )
-        #end
-##
-        #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
-##
-        #if ( $position == "left" )
-        <h5>$img $menu.name</h5>
-        #else
-        <h5>$menu.name $img</h5>
-        #end
-      #else
-       <h5>$menu.name</h5>
-      #end
-    #end
-    #if ( $menu.items && $menu.items.size() > 0 )
-    <ul>
-      #foreach( $item in $menu.items )
-        #menuItem( $item )
-      #end
-    </ul>
-    #end
-  #end
+	#foreach( $menu in $menus )
+		<ul class="nav nav-list">
+		#set ($isComponentDocumentation = false)
+ 		#if ( $menu.name )
+			#set ( $menuName = $menu.name )
+			#if ( $menuName == "Project Documentation" )
+			#set ( $menuName = "Component Documentation" )
+			#set ($isComponentDocumentation = true)
+			#end
+			#if ( $menu.img )
+			 <li class="nav-header"><i class="$menu.img"></i>$menuName</li>
+			#else
+			 <li class="nav-header">$menuName</li>
+			#end
+		#end
+		#if ( $menu.items && $menu.items.size() > 0 )
+			#foreach( $item in $menu.items )
+				#menuItem( $item $isComponentDocumentation )
+			#end
+		#end
+		</ul>
+	#end
 #end
 ##
 #macro ( copyright )
@@ -290,188 +278,183 @@
 #end
 ##
 #macro ( publishDate $position $publishDate $version )
-  #if ( $publishDate && $publishDate.format )
-    #set ( $format = $publishDate.format )
-  #else
-    #set ( $format = "yyyy-MM-dd" )
-  #end
-##
-  $dateFormat.applyPattern( $format )
-##
-  #set ( $dateToday = $dateFormat.format( $currentDate ) )
-##
-  #if ( $publishDate && $publishDate.position )
-    #set ( $datePosition = $publishDate.position )
-  #else
-    #set ( $datePosition = "left" )
-  #end
-##
-  #if ( $version )
-    #if ( $version.position )
-      #set ( $versionPosition = $version.position )
-    #else
-      #set ( $versionPosition = "left" )
-    #end
-  #else
-    #set ( $version = "" )
-    #set ( $versionPosition = "left" )
-  #end
+	#if ( $publishDate && $publishDate.format )
+		#set ( $format = $publishDate.format )
+	#else
+		#set ( $format = "yyyy-MM-dd" )
+	#end
+##
+	$dateFormat.applyPattern( $format )
+##
+	#set ( $dateToday = $dateFormat.format( $currentDate ) )
+##
+	#if ( $publishDate && $publishDate.position )
+		#set ( $datePosition = $publishDate.position )
+	#else
+		#set ( $datePosition = "left" )
+	#end
+##
+	#if ( $version )
+		#if ( $version.position )
+			#set ( $versionPosition = $version.position )
+		#else
+			#set ( $versionPosition = "left" )
+		#end
+	#else
+		#set ( $version = "" )
+		#set ( $versionPosition = "left" )
+	#end
 ##
-  #set ( $breadcrumbs = $decoration.body.breadcrumbs )
-  #set ( $links = $decoration.body.links )
+	#set ( $breadcrumbs = $decoration.body.breadcrumbs )
+	#set ( $links = $decoration.body.links )
 
-  #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
-    #set ( $prefix = "&nbsp;|" )
-  #else
-    #set ( $prefix = "" )
-  #end
-##
-  #if ( $datePosition.equalsIgnoreCase( $position ) )
-    #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
-      $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
-      #if ( $versionPosition.equalsIgnoreCase( $position ) )
-        &nbsp;| <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
-      #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 ) )
-          &nbsp;| <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>
-        #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          &nbsp;| <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
-        #end
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-        #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>
-    #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>
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          | #breadcrumbs( $breadcrumbs )
-        #end
-      </div>
-    #end
-  #elseif ( $position.equalsIgnoreCase( "left" ) )
-    #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-      <div class="xleft">
-        #breadcrumbs( $breadcrumbs )
-      </div>
-    #end
-  #end
+	#if ( $datePosition.equalsIgnoreCase( $position ) )
+		#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+			<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>
+			#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>
+				#end
+			</div>
+		#elseif ( $datePosition.equalsIgnoreCase("left") )
+			<div class="pull-left">
+				<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>
+				#end
+				#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+					<span class="divider">|</span> #breadcrumbs( $breadcrumbs )
+				#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>
+		#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="pull-left">
+				<span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+				#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+					<span class="divider">|</span> #breadcrumbs( $breadcrumbs )
+				#end
+			</div>
+		#end
+	#elseif ( $position.equalsIgnoreCase( "left" ) )
+		#if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+			<div class="pull-left">
+				#breadcrumbs( $breadcrumbs )
+			</div>
+		#end
+	#end
 #end
 ##
 #macro ( poweredByLogo $poweredBy )
-  #if( $poweredBy )
-    #foreach ($item in $poweredBy)
-      #if( $item.href )
-        #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
-        #set ( $href = $href.replaceAll( '\\', '/' ) )
-      #else
-        #set ( $href="http://maven.apache.org/" )
-      #end
-##
-      #if( $item.name )
-        #set ( $name = $item.name )
-      #else
-        #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
-        #set ( $name = "${name} Maven"  )
-      #end
-##
-      #if( $item.img )
-        #set ( $img = $item.img )
-      #else
-        #set ( $img = "images/logos/maven-feather.png" )
-      #end
-##
-      #if ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
-            $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
-            $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
-        #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-        #set ( $img = $img.replaceAll( '\\', '/' ) )
-      #end
-##
-      #if( $item.alt )
-        #set ( $alt = ' alt="' + $item.alt + '"' )
-      #else
-        #set ( $alt = ' alt="' + $name + '"' )
-      #end
-##
-      #if( $item.border )
-        #set ( $border = ' border="' + $item.border + '"' )
-      #else
-        #set ( $border = "" )
-      #end
-##
-      #if( $item.width )
-        #set ( $width = ' width="' + $item.width + '"' )
-      #else
-        #set ( $width = "" )
-      #end
-      #if( $item.height )
-        #set ( $height = ' height="' + $item.height + '"' )
-      #else
-        #set ( $height = "" )
-      #end
-##
-      <a href="$href" title="$name" class="poweredBy">
-        <img class="poweredBy" $alt src="$img" $border $width $height />
-      </a>
-    #end
-    #if( $poweredBy.isEmpty() )
-      <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-        <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-      </a>
-    #end
-  #else
-    <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-      <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-    </a>
-  #end
+	#if( $poweredBy )
+		#foreach ($item in $poweredBy)
+			#if( $item.href )
+				#set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+				#set ( $href = $href.replaceAll( '\\', '/' ) )
+			#else
+				#set ( $href="http://maven.apache.org/" )
+			#end
+##
+			#if( $item.name )
+				#set ( $name = $item.name )
+			#else
+				#set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )	)
+				#set ( $name = "${name} Maven"	)
+			#end
+##
+			#if( $item.img )
+				#set ( $img = $item.img )
+			#else
+				#set ( $img = "images/maven-feather.png" )
+			#end
+##
+			#if ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
+						$img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
+						$img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
+				#set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+				#set ( $img = $img.replaceAll( '\\', '/' ) )
+			#end
+##
+			#if( $item.alt )
+				#set ( $alt = ' alt="' + $item.alt + '"' )
+			#else
+				#set ( $alt = ' alt="' + $name + '"' )
+			#end
+##
+			#if( $item.border )
+				#set ( $border = ' border="' + $item.border + '"' )
+			#else
+				#set ( $border = "" )
+			#end
+##
+			#if( $item.width )
+				#set ( $width = ' width="' + $item.width + '"' )
+			#else
+				#set ( $width = "" )
+			#end
+			#if( $item.height )
+				#set ( $height = ' height="' + $item.height + '"' )
+			#else
+				#set ( $height = "" )
+			#end
+##
+			<a href="$href" title="$name" class="poweredBy">
+				<img class="poweredBy" $alt src="$img" $border $width $height />
+			</a>
+		#end
+		#if( $poweredBy.isEmpty() )
+			<a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+				<img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/maven-feather.png" />
+			</a>
+		#end
+	#else
+		<a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+			<img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/maven-feather.png" />
+		</a>
+	#end
 #end
 ##
 #macro ( googleAnalytics $accountId )
-  #if( $accountId && $accountId != "" )
-    <!-- Google Analytics -->
-    <script type="text/javascript">
-    
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '$accountId']);
-      _gaq.push(['_trackPageview']);
-
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
+	#if( $accountId && $accountId != "" )
+		<!-- Google Analytics -->
+		<script type="text/javascript">
 
-    </script>
-  #end
+			var _gaq = _gaq || [];
+			_gaq.push(['_setAccount', '$accountId']);
+			_gaq.push (['_gat._anonymizeIp']);
+			_gaq.push(['_trackPageview']);
+
+			(function() {
+				var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+				ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+				var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+			})();
+
+		</script>
+	#end
 #end
 ##
 <html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
-    <title>$title</title>
-    <style type="text/css" media="all">
-      @import url("$relativePath/css/maven-base.css");
-      @import url("$relativePath/css/maven-theme.css");
-      @import url("$relativePath/css/site.css");
-    </style>
-    <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+		<title>$title - $project.name</title>
+		<link rel="stylesheet" href="$relativePath/css/bootstrap.min.css" type="text/css" />
+		<link rel="stylesheet" href="$relativePath/css/site.css" type="text/css" />
+		<script type="text/javascript" src="$relativePath/js/jquery.min.js"></script>
+		<script type="text/javascript" src="$relativePath/js/bootstrap.min.js"></script>
+		<script type="text/javascript" src="$relativePath/js/prettify.min.js"></script>
+		<script type="text/javascript" src="$relativePath/js/site.js"></script>
 #foreach( $author in $authors )
       <meta name="author" content="$author" />
 #end
@@ -484,59 +467,49 @@
 #if ( $locale )
     <meta http-equiv="Content-Language" content="$locale.language" />
 #end
-    #if ( $decoration.body.head )
-      #foreach( $item in $decoration.body.head.getChildren() )
-        ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
-        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
-        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
-        #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
-        #if ( $item.name == "script" )
-          $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
-        #else
-          $StringUtils.replace( $item.toString(), $documentHeader, "" )
-        #end
-      #end
-    #end
-    $headContent
-    #googleAnalytics( $decoration.googleAnalyticsAccountId )
-  </head>
-  <body class="composite">
-    <div id="banner">
-      #banner( $decoration.bannerLeft "bannerLeft" )
-      #banner( $decoration.bannerRight "bannerRight" )
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-      #publishDate( "left" $decoration.publishDate $decoration.version )
-      <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-       #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-       #mainMenu( $decoration.body.menus )
-       #poweredByLogo( $decoration.poweredBy )
-       #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
-      </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        $bodyContent
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-        <div class="xright">Copyright &#169;#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version ) Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a>.</div><br />
-        <div class="xright">Apache log4net, Apache, log4net, the Apache feather logo, the Apache Logging Services project logo and the Built by Maven logo are trademarks of The Apache Software Foundation.</div>
-        <div class="clear">
-      </div>
-    </div>
-  </body>
+		$headContent
+		#googleAnalytics( $decoration.googleAnalyticsAccountId )
+	</head>
+	<body class="composite">
+		<a href="https://logging.apache.org/">
+			<img class="logo-left" src="$relativePath/images/ls-logo.jpg" alt="Apache logging services logo" />
+		</a>
+		<!--img class="logo-right" src="$relativePath/images/logo.png" alt="Apache log4net logo" /-->
+		<div class="clear"></div>
+
+		<div class="navbar">
+			<div class="navbar-inner">
+				<div class="container-fluid">
+					<a class="brand" href="$project.url">$project.name &trade;</a>
+					#links( $decoration.body.links )
+				</div>
+			</div>
+		</div>
+
+		<div class="container-fluid">
+			<table class="layout-table">
+				<tr>
+					<td class="sidebar">
+						<div class="well sidebar-nav">
+							#mainMenu( $decoration.body.menus )
+						</div>
+						<div id="poweredBy">
+							#poweredByLogo( $decoration.poweredBy )
+						</div>
+					</td>
+					<td class="content">
+						$bodyContent
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<div class="footer">
+			#set ( $currentYear = ${currentDate.year} + 1900 )
+				<p>Copyright &copy; ${project.inceptionYear}-${currentYear} <a class="external" href="$project.organization.url">${project.organization.name}</a>. All Rights Reserved.</p>
+				<p>Apache log4net, Apache, log4net, the Apache feather logo, the Apache Logging Services project logo and the Built by Maven logo are trademarks of The Apache Software Foundation.</p>
+				<p>Site powered by <a class="external" href="http://getbootstrap.com/">Twitter Bootstrap</a>. Icons from <a class="external" href="http://glyphicons.com/">Glyphicons Free</a>.</p>
+			</div>
+		</div>
+	</body>
 </html>

Modified: logging/log4net/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/src/site/site.xml?rev=1792238&r1=1792237&r2=1792238&view=diff
==============================================================================
--- logging/log4net/trunk/src/site/site.xml (original)
+++ logging/log4net/trunk/src/site/site.xml Fri Apr 21 19:26:40 2017
@@ -15,27 +15,26 @@
  limitations under the License.
 
 -->
-<project name="Apache log4net">
-	<bannerLeft>
-		<name>Apache Logging Services Project</name>
-		<src>images/ls-logo.jpg</src>
-		<href>http://logging.apache.org/</href>
-	</bannerLeft>
-	<body>
-		<breadcrumbs>
-			<item name="Apache" href="http://www.apache.org/"/>
-			<item name="Logging Services" href="http://logging.apache.org/"/>
-			<item name="log4net"  href="http://logging.apache.org/log4net/"/>
-		</breadcrumbs>
+<project name="Apache log4net"
+         xmlns="http://maven.apache.org/DECORATION/1.4.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
+  <body>
+    <links>
+      <item name="Logging Wiki" href="https://wiki.apache.org/logging"/>
+      <item name="Apache" href="https://www.apache.org/"/>
+      <item name="Logging Services" href="https://logging.apache.org/"/>
+      <item name="GitHub" href="https://github.com/apache/log4net"/>
+    </links>
 
-		<menu name="Apache log4net">
+		<menu name="Apache log4net" inherit="top" img="icon-home">
 			<item name="About" href="/index.html"/>
 			<item name="Download" href="/download_log4net.cgi"/>
 			<item name="Release Notes" href="/release/release-notes.html"/>
 			<item name="License" href="/license.html"/>
 		</menu>
 
-		<menu name="Documentation">
+		<menu name="Documentation" inherit="top" img="icon-file">
 			<item name="Features" href="/release/features.html"/>
 			<item name="Supported Frameworks" href="/release/framework-support.html"/>
 			<item name="Example Apps" href="/release/example-apps.html"/>
@@ -46,7 +45,7 @@
 			<item name="SDK Reference" href="/release/sdk/index.html"/>
 		</menu>
 
-		<menu name="Manual">
+		<menu name="Manual" inherit="top" img="icon-book">
 			<item name="Introduction" href="/release/manual/introduction.html"/>
 			<item name="Configuration" href="/release/manual/configuration.html"/>
 			<item name="Contexts" href="/release/manual/contexts.html"/>
@@ -55,19 +54,16 @@
 			<item name="Internals" href="/release/manual/internals.html"/>
 		</menu>
 
-		<menu name="Community">
+                <menu name="For Contributors" inherit="top" img="icon-pencil">
 			<item name="Mailing Lists" href="/mail-lists.html"/>
 			<item name="Issue Tracking" href="/issue-tracking.html"/>
-		</menu>
-		
-		<menu name="Development">
 			<item name="Repository" href="/source-repository.html"/>
 			<item name="Continuous Integration" href="/integration.html"/>
 		</menu>
 
-		<menu ref="reports"/>
+		<menu ref="reports"  img="icon-cog"/>
 
-		<menu name="Apache">
+		<menu name="Apache" inherit="top" img="icon-info-sign">
 			<item name="Home" href="http://www.apache.org/"/>	
 			<item name="License" href="http://www.apache.org/licenses/"/>	
 			<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>