You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/10/22 11:09:43 UTC
svn commit: r1026259 - /jackrabbit/site/style/template.vm
Author: jukka
Date: Fri Oct 22 09:09:43 2010
New Revision: 1026259
URL: http://svn.apache.org/viewvc?rev=1026259&view=rev
Log:
JCRSITE-29: Implement Apache project branding requirements
Add trademark notice to the page footer. Plus some cleanups.
Modified:
jackrabbit/site/style/template.vm
Modified: jackrabbit/site/style/template.vm
URL: http://svn.apache.org/viewvc/jackrabbit/site/style/template.vm?rev=1026259&r1=1026258&r2=1026259&view=diff
==============================================================================
--- jackrabbit/site/style/template.vm (original)
+++ jackrabbit/site/style/template.vm Fri Oct 22 09:09:43 2010
@@ -6,15 +6,6 @@
#set ($content = $content.replaceAll("<SUP><IMG class=\"rendericon\" src=\"http://cwiki.apache.org/confluence/images/icons/mail_small.gif\" height=\"12\" width=\"13\" align=\"absmiddle\" alt=\"\" border=\"0\"></SUP></A>","</A><SUP><IMG class=\"rendericon\" src=\"http://cwiki.apache.org/confluence/images/icons/mail_small.gif\" height=\"12\" width=\"13\" align=\"absmiddle\" alt=\"\" border=\"0\"></SUP>"))
$content
#end
-#macro (renderPage $title)
- #set($renderer = $action.getGlobalHelper().getWikiStyleRenderer())
- #foreach ($child in $page.space.pages)
- #if (($child.title.equals($title)) && ( $child.contentStatus.equals("current")))
- #set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
- #simplify($content)
- #end
- #end
-#end
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -47,7 +38,10 @@
</div>
<div id="body">
<div id="navigation">
-#renderPage("Navigation")
+#set($renderer = $action.getHelper().getWikiStyleRenderer())
+#set($child = $pageManager.getPage($page.space.key,"Navigation"))
+#set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+#simplify($content)
</div>
<div id="content">
<h1>$page.title</h1>
@@ -57,9 +51,12 @@
</div>
<div id="footer">
<p>
- © 2004-2009 The Apache Software Foundation.
+ © 2004-2010 The Apache Software Foundation.
- <a href="$base/privacy-policy.html">Privacy Policy</a> -
[<a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit this page</a>]
+ <br>
+ Apache Jackrabbit, Jackrabbit, Apache, the Apache feather logo, and the Apache
+ Jackrabbit project logo are trademarks of The Apache Software Foundation.
</p>
</div>
</div>