You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/04/29 19:16:12 UTC

svn commit: r939387 - /openjpa/site/confluence_autoexport.xml

Author: dwoods
Date: Thu Apr 29 17:16:11 2010
New Revision: 939387

URL: http://svn.apache.org/viewvc?rev=939387&view=rev
Log:
updated template to support Confluence 3.2

Modified:
    openjpa/site/confluence_autoexport.xml

Modified: openjpa/site/confluence_autoexport.xml
URL: http://svn.apache.org/viewvc/openjpa/site/confluence_autoexport.xml?rev=939387&r1=939386&r2=939387&view=diff
==============================================================================
--- openjpa/site/confluence_autoexport.xml (original)
+++ openjpa/site/confluence_autoexport.xml Thu Apr 29 17:16:11 2010
@@ -1,21 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-##
-##
-#set ($images = "http://openjpa.apache.org/images")
-#set ($siteroot = "http://openjpa.apache.org")
-#set ($pageContentHeaderEnabled = false)
-##
-#macro (renderPage $title)
-    #set($globalHelper = $action.getGlobalHelper())
-    #set($renderer = $globalHelper.getWikiStyleRenderer())
-    #foreach ($child in $page.space.pages)
-        #if ($child.title.equals($title))
-            #set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
-            $content
-        #end
-    #end
-#end
-##
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -32,6 +15,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+##
+#set ($images = "http://openjpa.apache.org/images")
+#set ($siteroot = "http://openjpa.apache.org")
+#set ($pageContentHeaderEnabled = false)
+##
+#set($globalHelper = $action.getHelper())
+#set($renderer = $globalHelper.getWikiStyleRenderer())
+##
 <html lang="en">
 <head>
     <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
@@ -44,7 +35,7 @@
     <META name="Robots" content="index, follow" />
     <META name="Security" content="Public" />
     <META name="Source" content="wiki template" />
-    <META name="DC.Date" scheme="iso8601" content="2010-01-25" />
+    <META name="DC.Date" scheme="iso8601" content="2010-04-29" />
     <META name="DC.Language" scheme="rfc1766" content="en" />
     <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
     <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
@@ -65,18 +56,6 @@
   <div class="content_l">
     <div class="content_r">
       <div>
-
-        <!-- Old Banner
-        ##renderPage("Banner")
-        <div id="header_background">
-          <div id="openjpa_logo">
-            <a style="float: left; width: 280px; display: block; text-indent:-5000px; text-decoration: none;line-height: 60px; margin-top: 10px; margin-left: 100px;" href="http://openjpa.apache.org/">OpenJPA</a>
-            <div id="asf_logo">
-              <a style="float:right; width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:15px; margin-right:10px;" href="http://www.apache.org/" title="The Apache Software Foundation">ASF</A>
-            </div>
-          </div>
-        </div>
-        -->
         <!-- Banner -->
         <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
           <TR>
@@ -95,10 +74,17 @@
         <!-- Navigation Bar -->
         <div class="top_red_bar">
           <div id="site-breadcrumbs">
+            <!-- Breadcrumbs -->
 $autoexport.breadcrumbs($page)
+            <!-- Breadcrumbs -->
           </div>
           <div id="site-quicklinks">
-#renderPage("Top Navigation Bar")
+            <!-- Quicklinks -->
+#set($child = $pageManager.getPage($page.space.key,"QuickLinks"))
+#set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+#set($content = $content.replaceAll("^<[pP]>|</[pP]>$", "") )
+$content
+            <!-- Quicklinks -->
           </div>
         </div>
 
@@ -115,7 +101,12 @@ $autoexport.breadcrumbs($page)
           <div class="navigation">
             <div class="navigation_top">
               <div class="navigation_bottom">
-                #renderPage("SideNav")
+                <!-- NavigationBar -->
+#set($child = $pageManager.getPage($page.space.key,"SideNav"))
+#set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+#set($content = $content.replaceAll("^<[pP]>|</[pP]>$", "") )
+$content
+                <!-- NavigationBar -->
               </div>
             </div>
           </div>