openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r984465 - /openjpa/site/confluence_autoexport.xml
Date Wed, 11 Aug 2010 16:32:14 GMT
Author: dwoods
Date: Wed Aug 11 16:32:14 2010
New Revision: 984465

URL: http://svn.apache.org/viewvc?rev=984465&view=rev
Log:
latest Confluence autoexport template updates to move the navigation menu to the left side,
as some wiki content was pushing it off the screen when it was on the right side.

Modified:
    openjpa/site/confluence_autoexport.xml

Modified: openjpa/site/confluence_autoexport.xml
URL: http://svn.apache.org/viewvc/openjpa/site/confluence_autoexport.xml?rev=984465&r1=984464&r2=984465&view=diff
==============================================================================
--- openjpa/site/confluence_autoexport.xml (original)
+++ openjpa/site/confluence_autoexport.xml Wed Aug 11 16:32:14 2010
@@ -35,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-07-28" />
+    <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
     <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))'/>
@@ -84,6 +84,7 @@ $autoexport.breadcrumbs($page)
 #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
 #set($content = $content.replaceAll("^<[pP]>|</[pP]>$", "") )
 $content
+        (<a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit</a>)
             <!-- Quicklinks -->
           </div>
         </div>
@@ -91,12 +92,7 @@ $content
     <!-- Content -->
     <table border="0">
     <tbody>
-        <tr>
-        <td valign="top" width="100%" style="overflow:hidden;">
-          <div class="wiki-content">
-          $body
-          </div>
-        </td>
+      <tr>
         <td valign="top">
           <div class="navigation">
             <div class="navigation_top">
@@ -111,7 +107,12 @@ $content
             </div>
           </div>
         </td>
-        </tr>
+        <td valign="top" width="100%" style="overflow:hidden;">
+          <div class="wiki-content">
+          $body
+          </div>
+        </td>
+      </tr>
     </tbody>
         </table>
 
@@ -126,7 +127,6 @@ $content
   <div class="footer_l">
     <div class="footer_r">
       <div>
-        (<a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit page</a>)
       </div>
     </div>
   </div>



Mime
View raw message