community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r949228 - /comdev/admin/confluence/COMxDEV_confluence_html_export.xml
Date Fri, 28 May 2010 16:49:25 GMT
Author: lresende
Date: Fri May 28 16:49:25 2010
New Revision: 949228

URL: http://svn.apache.org/viewvc?rev=949228&view=rev
Log:
Inlining velocity macros as they have stopped working after recent confluence/export plugin
updates

Modified:
    comdev/admin/confluence/COMxDEV_confluence_html_export.xml

Modified: comdev/admin/confluence/COMxDEV_confluence_html_export.xml
URL: http://svn.apache.org/viewvc/comdev/admin/confluence/COMxDEV_confluence_html_export.xml?rev=949228&r1=949227&r2=949228&view=diff
==============================================================================
--- comdev/admin/confluence/COMxDEV_confluence_html_export.xml (original)
+++ comdev/admin/confluence/COMxDEV_confluence_html_export.xml Fri May 28 16:49:25 2010
@@ -1,55 +1,35 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 ##
 #set ($pageContentHeaderEnabled = false)
 ##
-#macro (spacer $width $height)
-    ##
-    ## Note: Replaced the spacer.gif with a table because IE wont honor the image height
-    ## 
-    ## <IMG src="$images/spacer.gif" width="$width" height="$height" border="0">
-    ##
-    <TABLE> <!-- spacer -->
-        <TR>
-            <td width="$width" height="$height"></td>
-        </TR>
-    </TABLE>
-#end
-##
-#macro (renderPage $title)
-    #set($globalHelper = $action.getGlobalHelper())
-    #set($renderer = $globalHelper.getWikiStyleRenderer())  
-
-    ##
-    ## FIXME: Must be a more efficient way to find a page...
-    ##
-    
-    #foreach ($child in $page.space.pages)
-        #if ($child.title.equals($title))
-            #set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
-
-            ##
-            ## HACK: Remove the leading <P> and trailing </P>
-            ##
-
-            #set ($content = $content.substring(3, $content.length()))
-            #set ($end = $content.length() - 4)
-            #set ($content = $content.substring(0, $end))            
-
-            $content
-        #end
-    #end
-#end
-##
-#macro (generateKeywords)
-   <META name="description" content="Apache Community Development"/>
-   <META name="keywords" content="apache, apache community, community development, opensource"/>
-#end
-##
-#macro (generateIncludeStyles)
-    <META http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<LINK rel="stylesheet" href="http://www.apache.org/style/compressed.css" type="text/css"
media="screen, projection">
-	<LINK rel="stylesheet" href="http://www.apache.org/style/style.css" type="text/css" media="screen,
projection">
-	<style type="text/css">
+<!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 or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<html>
+    <head>
+       <META name="description" content="Apache Community Development"/>
+       <META name="keywords" content="apache, apache community, community development,
opensource"/>
+
+		
+	   <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+   	   <LINK rel="stylesheet" href="http://www.apache.org/style/compressed.css" type="text/css"
media="screen, projection">
+       <LINK rel="stylesheet" href="http://www.apache.org/style/style.css" type="text/css"
media="screen, projection">
+	   <style type="text/css">
 .code {
 	border: 1px dashed #3c78b5;
 	font-size: 11px;
@@ -87,90 +67,54 @@
 	background-color: #f0f0f0;
 	padding: 3px;
 }
-    </style>
-#end
-##
-#macro (topNav)
-	<div class="container">
-	<HR class="space col">
-	<DIV class="block">
-		<DIV class="column span-24">
-        <DIV id="header">
-            <h1>The Apache Software Foundation<BR />
-            <SPAN class="alt"><small>Meritocracy in Action.</small></SPAN></h1>
-         </DIV>
-      </DIV>
-	</DIV>
-	<HR/>
-#end
-##
-#macro (pageControls)
-   <DIV align="right" style="padding: 2px 10px; margin: 0px;">
-        <A href="$confluenceUri/pages/editpage.action?pageId=$page.id">
-            <IMG src="http://tuscany.apache.org/images/notep_16.gif" height="16" width="16"
border="0" align="absmiddle" title="Edit Page"></A>    
-   </DIV>
-#end
-##
-#macro (breadCrumbs)
-    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
-        <TR class="topBar">
-            <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
-                &nbsp;$autoexport.breadcrumbs($page)
-            </td>
-            <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
-            <A href="http://community.apache.org">Apache Community Development</A>
| <A href="http://mail-archives.apache.org/mod_mbox/community-dev/">Mailling List</A>
-            </td>
-        </TR>
-    </TABLE>
-#end
-##
-#macro (pageContent)
-    <DIV id="PageContent">
-        #if ($pageContentHeaderEnabled)
-            <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
-                <DIV style="margin: 0px 10px 0px 10px" class="smalltext">$page.space.name</DIV>
-                <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">$page.title</DIV>
-            </DIV>
-        #end
-        
-        <DIV class="pagecontent">
-            <DIV class="wiki-content">
-                $body
-            </DIV>
-        </DIV>
-    </DIV>
-#end
-##
-#macro (footer)
-    <DIV class="footer">
-        Copyright © 2003-2009, The Apache Software Foundation&nbsp;&nbsp;
-    </DIV>
-#end
-##
-<html>
-    <head>
-        #generateKeywords()
-		
-		#generateIncludeStyles()
+        </style>
 
         <LINK rel="SHORTCUT ICON" href="$images/favicon.ico">   
-        <TITLE>$page.title : Apache Community Development</TITLE>
+        <TITLE>Apache Community Development - $page.title</TITLE>
     </head>
 
     <body onload="init()">
-        #topNav()
-
-        #breadCrumbs()
+    	<div class="container">
+    	<HR class="space col">
+    	<DIV class="block">
+    		<DIV class="column span-24">
+            <DIV id="header">
+                <h1>The Apache Software Foundation<BR />
+                <SPAN class="alt"><small>Meritocracy in Action.</small></SPAN></h1>
+             </DIV>
+          </DIV>
+    	</DIV>
+    	<HR/>
+
+
+        <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+            <TR class="topBar">
+                <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                    &nbsp;$autoexport.breadcrumbs($page)
+                </td>
+                <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+                    <A href="http://community.apache.org">Apache Community Development</A>
| <A href="http://mail-archives.apache.org/mod_mbox/community-dev/">Mailling List</A>
+                </td>
+            </TR>
+        </TABLE>
 
         <TABLE border="0" cellpadding="0" width="100%">
             <TR>
                 <td align="left" valign="top">
-                    #pageContent()
+                  <DIV id="PageContent">        
+                     <DIV class="pagecontent">
+                         <DIV class="wiki-content">
+                          $body
+                         </DIV>
+                     </DIV>
+                  </DIV>
                 </td>
             </TR>
         </TABLE>
 
-        #footer()
+        <DIV class="footer">
+            Copyright © 2003-2009, The Apache Software Foundation&nbsp;&nbsp;
+        </DIV>
 
     </BODY>
 </HTML>



Mime
View raw message