incubator-photark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r940096 - /incubator/photark/site/trunk/templates/photark_confluence_html_export.xml
Date Sat, 01 May 2010 19:38:15 GMT
Author: lresende
Date: Sat May  1 19:38:15 2010
New Revision: 940096

URL: http://svn.apache.org/viewvc?rev=940096&view=rev
Log:
PHOTARK-32 - Updates to confluence export template to be compatible with latest confluence
release

Modified:
    incubator/photark/site/trunk/templates/photark_confluence_html_export.xml

Modified: incubator/photark/site/trunk/templates/photark_confluence_html_export.xml
URL: http://svn.apache.org/viewvc/incubator/photark/site/trunk/templates/photark_confluence_html_export.xml?rev=940096&r1=940095&r2=940096&view=diff
==============================================================================
--- incubator/photark/site/trunk/templates/photark_confluence_html_export.xml (original)
+++ incubator/photark/site/trunk/templates/photark_confluence_html_export.xml Sat May  1 19:38:15
2010
@@ -1,146 +1,114 @@
-<!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 PhotArk"/>
-   <META name="keywords" content="apache, apache photark, photark, free photo gallery,
open source photo gallery, photo, gallery, open source, opensource"/>
-#end
-##
-#macro (topNav)
-<div id="header">
- <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/photark/images/header_background.png">
-  <tr>
-    <td width="244" height="88">
-      <img src="http://incubator.apache.org/photark/images/photark_logo_small_transparent.gif"
 width="70%" height="70%" style="padding: 0 15px 15px 0;"/>
-    </td>
-    <td align="right"> 
-      <img src="http://incubator.apache.org/photark/images/apache-incubator-logo.png"
style="padding: 5px;"> 
-    </td>
-    <!-- Adds the edit page link to the top banner-->
-    <td valign="bottom">
-       #pageControls()
-    </td>
-  </tr>
- </table>
-</div>
-#end
-##
-#macro (pageControls)
-<div align="right" style="padding: 2px 10px; margin: 0px;">
-  <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
-  <img src="http://incubator.apache.org/photark/images/notep_16.gif" height="16" width="16"
border="0" align="absmiddle" title="Edit Page"></a>    
-</div>
-#end
-##
-#macro (breadCrumbs)
-<div id="topNavigator">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-  <tr class="topNavigator">
-    <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
-      &nbsp;$autoexport.breadcrumbs($page)
-    </td>
-    <td align="right" valign="middle" class="topNavigator" align="left" nowrap="true">
-      <a href="http://incubator.apache.org/photark/">PhotArk Home</a> | 
-      <a href="http://www.mail-archive.com/photark-user@incubator.apache.org/">User
List</a> | 
-      <a href="http://www.mail-archive.com/photark-dev@incubator.apache.org/">Dev List</a>
| 
-      <a href="http://issues.apache.org/jira/browse/PHOTARK">Issue Tracker</a>&nbsp;&nbsp;
-    </td>
-  </tr>
-</table>
-</div>
-#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)
-    ## Google Analytics script
-<script type="text/javascript">
-	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-	</script>
-	<script type="text/javascript">
-	var pageTracker = _gat._getTracker("UA-1174707-6");
-	pageTracker._trackPageview();
-        </script>
-#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 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>
-        #generateKeywords()
+        <!-- generateKeywords macro -->
+        <META name="description" content="Apache PhotArk"/>
+        <META name="keywords" content="apache, apache photark, photark, free photo gallery,
open source photo gallery, photo, gallery, open source, opensource"/>
+        <!-- generatekeywords macro end -->
 
         <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/photark/photark.css">
         <link rel="SHORTCUT ICON" href="$images/favicon.ico">   
-        <title>$page.title : Apache PhotArk</title>
+        <title>Apache PhotArk - $page.title</title>
     </head>
 
     <body onload="init()">
-        #topNav()
-
-        #breadCrumbs()
+    
+    <!-- topNav macro -->
+    <div id="header">
+     <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://incubator.apache.org/photark/images/header_background.png">
+      <tr>
+        <td width="244" height="88">
+          <img src="http://incubator.apache.org/photark/images/photark_logo_small_transparent.gif"
 width="70%" height="70%" style="padding: 0 15px 15px 0;"/>
+        </td>
+        <td align="right"> 
+          <img src="http://incubator.apache.org/photark/images/apache-incubator-logo.png"
style="padding: 5px;"> 
+        </td>
+        <!-- Adds the edit page link to the top banner-->
+        <td valign="bottom">
+           <!-- pageControls macro -->
+           <div align="right" style="padding: 2px 10px; margin: 0px;">
+             <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+             <img src="http://incubator.apache.org/photark/images/notep_16.gif" height="16"
width="16" border="0" align="absmiddle" title="Edit Page"></a>    
+           </div>
+           <!-- pageControls macro end -->
+        </td>
+      </tr>
+     </table>
+    </div>
+    <!-- topNav macro end -->
 
-        <table border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
-            <tr>
-                <td align="left" valign="top">
-                    #pageContent()
-                </td>
-            </tr>
+    <!-- breadCrumbs macro -->
+    <div id="topNavigator">
+        <table border="0" cellpadding="2" cellspacing="0" width="100%">
+          <tr class="topNavigator">
+            <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+              &nbsp;$autoexport.breadcrumbs($page)
+            </td>
+            <td align="right" valign="middle" class="topNavigator" align="left" nowrap="true">
+              <a href="http://incubator.apache.org/photark/">PhotArk Home</a>
| 
+              <a href="http://www.mail-archive.com/photark-user@incubator.apache.org/">User
List</a> | 
+              <a href="http://www.mail-archive.com/photark-dev@incubator.apache.org/">Dev
List</a> | 
+              <a href="http://issues.apache.org/jira/browse/PHOTARK">Issue Tracker</a>&nbsp;&nbsp;
+            </td>
+          </tr>
         </table>
+    </div>
 
-        #footer()
+    <!-- breadCrumbs macro end -->
+    <table border="0" cellpadding="0" width="100%" bgcolor="#FFFFFF">
+        <tr>
+           <td align="left" valign="top">
+                <!-- pageContent macro -->
+                <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>
+               <!-- pageContent macro end -->
+           </td>
+        </tr>
+    </table>
+
+    <!-- footer macro -->
+    ## Google Analytics script
+    <script type="text/javascript">
+	    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js'
type='text/javascript'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+	    var pageTracker = _gat._getTracker("UA-1174707-6");
+        pageTracker._trackPageview();
+    </script>
+    <!-- footer macro end -->
 
     </body>
 </html>
\ No newline at end of file



Mime
View raw message