You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2013/01/19 07:34:24 UTC
svn commit: r1435496 - in /geronimo/site/trunk:
template/GMOxSITE_autoexport_template.xml
template/xbean_autoexport_template.xml
wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Author: gawor
Date: Sat Jan 19 06:34:24 2013
New Revision: 1435496
URL: http://svn.apache.org/viewvc?rev=1435496&view=rev
Log:
update templates to generate right edit links for blog entires
Modified:
geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml
geronimo/site/trunk/template/xbean_autoexport_template.xml
geronimo/site/trunk/wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Modified: geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml?rev=1435496&r1=1435495&r2=1435496&view=diff
==============================================================================
--- geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml (original)
+++ geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml Sat Jan 19 06:34:24 2013
@@ -60,8 +60,12 @@
<!-- Adds the edit page link to the top banner-->
<td valign="bottom">
<div style="padding: 2px 10px; margin: 0px;">
- <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
- <img src="http://geronimo.apache.org/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page" alt="Edit Page"></a>
+ #if ($isBlogEntry)
+ <a href="$confluenceUri/pages/editblogpost.action?pageId=$page.id">
+ #else
+ <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+ #end
+ <img src="http://geronimo.apache.org/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page" alt="Edit Page"></a>
</div>
</td>
##
Modified: geronimo/site/trunk/template/xbean_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/xbean_autoexport_template.xml?rev=1435496&r1=1435495&r2=1435496&view=diff
==============================================================================
--- geronimo/site/trunk/template/xbean_autoexport_template.xml (original)
+++ geronimo/site/trunk/template/xbean_autoexport_template.xml Sat Jan 19 06:34:24 2013
@@ -72,8 +72,12 @@
##
#macro (pageControls)
<div align="right" style="padding: 2px 10px; margin: 0px;">
- <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
- <img src="$images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+ #if ($isBlogEntry)
+ <a href="$confluenceUri/pages/editblogpost.action?pageId=$page.id">
+ #else
+ <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+ #end
+ <img src="$images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
</div>
#end
##
Modified: geronimo/site/trunk/wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java?rev=1435496&r1=1435495&r2=1435496&view=diff
==============================================================================
--- geronimo/site/trunk/wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java (original)
+++ geronimo/site/trunk/wiki-export/src/main/java/org/apache/cxf/cwiki/SiteExporter.java Sat Jan 19 06:34:24 2013
@@ -412,6 +412,7 @@ public class SiteExporter implements Run
ctx.put("confluenceUri", ROOT);
ctx.put("pageManager", pageManager);
ctx.put("renderer", renderer);
+ ctx.put("isBlogEntry", Boolean.TRUE);
File file = new File(outputDir, entry.getPath());
file.getParentFile().mkdirs();