From: Tomas Sedovic <[email protected]>

Since the Markdown filter interferes with the Outline filter in the project,
we will render all external documentation files through a separate partial
that has no other filters.
---
 deltacloud.org/content/_external.haml     |    6 ++++++
 deltacloud.org/content/api.haml           |    5 ++---
 deltacloud.org/content/client-ruby.haml   |    3 +--
 deltacloud.org/content/contribute.haml    |    3 +--
 deltacloud.org/content/documentation.haml |    3 +--
 deltacloud.org/content/drivers.haml       |    5 ++---
 deltacloud.org/content/framework.haml     |    3 +--
 7 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 deltacloud.org/content/_external.haml

diff --git a/deltacloud.org/content/_external.haml 
b/deltacloud.org/content/_external.haml
new file mode 100644
index 0000000..845f5c0
--- /dev/null
+++ b/deltacloud.org/content/_external.haml
@@ -0,0 +1,6 @@
+---
+filter:
+  - haml
+  - markdown
+---
+= File.open(path).read
diff --git a/deltacloud.org/content/api.haml b/deltacloud.org/content/api.haml
index 28b8a4f..87c9a98 100644
--- a/deltacloud.org/content/api.haml
+++ b/deltacloud.org/content/api.haml
@@ -3,10 +3,9 @@ title: Deltacloud - Documentation
 area: documentation
 extension: html
 filter:
-  - erb
-  - markdown
+  - haml
   - outline
 ---
 <toc class="toc" numbering="off" toc_style="ul" toc_range="h2-h3" />
 
-<%= File.open('../docs/api.mdown').read %>
+= render(:partial => "external", :locals => {:path => '../docs/api.mdown'} )
diff --git a/deltacloud.org/content/client-ruby.haml 
b/deltacloud.org/content/client-ruby.haml
index 94960db..d7e3ee5 100644
--- a/deltacloud.org/content/client-ruby.haml
+++ b/deltacloud.org/content/client-ruby.haml
@@ -4,9 +4,8 @@ area: documentation
 extension: html
 filter:
   - haml
-  - markdown
   - outline
 ---
 <toc class="toc" numbering="off" toc_style="ul" toc_range="h2-h3" />
 
-= File.open('../docs/client-ruby.mdown').read
+= render(:partial => "external", :locals => {:path => 
'../docs/client-ruby.mdown'} )
diff --git a/deltacloud.org/content/contribute.haml 
b/deltacloud.org/content/contribute.haml
index a5293fe..c908683 100644
--- a/deltacloud.org/content/contribute.haml
+++ b/deltacloud.org/content/contribute.haml
@@ -3,7 +3,6 @@ title: Deltacloud - Contribute
 extension: html
 filter:
   - haml
-  - markdown
   - outline
 ---
 <toc class="toc" numbering="off" toc_style="ul" toc_range="h2-h3" />
@@ -46,4 +45,4 @@ filter:
       [6]: http://kernel.org/pub/software/scm/git/docs/git-format-patch.html
       [7]: http://kernel.org/pub/software/scm/git/docs/git-send-email.html
 
-= File.open('../README').read
+= render(:partial => "external", :locals => {:path => '../README'} )
diff --git a/deltacloud.org/content/documentation.haml 
b/deltacloud.org/content/documentation.haml
index 7ddfeeb..99f1fcc 100644
--- a/deltacloud.org/content/documentation.haml
+++ b/deltacloud.org/content/documentation.haml
@@ -4,6 +4,5 @@ area: documentation
 extension: html
 filter:
   - haml
-  - markdown
 ---
-= File.open('../docs/documentation.mdown').read
+= render(:partial => "external", :locals => {:path => 
'../docs/documentation.mdown'} )
diff --git a/deltacloud.org/content/drivers.haml 
b/deltacloud.org/content/drivers.haml
index d945004..98dc6ae 100644
--- a/deltacloud.org/content/drivers.haml
+++ b/deltacloud.org/content/drivers.haml
@@ -4,13 +4,12 @@ area: documentation
 extension: html
 filter:
   - haml
-  - markdown
   - outline
 ---
 <toc class="toc" numbering="off" toc_style="ul" toc_range="h2-h3" />
 
-- page = File.open('../docs/drivers.mdown').read
-- header, rest = page.split("<table providers />")
+- page = render(:partial => "external", :locals => { :path => 
'../docs/drivers.mdown' })
+- header, rest = page.split("<table providers></table>")
 
 = header
 
diff --git a/deltacloud.org/content/framework.haml 
b/deltacloud.org/content/framework.haml
index 6fa105a..baad37d 100644
--- a/deltacloud.org/content/framework.haml
+++ b/deltacloud.org/content/framework.haml
@@ -4,9 +4,8 @@ area: documentation
 extension: html
 filter:
   - haml
-  - markdown
   - outline
 ---
 <toc class="toc" numbering="off" toc_style="ul" toc_range="h2-h3" />
 
-= File.open('../docs/framework.mdown').read
+= render(:partial => "external", :locals => {:path => 
'../docs/framework.mdown'} )
-- 
1.6.6.1

_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

Reply via email to