From 6a8d414bc27ac8c144b5f95be7c2d3ed8ee9c208 Mon Sep 17 00:00:00 2001
From: Stefan Koenen <stefan.koenen@uni-duesseldorf.de>
Date: Mon, 24 Sep 2012 16:19:31 +0200
Subject: [PATCH] Changes to make it compatible to the
 adhocracy.adhocracy_theme "no_wordpress" branch

---
 adhocracy/wordpressbasic_theme/rules_header.xml    | 2 +-
 adhocracy/wordpressbasic_theme/rules_pages.xml     | 8 ++++----
 adhocracy/wordpressbasic_theme/rules_startpage.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adhocracy/wordpressbasic_theme/rules_header.xml b/adhocracy/wordpressbasic_theme/rules_header.xml
index 3be0750..ca7f492 100644
--- a/adhocracy/wordpressbasic_theme/rules_header.xml
+++ b/adhocracy/wordpressbasic_theme/rules_header.xml
@@ -7,7 +7,7 @@
   <replace theme="/html/head/title" content="/html/head/title" if="not(contains($path, '/_pages'))" />
   <replace theme="/html/head/title" if-path="/_pages">
     <xsl:variable name="url_path" select="substring-after($path, '/_pages/')"/>
-    <xsl:variable name="url_page" select="concat('http://', $wordpress_backend, '/', $url_path)"/>
+    <xsl:variable name="url_page" select="concat($backend, '/', $url_path)"/>
     <xsl:copy-of select="document($url_page)/html/head/title"/>
   </replace>
 
diff --git a/adhocracy/wordpressbasic_theme/rules_pages.xml b/adhocracy/wordpressbasic_theme/rules_pages.xml
index 8e26166..4585820 100644
--- a/adhocracy/wordpressbasic_theme/rules_pages.xml
+++ b/adhocracy/wordpressbasic_theme/rules_pages.xml
@@ -14,22 +14,22 @@
     <!--Merge wordpress content section-->
     <replace css:content-children="#col1_content" >
       <xsl:variable name="url_path" select="substring-after($path, '/_pages/')"/>
-      <xsl:variable name="url_page" select="concat('http://', $wordpress_backend, '/', $url_path)"/>
+      <xsl:variable name="url_page" select="concat( $backend, '/', $url_path)"/>
       <xsl:copy-of select="document($url_page)//*[contains(@class, 'entry-content')]/*"/>
     </replace>
     <replace css:content="#col3_content">
       <xsl:variable name="url_path" select="substring-after($path, '/_pages/')"/>
-      <xsl:variable name="url_page" select="concat('http://', $wordpress_backend, '/', $url_path)"/>
+      <xsl:variable name="url_page" select="concat( $backend, '/', $url_path)"/>
       <xsl:copy-of select="document($url_page)//*[@id='secondary']"/>
     </replace>
 
     <!--Merge in wordpress javascript to generate tabs-->
     <replace css:content-children="#external_scripts">
-       <xsl:variable name="url_startpage" select="concat('http://', $wordpress_backend_startseite)"/>
+      <xsl:variable name="url_startpage" select="concat( $backend, '/startseite/')"/>
        <xsl:copy-of select="document($url_startpage)/html/body/script[position() &gt; 1]"/>
     </replace>
     <before theme="/html/head/link[last()]">
-      <xsl:variable name="url_startpage" select="concat('http://', $wordpress_backend_startseite)"/>
+      <xsl:variable name="url_startpage" select="concat( $backend, '/startseite/')"/>
       <xsl:copy-of select="document($url_startpage)/html/head/link[contains(@href, '.ui.')]"/>
     </before>
 
diff --git a/adhocracy/wordpressbasic_theme/rules_startpage.xml b/adhocracy/wordpressbasic_theme/rules_startpage.xml
index 2a5d3a3..b0a97ab 100644
--- a/adhocracy/wordpressbasic_theme/rules_startpage.xml
+++ b/adhocracy/wordpressbasic_theme/rules_startpage.xml
@@ -9,8 +9,8 @@
 
     <!--WARNING: throws error if the wordpress backend is not available-->
     <!--Merge wordpress content section-->
-    <replace css:content-children="div#content-startpage" if="not($wordpress_backend = '')" >
-      <xsl:variable name="url_startpage" select="concat('http://', $wordpress_backend_startseite)"/>
+    <replace css:content-children="div#content-startpage" if="not($backend = '')" >
+      <xsl:variable name="url_startpage" select="concat( $backend, '/startseite/' )"/>
       <xsl:copy-of select="document($url_startpage)//*[contains(@class, 'entry-content')]/*"/>
        <p><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></p>
     </replace>