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 )
+ <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( '\\', '/' ) )
- #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
+ <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 )
@@ -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 <span id="publishDate">$i18n.getString( "site-renderer",
$locale, "template.lastpublished" ): $dateToday</span>
+ <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
@@ -501,6 +500,17 @@
</head>
<body class="composite" onload="siteOnLoad()">
+ <div class="topbar">
+ <div class="topbar-inner">
+ <div class="container-fluid">
+ <a class="brand" href="$relativePath">$project.name</a>
+ #links( $decoration.body.links )
+ </div>
+ </div>
+ </div>
+
+ <div style="padding-top: 40px;"></div>
+
<div class="container-fluid">
<div id="banner">
#banner( $decoration.bannerLeft "bannerLeft" )
@@ -512,7 +522,7 @@
<div class="breadcrumb">
#publishDate( "left" $decoration.publishDate $decoration.version )
- <div class="pull-right">#links( $decoration.body.links )#publishDate(
"right" $decoration.publishDate $decoration.version )</div>
+ <div class="pull-right">#publishDate( "right" $decoration.publishDate
$decoration.version )</div>
<div class="clear"><hr/></div>
</div>
@@ -533,6 +543,7 @@
</div>
</div>
+
<div class="footer">
<p>Copyright ©#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>.
@@ -540,6 +551,5 @@
<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/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 @@
<version position="right"/>
<body>
+ <links>
+ <item name="About" href="/index.html" />
+ <item name="Download" href="/download.html" />
+ <item name="Install" href="/install.html" />
+ <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" />
@@ -42,43 +49,39 @@
<item name="About" href="/index.html" />
<item name="Download" href="/download.html" />
<item name="Install" href="/install.html" />
- <item name="Changelog" href="/changelog .html" />
+ <item name="Changelog" href="/changelog.html" />
</menu>
<menu name="Documentation">
<item name="Quick start" href="/quickstart.html" />
- <item name="Manual" href="/docs/introduction.html">
- <item name="Introduction"
href="/docs/introduction.html" />
- <item name="Configuration"
href="/docs/configuration.html" />
- <item name="Loggers" href="/docs/loggers.html"
/>
- <item name="Appenders"
href="/docs/appenders.html" collapse="true">
- <item name="Console"
href="/docs/appenders/console.html" />
- <item name="Echo"
href="/docs/appenders/echo.html" />
- <item name="File"
href="/docs/appenders/file.html" />
- <item name="Daily File"
href="/docs/appenders/daily-file.html" />
- <item name="Rolling File"
href="/docs/appenders/rolling-file.html" />
- <item name="Mail"
href="/docs/appenders/mail.html" />
- <item name="Mail Event"
href="/docs/appenders/mail-event.html" />
- <item name="MongoDB"
href="/docs/appenders/mongodb.html" />
- <item name="Null"
href="/docs/appenders/null.html" />
- <item name="PDO"
href="/docs/appenders/pdo.html" />
- <item name="PHP"
href="/docs/appenders/php.html" />
- <item name="Socket"
href="/docs/appenders/socket.html" />
- <item name="Syslog"
href="/docs/appenders/syslog.html" />
- </item>
- <item name="Layouts" href="/docs/layouts.html"
collapse="true">
- <item name="LoggerLayoutHtml"
href="/docs/layouts/html.html" />
- <item name="LoggerLayoutPattern"
href="/docs/layouts/pattern.html" />
- <item name="LoggerLayoutSimple"
href="/docs/layouts/simple.html" />
- <item name="LoggerLayoutTTCC"
href="/docs/layouts/ttcc.html" />
- <item name="LoggerLayoutXml"
href="/docs/layouts/xml.html" />
- </item>
- <item name="Threshold"
href="/docs/threshold.html" />
- <item name="Filters" href="/docs/filters.html"
/>
- <item name="Renderers"
href="/docs/renderers.html" />
- <item name="Performance"
href="/docs/performance.html" />
+ <item name="Introduction"
href="/docs/introduction.html" />
+ <item name="Configuration"
href="/docs/configuration.html" />
+ <item name="Loggers" href="/docs/loggers.html" />
+ <item name="Appenders" href="/docs/appenders.html"
collapse="true">
+ <item name="Console"
href="/docs/appenders/console.html" />
+ <item name="Echo"
href="/docs/appenders/echo.html" />
+ <item name="File"
href="/docs/appenders/file.html" />
+ <item name="Daily File"
href="/docs/appenders/daily-file.html" />
+ <item name="Rolling File"
href="/docs/appenders/rolling-file.html" />
+ <item name="Mail"
href="/docs/appenders/mail.html" />
+ <item name="Mail Event"
href="/docs/appenders/mail-event.html" />
+ <item name="MongoDB"
href="/docs/appenders/mongodb.html" />
+ <item name="Null"
href="/docs/appenders/null.html" />
+ <item name="PDO"
href="/docs/appenders/pdo.html" />
+ <item name="PHP"
href="/docs/appenders/php.html" />
+ <item name="Socket"
href="/docs/appenders/socket.html" />
+ <item name="Syslog"
href="/docs/appenders/syslog.html" />
+ </item>
+ <item name="Layouts" href="/docs/layouts.html"
collapse="true">
+ <item name="LoggerLayoutHtml"
href="/docs/layouts/html.html" />
+ <item name="LoggerLayoutPattern"
href="/docs/layouts/pattern.html" />
+ <item name="LoggerLayoutSimple"
href="/docs/layouts/simple.html" />
+ <item name="LoggerLayoutTTCC"
href="/docs/layouts/ttcc.html" />
+ <item name="LoggerLayoutXml"
href="/docs/layouts/xml.html" />
</item>
- <item name="API docs" href="/apidocs/index.html" />
+ <item name="Filters" href="/docs/filters.html" />
+ <item name="Renderers" href="/docs/renderers.html" />
+ <item name="API documentation"
href="/apidocs/index.html" />
</menu>
<menu name="Community">
