From: Tomas Sedovic tsedovic@redhat.com
Changed extension from HAML to ERB for the Documentation files because it fits their new purpose better.
Rename files to match the new structure.
The documentation pages are note HAML anymore.
Rename documentation submenu partial.
It had 2 extensions which made it work incorrectly. --- deltacloud.org/content/_documentation-menu.haml | 20 -------------------- deltacloud.org/content/_submenu-documentation.erb | 20 ++++++++++++++++++++ deltacloud.org/content/api.erb | 12 ++++++++++++ deltacloud.org/content/api.haml | 12 ------------ deltacloud.org/content/client-ruby.erb | 12 ++++++++++++ deltacloud.org/content/client-ruby.haml | 12 ------------ deltacloud.org/content/documentation.erb | 9 +++++++++ deltacloud.org/content/documentation.haml | 9 --------- deltacloud.org/content/drivers.erb | 12 ++++++++++++ deltacloud.org/content/drivers.haml | 12 ------------ deltacloud.org/content/framework.erb | 12 ++++++++++++ deltacloud.org/content/framework.haml | 12 ------------ deltacloud.org/layouts/documentation.haml | 2 +- 13 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 deltacloud.org/content/_documentation-menu.haml create mode 100644 deltacloud.org/content/_submenu-documentation.erb create mode 100644 deltacloud.org/content/api.erb delete mode 100644 deltacloud.org/content/api.haml create mode 100644 deltacloud.org/content/client-ruby.erb delete mode 100644 deltacloud.org/content/client-ruby.haml create mode 100644 deltacloud.org/content/documentation.erb delete mode 100644 deltacloud.org/content/documentation.haml create mode 100644 deltacloud.org/content/drivers.erb delete mode 100644 deltacloud.org/content/drivers.haml create mode 100644 deltacloud.org/content/framework.erb delete mode 100644 deltacloud.org/content/framework.haml
diff --git a/deltacloud.org/content/_documentation-menu.haml b/deltacloud.org/content/_documentation-menu.haml deleted file mode 100644 index 05cd8cc..0000000 --- a/deltacloud.org/content/_documentation-menu.haml +++ /dev/null @@ -1,20 +0,0 @@ ---- -filter: - - erb - - haml ---- -<% menu = [ - { :href => 'documentation.html', :text => 'Overview' }, - { :href => "api.html" , :text => 'REST API' }, - { :href => "client-ruby.html" , :text => 'Ruby Client' }, - { :href => "drivers.html" , :text => 'Drivers' }, - { :href => "framework.html" , :text => 'Framework' } ] %> - -#subnavigation - #submenu.container - %ul.l1 - <% menu.each do |link| %> - %li - %a.<%= 'in' unless link[:href] == current_page %>active{ :href => "<%= link[:href] %>" } - <%= link[:text] %> - <% end %> diff --git a/deltacloud.org/content/_submenu-documentation.erb b/deltacloud.org/content/_submenu-documentation.erb new file mode 100644 index 0000000..05cd8cc --- /dev/null +++ b/deltacloud.org/content/_submenu-documentation.erb @@ -0,0 +1,20 @@ +--- +filter: + - erb + - haml +--- +<% menu = [ + { :href => 'documentation.html', :text => 'Overview' }, + { :href => "api.html" , :text => 'REST API' }, + { :href => "client-ruby.html" , :text => 'Ruby Client' }, + { :href => "drivers.html" , :text => 'Drivers' }, + { :href => "framework.html" , :text => 'Framework' } ] %> + +#subnavigation + #submenu.container + %ul.l1 + <% menu.each do |link| %> + %li + %a.<%= 'in' unless link[:href] == current_page %>active{ :href => "<%= link[:href] %>" } + <%= link[:text] %> + <% end %> diff --git a/deltacloud.org/content/api.erb b/deltacloud.org/content/api.erb new file mode 100644 index 0000000..5f18a0d --- /dev/null +++ b/deltacloud.org/content/api.erb @@ -0,0 +1,12 @@ +--- +title: Deltacloud - Documentation +extension: html +layout: documentation.haml +filter: + - erb + - markdown + - outline +--- +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> + +<%= File.open('../docs/api.mdown').read %> diff --git a/deltacloud.org/content/api.haml b/deltacloud.org/content/api.haml deleted file mode 100644 index 5f18a0d..0000000 --- a/deltacloud.org/content/api.haml +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Deltacloud - Documentation -extension: html -layout: documentation.haml -filter: - - erb - - markdown - - outline ---- -<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> - -<%= File.open('../docs/api.mdown').read %> diff --git a/deltacloud.org/content/client-ruby.erb b/deltacloud.org/content/client-ruby.erb new file mode 100644 index 0000000..9b2cf26 --- /dev/null +++ b/deltacloud.org/content/client-ruby.erb @@ -0,0 +1,12 @@ +--- +title: Deltacloud - Documentation +extension: html +layout: documentation.haml +filter: + - erb + - markdown + - outline +--- +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> + +<%= File.open('../docs/client-ruby.mdown').read %> diff --git a/deltacloud.org/content/client-ruby.haml b/deltacloud.org/content/client-ruby.haml deleted file mode 100644 index 9b2cf26..0000000 --- a/deltacloud.org/content/client-ruby.haml +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Deltacloud - Documentation -extension: html -layout: documentation.haml -filter: - - erb - - markdown - - outline ---- -<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> - -<%= File.open('../docs/client-ruby.mdown').read %> diff --git a/deltacloud.org/content/documentation.erb b/deltacloud.org/content/documentation.erb new file mode 100644 index 0000000..f8a3b69 --- /dev/null +++ b/deltacloud.org/content/documentation.erb @@ -0,0 +1,9 @@ +--- +title: Deltacloud - Documentation +extension: html +layout: documentation.haml +filter: + - erb + - markdown +--- +<%= File.open('../docs/documentation.mdown').read %> diff --git a/deltacloud.org/content/documentation.haml b/deltacloud.org/content/documentation.haml deleted file mode 100644 index f8a3b69..0000000 --- a/deltacloud.org/content/documentation.haml +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Deltacloud - Documentation -extension: html -layout: documentation.haml -filter: - - erb - - markdown ---- -<%= File.open('../docs/documentation.mdown').read %> diff --git a/deltacloud.org/content/drivers.erb b/deltacloud.org/content/drivers.erb new file mode 100644 index 0000000..bf5554c --- /dev/null +++ b/deltacloud.org/content/drivers.erb @@ -0,0 +1,12 @@ +--- +title: Deltacloud - Documentation +extension: html +layout: documentation.haml +filter: + - erb + - markdown + - outline +--- +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> + +<%= File.open('../docs/drivers.mdown').read %> diff --git a/deltacloud.org/content/drivers.haml b/deltacloud.org/content/drivers.haml deleted file mode 100644 index bf5554c..0000000 --- a/deltacloud.org/content/drivers.haml +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Deltacloud - Documentation -extension: html -layout: documentation.haml -filter: - - erb - - markdown - - outline ---- -<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> - -<%= File.open('../docs/drivers.mdown').read %> diff --git a/deltacloud.org/content/framework.erb b/deltacloud.org/content/framework.erb new file mode 100644 index 0000000..6f9a1b3 --- /dev/null +++ b/deltacloud.org/content/framework.erb @@ -0,0 +1,12 @@ +--- +title: Deltacloud - Documentation +extension: html +layout: documentation.haml +filter: + - erb + - markdown + - outline +--- +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> + +<%= File.open('../docs/framework.mdown').read %> diff --git a/deltacloud.org/content/framework.haml b/deltacloud.org/content/framework.haml deleted file mode 100644 index 6f9a1b3..0000000 --- a/deltacloud.org/content/framework.haml +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Deltacloud - Documentation -extension: html -layout: documentation.haml -filter: - - erb - - markdown - - outline ---- -<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> - -<%= File.open('../docs/framework.mdown').read %> diff --git a/deltacloud.org/layouts/documentation.haml b/deltacloud.org/layouts/documentation.haml index 7e94473..7b5200e 100644 --- a/deltacloud.org/layouts/documentation.haml +++ b/deltacloud.org/layouts/documentation.haml @@ -42,7 +42,7 @@ filter: %li %a.inactive{ :href => "./page", :title => "Project wiki" } Wiki - <%= render(:partial => "documentation-menu", :locals => {:current_page => "#{@page.filename}.#{@page.extension}"} ) %> + <%= render(:partial => "submenu-documentation", :locals => {:current_page => "#{@page.filename}.#{@page.extension}"} ) %> #main #content-deltacloud.container <%= @content %>