logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ihabu...@apache.org
Subject svn commit: r1243254 [5/6] - in /logging/log4php/trunk: ./ src/site/ src/site/apt/docs/ src/site/resources/css/ src/site/resources/img/ src/site/resources/js/ src/site/xdoc/docs/ src/site/xdoc/docs/appenders/ src/site/xdoc/docs/layouts/
Date Sun, 12 Feb 2012 14:00:04 GMT
Modified: logging/log4php/trunk/src/site/site.vm
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/site.vm?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/site.vm (original)
+++ logging/log4php/trunk/src/site/site.vm Sun Feb 12 14:00:02 2012
@@ -1,571 +1,483 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- 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" 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
+	#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" 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 )
-  #if( $img )
-    #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 ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
-      #set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
-      #set ( $imgSrc = ' src="' + $imgSrc + '"' )
-    #else
-      #set ( $imgSrc = ' src="' + $img + '"' )
-    #end
-    #if( $alt )
-      #set ( $imgAlt = ' alt="' + $alt + '"' )
-    #else
-      #set ( $imgAlt = ' alt=""' )
-    #end
-    #if( $border )
-      #set ( $imgBorder = ' border="' + $border + '"' )
-    #else
-      #set ( $imgBorder = "" )
-    #end
-    #if( $width )
-      #set ( $imgWidth = ' width="' + $width + '"' )
-    #else
-      #set ( $imgWidth = "" )
-    #end
-    #if( $height )
-      #set ( $imgHeight = ' height="' + $height + '"' )
-    #else
-      #set ( $imgHeight = "" )
-    #end
-    <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
-  #end
+	#if( $img )
+		#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 ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+			#set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
+			#set ( $imgSrc = ' src="' + $imgSrc + '"' )
+		#else
+			#set ( $imgSrc = ' src="' + $img + '"' )
+		#end
+		#if( $alt )
+			#set ( $imgAlt = ' alt="' + $alt + '"' )
+		#else
+			#set ( $imgAlt = ' alt=""' )
+		#end
+		#if( $border )
+			#set ( $imgBorder = ' border="' + $border + '"' )
+		#else
+			#set ( $imgBorder = "" )
+		#end
+		#if( $width )
+			#set ( $imgWidth = ' width="' + $width + '"' )
+		#else
+			#set ( $imgWidth = "" )
+		#end
+		#if( $height )
+			#set ( $imgHeight = ' height="' + $height + '"' )
+		#else
+			#set ( $imgHeight = "" )
+		#end
+		<img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
+	#end
 #end
 #macro ( banner $banner $id )
-  #if ( $banner )
-    #if( $banner.href )
-      #set ( $hrf = $banner.href )
-      #if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") ||
-        $hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:/") ||
-        $hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) )
-        #set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
-        #set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
-        #if ( ( $hrf == '' ) )
-          #set ( $hrf = './' )
-        #end
-      #end
-      <a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
-    #else
-        <div id="$id">
-    #end
-##
-    #if( $banner.src )
-        #set ( $src = $banner.src )
-        #if ( ! ( $src.toLowerCase().startsWith("http:/") || $src.toLowerCase().startsWith("https:/") ||
-                $src.toLowerCase().startsWith("ftp:/") || $src.toLowerCase().startsWith("mailto:/") ||
-                $src.toLowerCase().startsWith("file:/") || ($src.toLowerCase().indexOf("://") != -1) ) )
-            #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
-            #set ( $src = $src.replaceAll( '\\', '/' ) )
-        #end
-        #if ( $banner.alt )
-            #set ( $alt = $banner.alt )
-        #else
-            #set ( $alt = $banner.name )
-        #end
-        <img src="$src" alt="$alt" />
-    #else
-        $banner.name
-    #end
-##
-    #if( $banner.href )
-        </a>
-    #else
-        </div>
-    #end
-  #end
+	#if ( $banner )
+		#if( $banner.href )
+			#set ( $hrf = $banner.href )
+			#if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") ||
+				$hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:/") ||
+				$hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) )
+				#set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
+				#set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
+				#if ( ( $hrf == '' ) )
+					#set ( $hrf = './' )
+				#end
+			#end
+			<a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
+		#else
+				<div id="$id">
+		#end
+##
+		#if( $banner.src )
+				#set ( $src = $banner.src )
+				#if ( ! ( $src.toLowerCase().startsWith("http:/") || $src.toLowerCase().startsWith("https:/") ||
+								$src.toLowerCase().startsWith("ftp:/") || $src.toLowerCase().startsWith("mailto:/") ||
+								$src.toLowerCase().startsWith("file:/") || ($src.toLowerCase().indexOf("://") != -1) ) )
+						#set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+						#set ( $src = $src.replaceAll( '\\', '/' ) )
+				#end
+				#if ( $banner.alt )
+						#set ( $alt = $banner.alt )
+				#else
+						#set ( $alt = $banner.name )
+				#end
+				<img src="$src" alt="$alt" />
+		#else
+				$banner.name
+		#end
+##
+		#if( $banner.href )
+				</a>
+		#else
+				</div>
+		#end
+	#end
 #end
 ##
 #macro ( links $links )
-  <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>
+	<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 )
-      <span class="divider">&gt;</span>
-  #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
+	#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>
+	#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
+	<li class="$collapse$active">
+	#link($currentItemHref $item.name $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 )
+				#end
+			</ul>
+		#end
+	#end
+	</li>
 #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">
+		#if ( $menu.name )
+			#if ( $menu.img )
+			 <li class="nav-header"><i class="$menu.img"></i>$menu.name</li>
+			#else
+			 <li class="nav-header">$menu.name</li>
+			#end
+		#end
+		#if ( $menu.items && $menu.items.size() > 0 )
+			#foreach( $item in $menu.items )
+				#menuItem( $item )
+			#end
+		#end
+		</ul>
+	#end
 #end
 ##
 #macro ( copyright )
-  #if ( $project )
-    #if ( ${project.organization} && ${project.organization.name} )
-      #set ( $period = "" )
-    #else
-      #set ( $period = "." )
-   #end
-##
-   #set ( $currentYear = ${currentDate.year} + 1900 )
-##
-    #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}-${currentYear}${period}
-    #else
-      ${currentYear}${period}
-    #end
-##
-    #if ( ${project.organization} )
-      #if ( ${project.organization.name} && ${project.organization.url} )
-          <a href="$project.organization.url">${project.organization.name}</a>.
-      #elseif ( ${project.organization.name} )
-        ${project.organization.name}.
-      #end
-    #end
-  #end
+	#if ( $project )
+		#if ( ${project.organization} && ${project.organization.name} )
+			#set ( $period = "" )
+		#else
+			#set ( $period = "." )
+	 #end
+##
+	 #set ( $currentYear = ${currentDate.year} + 1900 )
+##
+		#if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+			${project.inceptionYear}-${currentYear}${period}
+		#else
+			${currentYear}${period}
+		#end
+##
+		#if ( ${project.organization} )
+			#if ( ${project.organization.name} && ${project.organization.url} )
+					<a href="$project.organization.url">${project.organization.name}</a>.
+			#elseif ( ${project.organization.name} )
+				${project.organization.name}.
+			#end
+		#end
+	#end
 #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( $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
+	#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/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
 #end
 ##
 #macro ( googleAnalytics $accountId )
-  #if( $accountId && $accountId != "" )
-    <!-- Google Analytics -->
-    <script type="text/javascript">
-    
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', '$accountId']);
-      _gaq.push (['_gat._anonymizeIp']);
-      _gaq.push(['_trackPageview']);
+	#if( $accountId && $accountId != "" )
+		<!-- Google Analytics -->
+		<script type="text/javascript">
+		
+			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);
-      })();
+			(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
+		</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 - $project.name</title>
-    <link rel="stylesheet" href="$relativePath/css/bootstrap.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/prettify.js"></script>
-    <script type="text/javascript" src="$relativePath/js/site.js"></script>
+	<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" />
+			<meta name="author" content="$author" />
 #end
 #if ( $dateCreation )
-    <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
+		<meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
 #end
 #if ( $dateRevision )
-    <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
+		<meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
 #end
 #if ( $locale )
-    <meta http-equiv="Content-Language" content="$locale.language" />
+		<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" onload="siteOnLoad()">
+		$headContent
+		#googleAnalytics( $decoration.googleAnalyticsAccountId )
+	</head>
+	<body class="composite">
  
-    <div class="topbar">
-      <div class="topbar-inner">
-        <div class="container-fluid">
-          <a class="brand" href="$relativePath">$project.name &trade;</a>
-          #links( $decoration.body.links )
-          <div class="pull-right">
-            <!-- Google CSE Search Box Begins  -->
-            <form id="cref" action="http://www.google.com/cse">
-              <input type="hidden" name="cref" value="$project.url/cse.xml" />
-              <input type="text" name="q" size="40" />
-              <input type="submit" name="sa" value="Search" />
-            </form>
-            <!-- Google CSE Search Box Ends -->
-          </div>
-        </div>
-      </div>
-    </div>
-    
-    <div style="padding-top: 40px;"></div>
- 
-    <div class="container-fluid">
-      <div id="banner">
-        #banner( $decoration.bannerLeft "bannerLeft" )
-        #banner( $decoration.bannerRight "bannerRight" )
-        <div class="clear">
-          <hr/>
-        </div>
-      </div>
-      
-      <div class="breadcrumb">
-        #publishDate( "left" $decoration.publishDate $decoration.version )
-        <div class="pull-right">#publishDate( "right" $decoration.publishDate $decoration.version )</div>
-        <div class="clear"><hr/></div>
-      </div>
-      
-      <div class="sidebar">
-        <div class="well">
-          #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-          #mainMenu( $decoration.body.menus )
-          #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
-        </div>
-        
-        <div id="poweredBy">
-          #poweredByLogo( $decoration.poweredBy )
-        </div>
-      </div>
-      
-      <div class="content">
-        $bodyContent
-      </div>
-  
-    </div>
+		<div class="navbar">
+			<div class="navbar-inner">
+				<div class="container-fluid">
+					<a class="brand" href="#">$project.name &trade;</a>
+					#links( $decoration.body.links )
+
+					<!-- Twitter link -->
+					<ul class="nav pull-right">
+						<li><a href="http://www.twitter.com/log4php/" class="externalLink">Follow <strong>@log4php</strong></a></li>
+					</ul>
+					
+					<!-- Google CSE Search Box -->
+					<form class="navbar-search pull-right" id="cref" action="http://www.google.com/cse">
+						<input type="hidden" name="cref" value="$project.url/cse.xml" />
+						<input class="search-query pull-left" type="text" name="q" size="40" placeholder="Search" />
+					</form>
+				</div>
+			</div>
+		</div>
 
-    <div class="footer">
-        <p>Copyright &#169;#copyright()All Rights Reserved.#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>. 
-        Please read the <a href="$relativePath/privacy.html">Privacy policy</a></p>
-        <p>Apache log4php, Apache, log4php, the Apache feather logo, the Apache Logging Services project logo and the Built by 
-        Maven logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body>
+		<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">
+			<p>Copyright &#169;#copyright()All Rights Reserved.#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>. 
+			Please read the <a href="$relativePath/privacy.html">Privacy policy</a></p>
+			<p>Apache log4php, Apache, log4php, the Apache feather logo, the Apache Logging Services project logo and the Built by 
+			Maven logo are trademarks of The Apache Software Foundation.</p>
+		</div>
+	</body>
 </html>

Modified: logging/log4php/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/site.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/site.xml (original)
+++ logging/log4php/trunk/src/site/site.xml Sun Feb 12 14:00:02 2012
@@ -16,21 +16,11 @@
  limitations under the License.
 
 -->
-<project 
-	name="Apache log4php" xmlns="http://maven.apache.org/DECORATION/1.1.0" 
+<project name="Apache log4php" 
+	xmlns="http://maven.apache.org/DECORATION/1.1.0" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
 	
-	<bannerLeft>
-		<name>Apache Logging Services Project</name>
-		<src>images/logos/ls-logo.jpg</src>
-		<href>http://logging.apache.org/</href>
-	</bannerLeft>
-	
-	<publishDate position="right" format="dd.MM.yyyy."/>
-	
-	<version position="right"/>
-	
 	<googleAnalyticsAccountId>UA-26177991-1</googleAnalyticsAccountId>
 	
 	<body>
@@ -41,20 +31,14 @@
 			<item name="Quick start" href="/quickstart.html" />
 		</links>
 
-		<breadcrumbs>
-			<item name="Apache" href="http://www.apache.org/" target="_blank" />
-			<item name="Logging Services" href="http://logging.apache.org" target="_blank" />
-			<item name="Apache log4php™" href="http://logging.apache.org/log4php" />
-		</breadcrumbs>
-
-		<menu name="Apache log4php™">
+	    <menu name="Apache log4php™" img="icon-home">
 			<item name="About" href="/index.html" />
 			<item name="Download" href="/download.html" />
 			<item name="Install" href="/install.html" />
 			<item name="Changelog" href="/changelog.html" />
 		</menu>
 
-		<menu name="Documentation">
+	    <menu name="Documentation" img="icon-book">
 			<item name="Quick start" href="/quickstart.html" />
 			<item name="Introduction" href="/docs/introduction.html" />
 			<item name="Configuration" href="/docs/configuration.html" />
@@ -87,23 +71,32 @@
 			<item name="API documentation" href="/apidocs/index.html" />
 		</menu>
 
-		<menu name="Community">
-			<item name="Mailing Lists" href="/mail-lists.html" />
-			<item name="Issue Tracking" href="/issue-tracking.html" />
+	    <menu name="Community" img="icon-user">
+			<item name="Volunteering" href="/volunteering.html" />
+			<item name="Contributing Patches" href="/contributingpatches.html" />
 			<item name="Wiki" href="http://wiki.apache.org/logging-log4php" />
 			<item name="Blog" href="http://blogs.apache.org/logging/" />
 		</menu>
-
-		<menu name="Developers">
-			<item name="Volunteering" href="/volunteering.html" />
-			<item name="Contributing Patches" href="/contributingpatches.html" />
-			<item name="Code Coverage" href="/coverage-report/index.html" />
+		
+	    <menu name="Project Information" img="icon-info-sign">
 			<item name="Continuous Integration" href="/integration.html" />
+			<item name="Source Repository" href="/source-repository.html" />
+			<item name="Dependencies" href="/dependencies.html" />
+			<item name="Project License" href="/license.html" />
+			<item name="Project Team" href="/team-list.html" />
+			<item name="Issue Tracking" href="/issue-tracking.html" />
+			<item name="Mailing Lists" href="/mail-lists.html" />
+		</menu>
+
+	    <menu name="Project Reports" img="icon-cog">
+			<item name="Changes Report" href="/changes-report.html" />
+			<item name="Surefire Report" href="/surefire-report.html" />
+			<item name="RAT Report" href="/rat-report.html" />
 		</menu>
 
-		<menu ref="reports" />
+		<!-- <menu name="Project Information" ref="reports" img="icon-info-sign" /> -->
 
-		<menu name="Apache">
+		<menu name="Apache" img="icon-heart">
 			<item name="Home" href="http://www.apache.org" />
 			<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html" />
 			<item name="License" href="http://www.apache.org/licenses" />

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders.xml Sun Feb 12 14:00:02 2012
@@ -104,7 +104,7 @@
 			
 				<p>The following configuration shows how to configure an appender which logs to a file:</p>
 			
-<pre class="prettyprint"><![CDATA[
+<pre class="prettyprint linenums"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderFile">
         <layout class="LoggerLayoutTTCC" />
@@ -141,7 +141,7 @@
 				
 				<p>Consider the following configuration:</p>
 			
-<pre class="prettyprint"><![CDATA[
+<pre class="prettyprint linenums"><![CDATA[
 <log4php:configuration xmlns:log4php="http://logging.apache.org/log4php/">
     <appender name="primus" class="LoggerAppenderConsole" />
     <appender name="secundus" class="LoggerAppenderFile">
@@ -177,7 +177,7 @@
 				
 				<p>An example of setting an appender threshold:</p>
 				
-<pre class="prettyprint"><![CDATA[
+<pre class="prettyprint linenums"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderEcho" threshold="WARN" />
     <root>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/console.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/console.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/console.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/console.xml Sun Feb 12 14:00:02 2012
@@ -37,20 +37,24 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>target</td>
-						<td>string</td>
-						<td>No</td>
-						<td>stdout</td>
-						<td>The stream to write to; either "stdout" or "stderr".</td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>target</td>
+							<td>string</td>
+							<td>No</td>
+							<td>stdout</td>
+							<td>The stream to write to; either "stdout" or "stderr".</td>
+						</tr>
+					</tbody>
 				</table>
 				
 			</subsection>
@@ -59,14 +63,15 @@
 			
 				<p>This example shows how to configure <code>LoggerAppenderConsole</code>.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
- 
-				<div class="pill-content" >
-					<div class="active" id="xml">
-<pre class="prettyprint"><![CDATA[
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
+					
+					<div class="tab-content">
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderConsole">
         <layout class="LoggerLayoutTTCC" />
@@ -76,9 +81,10 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
-<pre class="prettyprint"><![CDATA[
+						</div>
+				
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 array(
     'appenders' => array(
         'default' => array(
@@ -93,6 +99,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/daily-file.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/daily-file.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/daily-file.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/daily-file.xml Sun Feb 12 14:00:02 2012
@@ -41,58 +41,60 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>file</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Path to the target file. Should contain a <code>%s</code> which gets substituted by the 
-						date.</td>
-					</tr>
-					<tr>
-						<td>append</td>
-						<td>boolean</td>
-						<td>No</td>
-						<td>true</td>
-						<td>If set to true, the appender will append to the file, otherwise the file contents will be 
-						overwritten.</td>
-					</tr>
-					<tr>
-						<td>datePattern</td>
-						<td>string</td>
-						<td>No</td>
-						<td>Ymd</td>
-						<td>Format for the date in the file path, follows formatting rules used by the PHP
-						<code><a href="http://php.net/manual/en/function.date.php">date()</a></code> function.</td>
-					</tr>
-					
-					
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>file</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Path to the target file. Should contain a <code>%s</code> which gets substituted by the 
+							date.</td>
+						</tr>
+						<tr>
+							<td>append</td>
+							<td>boolean</td>
+							<td>No</td>
+							<td>true</td>
+							<td>If set to true, the appender will append to the file, otherwise the file contents will be 
+							overwritten.</td>
+						</tr>
+						<tr>
+							<td>datePattern</td>
+							<td>string</td>
+							<td>No</td>
+							<td>Ymd</td>
+							<td>Format for the date in the file path, follows formatting rules used by the PHP
+							<code><a href="http://php.net/manual/en/function.date.php">date()</a></code> function.</td>
+						</tr>
+					</tbody>
 				</table>
-				
 			</subsection>
 				
 			<subsection name="Examples">
 				
 				<p>This example shows how to configure <code>LoggerAppenderDailyFile</code>.</p>
 				
-				<p>The desired filename format is, for example <code>file-2011-10-01.log</code>, so the date format in 
-				PHP date() notation is <code>Y-m-d</code>.</p>
+				<p>The date pattern used is <code>Y-m-d</code> which will result in filenames similar to 
+				<code>file-2011-10-01.log</code>.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
- 
-				<div class="pill-content" >
-					<div class="active" id="xml">
-<pre class="prettyprint"><![CDATA[
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
+				 
+					<div class="tab-content" >
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderDailyFile">
         <layout class="LoggerLayoutTTCC" />
@@ -104,9 +106,9 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
-<pre class="prettyprint"><![CDATA[
+						</div>
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 array(
     'appenders' => array(
         'default' => array(
@@ -125,6 +127,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/echo.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/echo.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/echo.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/echo.xml Sun Feb 12 14:00:02 2012
@@ -38,70 +38,74 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>htmlLineBreaks</td>
-						<td>boolean</td>
-						<td>No</td>
-						<td>false</td>
-						<td>If set to true, a <![CDATA[<br />]]> element will be inserted before each line break in 
-						the logged message.</td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>htmlLineBreaks</td>
+							<td>boolean</td>
+							<td>No</td>
+							<td>false</td>
+							<td>If set to true, a <![CDATA[<br />]]> element will be inserted before each line break in 
+							the logged message.</td>
+						</tr>
+					</tbody>
 				</table>
-				
 			</subsection>
 				
 			<subsection name="Examples">
 				<p>This example shows how to configure <code>LoggerAppenderEcho</code> using the 
 				<a href="../layouts/ttcc.html">TTCC layout</a> with	<code>htmlLineBreaks</code> turned on.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
- 
-				<div class="pill-content" >
-					<div class="active" id="xml">
-<pre class="prettyprint"><![CDATA[
-<configuration xmlns="http://logging.apache.org/log4php/">
-    <appender name="default" class="LoggerAppenderEcho">
-        <layout class="LoggerLayoutTTCC" />
-        <param name="htmlLineBreaks" value="true" />
-    </appender>
-    <root>
-        <appender_ref ref="default" />
-    </root>
-</configuration>
-]]></pre>
-					</div>
-					<div id="php">
-<pre class="prettyprint"><![CDATA[
-array(
-    'appenders' => array(
-        'default' => array(
-            'class' => 'LoggerAppenderEcho',
-            'layout' => array(
-                'class' => 'LoggerLayoutTTCC',
-            ),
-            'params' => array(
-                'htmlLineBreaks' => 'true',
-            ),
-        ),
-    ),
-    'rootLogger' => array(
-        'appenders' => array('default'),
-    ),
-);
-]]></pre>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
+				
+					<div class="tab-content" >
+						<div class="tab-pane">
+	<pre class="prettyprint"><![CDATA[
+	<configuration xmlns="http://logging.apache.org/log4php/">
+	    <appender name="default" class="LoggerAppenderEcho">
+	        <layout class="LoggerLayoutTTCC" />
+	        <param name="htmlLineBreaks" value="true" />
+	    </appender>
+	    <root>
+	        <appender_ref ref="default" />
+	    </root>
+	</configuration>
+	]]></pre>
+						</div>
+						<div class="tab-pane">
+	<pre class="prettyprint"><![CDATA[
+	array(
+	    'appenders' => array(
+	        'default' => array(
+	            'class' => 'LoggerAppenderEcho',
+	            'layout' => array(
+	                'class' => 'LoggerLayoutTTCC',
+	            ),
+	            'params' => array(
+	                'htmlLineBreaks' => 'true',
+	            ),
+	        ),
+	    ),
+	    'rootLogger' => array(
+	        'appenders' => array('default'),
+	    ),
+	);
+	]]></pre>
+						</div>
 					</div>
 				</div>
-					
 			</subsection>
 		</section>
 	</body>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/file.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/file.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/file.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/file.xml Sun Feb 12 14:00:02 2012
@@ -36,28 +36,32 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>file</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Path to the target file. Relative paths are resolved based on the working directory.</td>
-					</tr>
-					<tr>
-						<td>append</td>
-						<td>boolean</td>
-						<td>No</td>
-						<td>true</td>
-						<td>If set to true, the appender will append to the file, otherwise the file contents will be 
-						overwritten.</td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>file</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Path to the target file. Relative paths are resolved based on the working directory.</td>
+						</tr>
+						<tr>
+							<td>append</td>
+							<td>boolean</td>
+							<td>No</td>
+							<td>true</td>
+							<td>If set to true, the appender will append to the file, otherwise the file contents will be 
+							overwritten.</td>
+						</tr>
+					</tbody>
 				</table>
 				
 			</subsection>
@@ -71,13 +75,14 @@
 				<p>It is also possible to specify an absolute path to the target file, such as 
 				<code>/var/log/file.log</code> or <code>D:/logs/file.log</code></p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderFile">
@@ -90,8 +95,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -111,6 +116,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/mail-event.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/mail-event.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/mail-event.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/mail-event.xml Sun Feb 12 14:00:02 2012
@@ -39,51 +39,54 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>to</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Email address(es) to which the log will be sent. Multiple email addresses may be specified
-						by separating them with a comma.</td>
-					</tr>
-					<tr>
-						<td>from</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Email address which will be used in the From field.</td>
-					</tr>
-					<tr>
-						<td>subject</td>
-						<td>string</td>
-						<td>No</td>
-						<td>Log4php Report</td>
-						<td>Subject of the email message.</td>
-					</tr>
-					<tr>
-						<td>smtpHost</td>
-						<td>string</td>
-						<td>No</td>
-						<td>ini_get('SMTP')</td>
-						<td>Used to override the SMTP server. <strong>Only works on Windows.</strong></td>
-					</tr>
-					<tr>
-						<td>port</td>
-						<td>integer</td>
-						<td>No</td>
-						<td>25</td>
-						<td>Used to override the default SMTP server port. <strong>Only works on Windows.</strong></td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>to</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Email address(es) to which the log will be sent. Multiple email addresses may be specified
+							by separating them with a comma.</td>
+						</tr>
+						<tr>
+							<td>from</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Email address which will be used in the From field.</td>
+						</tr>
+						<tr>
+							<td>subject</td>
+							<td>string</td>
+							<td>No</td>
+							<td>Log4php Report</td>
+							<td>Subject of the email message.</td>
+						</tr>
+						<tr>
+							<td>smtpHost</td>
+							<td>string</td>
+							<td>No</td>
+							<td>ini_get('SMTP')</td>
+							<td>Used to override the SMTP server. <strong>Only works on Windows.</strong></td>
+						</tr>
+						<tr>
+							<td>port</td>
+							<td>integer</td>
+							<td>No</td>
+							<td>25</td>
+							<td>Used to override the default SMTP server port. <strong>Only works on Windows.</strong></td>
+						</tr>
+					</tbody>
 				</table>
-				
 			</subsection>
 				
 			<subsection name="Examples">
@@ -91,13 +94,14 @@
 				<p>This example shows how to configure <code>LoggerAppenderMailEvent</code> to send the log to two email 
 				addresses.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderMailEvent">
@@ -110,8 +114,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -131,6 +135,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 				

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/mail.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/mail.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/mail.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/mail.xml Sun Feb 12 14:00:02 2012
@@ -29,11 +29,12 @@
 			
 			<p>This appender does not send individual emails for each logging requests but will collect them in a 
 			buffer and send them all in a single email once the appender is closed (i.e. when the script exists). 
-			Because of this, it may not appropriate for long running scripts. In that case
+			Because of this, it may not appropriate for long running scripts, in which case
 			<code><a href="mail-event.html">LoggerAppenderMailEvent</a></code> might be a better choice.</p>
 		
-			<p class="alert-message warning">When working in Windows, make sure that the <code>SMTP</code> and <code>smpt_port</code>
-			values in php.ini are set to the correct values for your email server (address and port).</p>
+			<p class="alert alert-warning"><strong>Note:</strong> When working in Windows, make sure that the 
+			<code>SMTP</code> and <code>smpt_port</code> values in php.ini are set to the correct values for 
+			your email server (address and port).</p>
 			
 			<subsection name="Layout">
 				<p>This appender requires a layout. If no layout is specified in configuration, 
@@ -44,35 +45,39 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>to</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Email address(es) to which the log will be sent. Multiple email addresses may be specified
-						by separating them with a comma.</td>
-					</tr>
-					<tr>
-						<td>from</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Email address which will be used in the From field.</td>
-					</tr>
-					<tr>
-						<td>subject</td>
-						<td>string</td>
-						<td>No</td>
-						<td>Log4php Report</td>
-						<td>Subject of the email message.</td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>to</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Email address(es) to which the log will be sent. Multiple email addresses may be specified
+							by separating them with a comma.</td>
+						</tr>
+						<tr>
+							<td>from</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Email address which will be used in the From field.</td>
+						</tr>
+						<tr>
+							<td>subject</td>
+							<td>string</td>
+							<td>No</td>
+							<td>Log4php Report</td>
+							<td>Subject of the email message.</td>
+						</tr>
+					</tbody>
 				</table>
 				
 			</subsection>
@@ -82,13 +87,14 @@
 				<p>This example shows how to configure <code>LoggerAppenderMail</code> to send the log to two email 
 				addresses.</p>
 				
-<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderMail">
@@ -101,8 +107,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -122,6 +128,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/mongodb.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/mongodb.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/mongodb.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/mongodb.xml Sun Feb 12 14:00:02 2012
@@ -38,76 +38,97 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>host</td>
-						<td>string</td>
-						<td>No</td>
-						<td>mongodb://localhost</td>
-						<td>Server on which mongodb instance is located.</td>
-					</tr>
-					<tr>
-						<td>port</td>
-						<td>integer</td>
-						<td>No</td>
-						<td>27017</td>
-						<td>Port on which the instance is bound.</td>
-					</tr>
-					<tr>
-						<td>databaseName</td>
-						<td>string</td>
-						<td>No</td>
-						<td>log4php_mongodb</td>
-						<td>Name of the database to which to log.</td>
-					</tr>
-					<tr>
-						<td>collectionName</td>
-						<td>string</td>
-						<td>No</td>
-						<td>logs</td>
-						<td>Name of the target collection within the given database.</td>
-					</tr>
-					<tr>
-						<td>username</td>
-						<td>string</td>
-						<td>No</td>
-						<td>-</td>
-						<td>Username used to connect to the database.</td>
-					</tr>
-					<tr>
-						<td>password</td>
-						<td>string</td>
-						<td>No</td>
-						<td>-</td>
-						<td>Password used to connect to the database.</td>
-					</tr>
-				    <tr>
-				        <td>timeout</td>
-				        <td>integer</td>
-				        <td>No</td>
-				        <td>3000</td>
-				        <td>For how long the driver should try to connect to the database (in milliseconds).</td>
-				    </tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>host</td>
+							<td>string</td>
+							<td>No</td>
+							<td>mongodb://localhost</td>
+							<td>Server on which mongodb instance is located.</td>
+						</tr>
+						<tr>
+							<td>port</td>
+							<td>integer</td>
+							<td>No</td>
+							<td>27017</td>
+							<td>Port on which the instance is bound.</td>
+						</tr>
+						<tr>
+							<td>databaseName</td>
+							<td>string</td>
+							<td>No</td>
+							<td>log4php_mongodb</td>
+							<td>Name of the database to which to log.</td>
+						</tr>
+						<tr>
+							<td>collectionName</td>
+							<td>string</td>
+							<td>No</td>
+							<td>logs</td>
+							<td>Name of the target collection within the given database.</td>
+						</tr>
+						<tr>
+							<td>username</td>
+							<td>string</td>
+							<td>No</td>
+							<td>-</td>
+							<td>Username used to connect to the database.</td>
+						</tr>
+						<tr>
+							<td>password</td>
+							<td>string</td>
+							<td>No</td>
+							<td>-</td>
+							<td>Password used to connect to the database.</td>
+						</tr>
+						<tr>
+							<td>timeout</td>
+							<td>integer</td>
+							<td>No</td>
+							<td>3000</td>
+							<td>For how long the driver should try to connect to the database (in milliseconds).</td>
+						</tr>
+					</tbody>
+				</table>
+			</subsection>
+			
+			<subsection name="Changelog">
+				<table class="table table-striped table-bordered table-not-wide">
+					<thead>
+						<tr>
+							<th>Version</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td><code>2.2.0</code></td>
+							<td>Added the <code>timeout</code> parameter.</td>
+						</tr>
+					</tbody>
 				</table>
-				
 			</subsection>
 				
 			<subsection name="Examples">
 				<p>This example shows how to configure <code>LoggerAppenderMongoDB</code> to log to a remote database.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderMongoDB">
@@ -120,8 +141,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -139,6 +160,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/null.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/null.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/null.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/null.xml Sun Feb 12 14:00:02 2012
@@ -38,13 +38,14 @@
 			
 			<subsection name="Examples">
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderNull" />
@@ -53,8 +54,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -67,6 +68,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 				

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/pdo.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/pdo.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/pdo.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/pdo.xml Sun Feb 12 14:00:02 2012
@@ -110,7 +110,8 @@
 				inserted into the database. By manipulating them, it is possible to use a custom table structure to 
 				suit your needs.</p>
 			
-				<p class="alert-message warning">WARNING: Change these settings only if you are sure you know what you are doing.</p>
+				<p class="alert alert-warning"><strong>WARNING:</strong> Change these settings only if you are sure you
+				know what you are doing.</p>
 			
 				<p>The default values of these parameters are:</p>
 				
@@ -153,13 +154,14 @@
 				log to the database contained in <code>/var/log/log.sqlite</code>. The database will be created if it 
 				doesn't already exist.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml1">XML</a></li>
-					<li><a href="#php1">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml1">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderPDO">
@@ -170,8 +172,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php1">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -187,6 +189,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 				
@@ -199,13 +202,14 @@ array(
 				named <code>logdb</code>. The log will be written to a table named <code>log_table</code>. The table
 				will be created if it doesn't already exist.</p>
 
-				<ul class="tabs">
-					<li class="active"><a href="#xml2">XML</a></li>
-					<li><a href="#php2">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml2">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderPDO">
@@ -219,8 +223,8 @@ array(
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php2">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -239,6 +243,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 					

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/php.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/php.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/php.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/php.xml Sun Feb 12 14:00:02 2012
@@ -47,13 +47,14 @@
 				
 			<subsection name="Examples">
 
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderPhp">
@@ -64,8 +65,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -81,6 +82,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/rolling-file.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/rolling-file.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/rolling-file.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/rolling-file.xml Sun Feb 12 14:00:02 2012
@@ -46,43 +46,47 @@
 				<p>The following parameters are available:</p>
 		
 				<table>
-					<tr>
-						<th>Parameter</th>
-						<th>Type</th>
-						<th>Required</th>
-						<th>Default</th>
-						<th>Description</th>
-					</tr>
-					<tr>
-						<td>file</td>
-						<td>string</td>
-						<td><strong>Yes</strong></td>
-						<td>-</td>
-						<td>Path to the target file. Should contain a <code>%s</code> which gets substituted by the 
-						date.</td>
-					</tr>
-					<tr>
-						<td>append</td>
-						<td>boolean</td>
-						<td>No</td>
-						<td>true</td>
-						<td>If set to true, the appender will append to the file, otherwise the file contents will be 
-						overwritten.</td>
-					</tr>
-					<tr>
-						<td>maxFileSize</td>
-						<td>string</td>
-						<td>No</td>
-						<td>10M</td>
-						<td>Maximum allowed file size (in bytes) before rolling over. Suffixes "KB", "MB" and "GB" are allowed. 10KB = 10240 bytes, etc.</td>
-					</tr>
-					<tr>
-						<td>maxBackupIndex</td>
-						<td>integer</td>
-						<td>No</td>
-						<td>1</td>
-						<td>Maximum number of backup files to keep.</td>
-					</tr>
+					<thead>
+						<tr>
+							<th>Parameter</th>
+							<th>Type</th>
+							<th>Required</th>
+							<th>Default</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td>file</td>
+							<td>string</td>
+							<td><strong>Yes</strong></td>
+							<td>-</td>
+							<td>Path to the target file. Should contain a <code>%s</code> which gets substituted by the 
+							date.</td>
+						</tr>
+						<tr>
+							<td>append</td>
+							<td>boolean</td>
+							<td>No</td>
+							<td>true</td>
+							<td>If set to true, the appender will append to the file, otherwise the file contents will be 
+							overwritten.</td>
+						</tr>
+						<tr>
+							<td>maxFileSize</td>
+							<td>string</td>
+							<td>No</td>
+							<td>10M</td>
+							<td>Maximum allowed file size (in bytes) before rolling over. Suffixes "KB", "MB" and "GB" are allowed. 10KB = 10240 bytes, etc.</td>
+						</tr>
+						<tr>
+							<td>maxBackupIndex</td>
+							<td>integer</td>
+							<td>No</td>
+							<td>1</td>
+							<td>Maximum number of backup files to keep.</td>
+						</tr>
+					</tbody>
 				</table>
 				
 			</subsection>
@@ -92,13 +96,14 @@
 				<p>This example shows how to configure <code>LoggerAppenderRollingFile</code> to rollover after reaching
 				the size of 1MB and for keeping the last 5 backup files.</p>
 
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderRollingFile">
@@ -112,8 +117,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -134,6 +139,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/socket.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/socket.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/socket.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/socket.xml Sun Feb 12 14:00:02 2012
@@ -74,18 +74,40 @@
 					</tbody>
 				</table>
 			</subsection>
+			
+			<subsection name="Changelog">
+				<table class="table table-striped table-bordered table-not-wide">
+					<thead>
+						<tr>
+							<th>Version</th>
+							<th>Description</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td><code>2.2.0</code></td>
+							<td>From this version, the socket appender uses a layout to format the logging events.
+							Because of this change, the following parameters are no longer used: <code>useXml</code>,
+							<code>locationInfo</code>, <code>log4jNamespace</code>. These settings can be configured
+							on the layout.</td>
+						</tr>
+					</tbody>
+				</table>
+			</subsection>
 				
 			<subsection name="Examples">
 				
-				<p>In this example, log events are sent to localhost:4242, using the default (serialized) layout.</p>
+				<p>In this example, log events are sent to a socket server at <code>localhost:4242</code>, using the 
+				default (serialized) layout.</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
+					<div class="tab-content" >
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderSocket">
@@ -97,8 +119,8 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
+						</div>
+						<div class="tab-pane">
 <pre class="prettyprint"><![CDATA[
 array(
     'appenders' => array(
@@ -115,6 +137,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/appenders/syslog.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/appenders/syslog.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/appenders/syslog.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/appenders/syslog.xml Sun Feb 12 14:00:02 2012
@@ -250,7 +250,7 @@
 					</tbody>
 				</table>
 				
-				<p class="alert-message warning">Warning: <code>USER</code> is the only available facility under 
+				<p class="alert alert-warning">Warning: <code>USER</code> is the only facility available on 
 				Windows operating systems.</p>
 			
 			</subsection>
@@ -303,14 +303,15 @@
 			
 				<p>Here is a sample configuration:</p>
 				
-				<ul class="tabs">
-					<li class="active"><a href="#xml">XML</a></li>
-					<li><a href="#php">PHP</a></li>
-				</ul>
+				<div class="auto-tabs">
+					<ul>
+						<li>XML</li>
+						<li>PHP</li>
+					</ul>
  
-				<div class="pill-content" >
-					<div class="active" id="xml">
-<pre class="prettyprint"><![CDATA[
+					<div class="tab-content">
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderSyslog">
         <layout class="LoggerLayoutTTCC" />
@@ -323,9 +324,9 @@
     </root>
 </configuration>
 ]]></pre>
-					</div>
-					<div id="php">
-<pre class="prettyprint"><![CDATA[
+						</div>
+						<div class="tab-pane">
+<pre class="prettyprint linenums"><![CDATA[
 array(
     'appenders' => array(
         'default' => array(
@@ -345,6 +346,7 @@ array(
     ),
 );
 ]]></pre>
+						</div>
 					</div>
 				</div>
 			</subsection>

Modified: logging/log4php/trunk/src/site/xdoc/docs/configuration.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/configuration.xml?rev=1243254&r1=1243253&r2=1243254&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/configuration.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/configuration.xml Sun Feb 12 14:00:02 2012
@@ -43,7 +43,7 @@
 				
 				<p>A simple configuration looks like this:</p>
 				
-<pre class="prettyprint"><![CDATA[
+<pre class="prettyprint linenums"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration xmlns="http://logging.apache.org/log4php/">
     <appender name="default" class="LoggerAppenderFile">
@@ -78,7 +78,7 @@
 				
 				<p>The configuration array can directly be passed to <code>Logger::configure()</code>.</p>
 
-<pre class="prettyprint">
+<pre class="prettyprint linenums">
 Logger::configure(array(
     'rootLogger' => array(
         'appenders' => array('default'),
@@ -98,7 +98,7 @@ Logger::configure(array(
 				have the <code>php</code> extension and it should <em>return</em> the configuration array. For example, 
 				a file named <code>config.php</code> with the following content:</p>
 				
-<pre class="prettyprint">
+<pre class="prettyprint linenums">
 return array(
     'rootLogger' => array(
         'appenders' => array('default'),
@@ -118,9 +118,12 @@ return array(
 				
 				<pre class="prettyprint">Logger::configure('config.php');</pre>
 				
-				<div class="alert-message block-message info">
+				<div class="alert alert-info">
 					<p><strong>Hint:</strong> to translate a XML or properties configuration file to PHP, run the following code:</p>
-					<pre>Logger::configure('config.php');</pre>
+<pre class="prettyprint">
+$configurator = new LoggerConfiguratorDefault();
+$config = $configurator->parse('/path/to/config.xml');
+</pre>
 				</div>
 			</subsection>
 
@@ -131,10 +134,10 @@ return array(
 				<a href="logging.apache.org/log4j/1.2/manual.html">Apache log4j</a> and uses the same format. The only 
 				difference is that lines begin with <code>log4php</code> instead of <code>log4j</code>.</p>
 				
-				<div class="alert-message block-message warning">
-					<p>This format has been deprecated and will not be updated to include newly introduced features in 
-					the future. It is recommended that you use either the <a href="#XML">XML</a> or 
-					<a href="#PHP">PHP</a> configuration format.</p>
+				<div class="alert alert-warning">
+					<p>This format has been deprecated. Support will not be removed for the foreseeable future, however 
+					it may not be updated to include newly introduced features. It is recommended that you use either 
+					the <a href="#XML">XML</a> or <a href="#PHP">PHP</a> configuration format.</p>
 				</div>
 				
 				<p>The properites configuration format does not support filters.</p>
@@ -185,7 +188,7 @@ log4php.threshold = debug
 				
 				<p>The default configuration in PHP format is:</p>
 				
-<pre class="prettyprint">
+<pre class="prettyprint linenums">
 array(
     'rootLogger' => array(
         'appenders' => array('default'),
@@ -201,7 +204,7 @@ array(
 )
 </pre>
 
-				<div class="alert-message block-message info">
+				<div class="alert alert-info">
 					<p><strong>Hint:</strong> You can fetch the default configuration as a PHP array by running:</p>
 					<pre class="prettyprint">LoggerConfiguratorDefault::getDefaultConfiguration();</pre>
 				</div>
@@ -215,7 +218,7 @@ array(
 				
 				<p>Here is an example:</p>
 
-<pre class="prettyprint">
+<pre class="prettyprint linenums">
 class MyConfigurator implements LoggerConfigurator {
 	
     public function configure(LoggerHierarchy $hierarchy, $input = null) {
@@ -265,7 +268,7 @@ Logger::configure($configuration, 'MyCon
 // Passing the configurator as an instance
 Logger::configure($configuration, new MyConfigurator());
 </pre>
-				<div class="alert-message block-message warn">
+				<div class="alert alert-warning">
 					<p><strong>Note: </strong>Always call <code>activateOptions()</code> on all appenders, filters and layouts after setting
 					their configuration parameters. Otherwise, the configuration may not be properly activated.</p>
 				</div>



Mime
View raw message