bval-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r939356 - in /incubator/bval/site/resources: autoexport_template.xml site.css
Date Thu, 29 Apr 2010 16:04:20 GMT
Author: dwoods
Date: Thu Apr 29 16:04:19 2010
New Revision: 939356

URL: http://svn.apache.org/viewvc?rev=939356&view=rev
Log:
updates to fix site after upgrade to Confluence 3.2

Modified:
    incubator/bval/site/resources/autoexport_template.xml
    incubator/bval/site/resources/site.css

Modified: incubator/bval/site/resources/autoexport_template.xml
URL: http://svn.apache.org/viewvc/incubator/bval/site/resources/autoexport_template.xml?rev=939356&r1=939355&r2=939356&view=diff
==============================================================================
--- incubator/bval/site/resources/autoexport_template.xml (original)
+++ incubator/bval/site/resources/autoexport_template.xml Thu Apr 29 16:04:19 2010
@@ -1,3 +1,11 @@
+##
+#set($globalHelper = $action.getHelper())
+#set($renderer = $globalHelper.getWikiStyleRenderer())
+#set ($images = "http://people.apache.org/~dwoods/bval/images")
+#set ($resources = "http://people.apache.org/~dwoods/bval/resources")
+#set ($siteroot = "http://incubator.apache.org/bval")
+##
+
 <!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
@@ -17,42 +25,6 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License. 
 -->
-##
-#set ($images = "http://people.apache.org/~dwoods/bval/images")
-#set ($resources = "http://people.apache.org/~dwoods/bval/resources")
-#set ($siteroot = "http://incubator.apache.org/bval")
-##
-#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
-##
-#macro (renderMenuPage $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())
-            #set ($content =
-$content.replaceAll("<LI>([^<]*\\S)(\\s*)<UL", "<li><div
-onclick='SwitchMenu(this)'><h3>$1</h3>$2<ul"))
-            #set ($content = $content.replaceAll("</UL>(\\s*)</LI>",
-"</ul>$1</div></li>"))
-            $content
-        #end
-    #end
-#end
-##
 <html>
 <head>
   <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
@@ -89,30 +61,32 @@ onclick='SwitchMenu(this)'><h3>$1</h3>$2
       <div style="padding: 5px;">
         <div id="banner">
           <!-- Banner -->
-          #renderPage("Banner")
+#set($child = $pageManager.getPage($page.space.key,"Banner"))
+#set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+$content
           <!-- Banner -->
         </div>
       </div>
+      <!--
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
             <td>
               <div align="left">
-                <!-- Breadcrumbs -->
                 $autoexport.breadcrumbs($page)
-                <!-- Breadcrumbs -->
               </div>
             </td>
             <td>
               <div align="right">
-                <!-- Quicklinks -->
-                #renderPage("QuickLinks")
-                <!-- Quicklinks -->
+#set($child = $pageManager.getPage($page.space.key,"QuickLinks"))
+#set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+$content
               </div>
             </td>
           </tr>
         </table>
       </div>
+      -->
     </td>
     <td id="cell-1-3">&nbsp;</td>
     <td id="cell-1-4">&nbsp;</td>
@@ -128,13 +102,16 @@ onclick='SwitchMenu(this)'><h3>$1</h3>$2
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-                    #renderPage("Navigation")
+#set($child = $pageManager.getPage($page.space.key,"Navigation"))
+#set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+$content
                     <!-- NavigationBar -->
               </div>
             </div>
           </div>
+          </div>
          </td>
-         <td height="100%" width="100%">
+         <td height="100%">
            <!-- Content -->
            <div class="wiki-content">$body</div>
            <!-- Content -->

Modified: incubator/bval/site/resources/site.css
URL: http://svn.apache.org/viewvc/incubator/bval/site/resources/site.css?rev=939356&r1=939355&r2=939356&view=diff
==============================================================================
--- incubator/bval/site/resources/site.css (original)
+++ incubator/bval/site/resources/site.css Thu Apr 29 16:04:19 2010
@@ -9,7 +9,7 @@ body {
 #cell-1-0 { background: transparent url( '../images/bg.png' ) repeat-x top; }
 #cell-1-1 { background: transparent url( '../images/bg02-purple-left.png' ) no-repeat right
top; width:13px; }
 #cell-1-2 { background: transparent url( '../images/bg.png' ) repeat-x top; width:85%; }
-#banner { height: 80px; } 
+#banner { height: 100px; } 
 #cell-1-3 { background: transparent url( '../images/bg02-purple-right.png' ) no-repeat left
top; width:13px; }
 #cell-1-4 { background: transparent url( '../images/bg.png' ) repeat-x top; }
 #cell-2-0 { background: white url( '../images/bg02-white-left-nogr.png' ) repeat-y right
top; }



Mime
View raw message