Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52EEC95D5 for ; Wed, 19 Oct 2011 05:18:17 +0000 (UTC) Received: (qmail 59122 invoked by uid 500); 19 Oct 2011 05:18:17 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 59095 invoked by uid 500); 19 Oct 2011 05:18:16 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 59088 invoked by uid 99); 19 Oct 2011 05:18:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 05:18:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 05:18:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B46492388847; Wed, 19 Oct 2011 05:17:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1185973 - in /logging/log4php/branches/experimental/config-adapters/src/site: site.vm site.xml Date: Wed, 19 Oct 2011 05:17:49 -0000 To: commits@logging.apache.org From: ihabunek@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111019051749.B46492388847@eris.apache.org> Author: ihabunek Date: Wed Oct 19 05:17:49 2011 New Revision: 1185973 URL: http://svn.apache.org/viewvc?rev=1185973&view=rev Log: Added topbar with links and reorganised site menu. Modified: logging/log4php/branches/experimental/config-adapters/src/site/site.vm logging/log4php/branches/experimental/config-adapters/src/site/site.xml Modified: logging/log4php/branches/experimental/config-adapters/src/site/site.vm URL: http://svn.apache.org/viewvc/logging/log4php/branches/experimental/config-adapters/src/site/site.vm?rev=1185973&r1=1185972&r2=1185973&view=diff ============================================================================== --- logging/log4php/branches/experimental/config-adapters/src/site/site.vm (original) +++ logging/log4php/branches/experimental/config-adapters/src/site/site.vm Wed Oct 19 05:17:49 2011 @@ -104,16 +104,21 @@ #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 ) - | + #set ( $activeClass = "" ) + #if ( $alignedFileName == $currentItemHref) + #set ( $activeClass = ' class="active"' ) #end + + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height ) + #end +
#end ## #macro ( breadcrumbs $breadcrumbs ) @@ -320,15 +325,9 @@ #set ( $breadcrumbs = $decoration.body.breadcrumbs ) #set ( $links = $decoration.body.links ) - #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 ) - #set ( $prefix = " |" ) - #else - #set ( $prefix = "" ) - #end -## #if ( $datePosition.equalsIgnoreCase( $position ) ) #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) ) - $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday + $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday #if ( $versionPosition.equalsIgnoreCase( $position ) ) | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version} #end @@ -501,6 +500,17 @@ +
+
+
+ $project.name + #links( $decoration.body.links ) +
+
+
+ +
+
+

Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version ) Licensed under the Apache Software License, Version 2.0. @@ -540,6 +551,5 @@

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.

- Modified: logging/log4php/branches/experimental/config-adapters/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4php/branches/experimental/config-adapters/src/site/site.xml?rev=1185973&r1=1185972&r2=1185973&view=diff ============================================================================== --- logging/log4php/branches/experimental/config-adapters/src/site/site.xml (original) +++ logging/log4php/branches/experimental/config-adapters/src/site/site.xml Wed Oct 19 05:17:49 2011 @@ -32,6 +32,13 @@ + + + + + + + @@ -42,43 +49,39 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + +