Return-Path: 
 <scm-return-49121-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 09B68D0F8
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Sat, 19 Jan 2013 06:34:46 +0000 (UTC)
Received: (qmail 58829 invoked by uid 500); 19 Jan 2013 06:34:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 58730 invoked by uid 500); 19 Jan 2013 06:34:46 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 58709 invoked by uid 99); 19 Jan 2013 06:34:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jan 2013 06:34:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jan 2013 06:34:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BE70623888D2;
	Sat, 19 Jan 2013 06:34:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Sat, 19 Jan 2013 06:34:24 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130119063424.BE70623888D2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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();