Comments inline, but there are also some errors preventing me from being able to ack this. For instance, when I apply this and go to the documentation page, I just get 'true' in my browser. Errors from my autobuild log are: http://fpaste.org/DPbv/
On Thu, Mar 18, 2010 at 2:09 PM, <[email protected]> wrote: > From: Tomas Sedovic <[email protected]> > > --- > deltacloud.org/content/_navigation.erb | 23 > -------------------- > deltacloud.org/content/_navigation.haml | 20 > +++++++++++++++++ > deltacloud.org/content/_submenu-documentation.erb | 20 > ----------------- > deltacloud.org/content/_submenu-documentation.haml | 18 +++++++++++++++ > 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/contribute.haml | 4 +-- > deltacloud.org/content/dcloud-demo.haml | 4 +-- > deltacloud.org/content/dcloud.haml | 4 +-- > deltacloud.org/content/documentation.erb | 9 ------- > deltacloud.org/content/documentation.haml | 9 +++++++ > deltacloud.org/content/download.haml | 4 +-- > 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/content/index.haml | 4 +-- > deltacloud.org/content/tools.haml | 4 +-- > deltacloud.org/layouts/default.txt | 8 ++---- > 21 files changed, 104 insertions(+), 123 deletions(-) > delete mode 100644 deltacloud.org/content/_navigation.erb > create mode 100644 deltacloud.org/content/_navigation.haml > delete mode 100644 deltacloud.org/content/_submenu-documentation.erb > create mode 100644 deltacloud.org/content/_submenu-documentation.haml > delete mode 100644 deltacloud.org/content/api.erb > create mode 100644 deltacloud.org/content/api.haml > delete mode 100644 deltacloud.org/content/client-ruby.erb > create mode 100644 deltacloud.org/content/client-ruby.haml > delete mode 100644 deltacloud.org/content/documentation.erb > create mode 100644 deltacloud.org/content/documentation.haml > delete mode 100644 deltacloud.org/content/drivers.erb > create mode 100644 deltacloud.org/content/drivers.haml > delete mode 100644 deltacloud.org/content/framework.erb > create mode 100644 deltacloud.org/content/framework.haml > > diff --git a/deltacloud.org/content/_navigation.erb b/ > deltacloud.org/content/_navigation.erb > deleted file mode 100644 > index fa96408..0000000 > --- a/deltacloud.org/content/_navigation.erb > +++ /dev/null > @@ -1,23 +0,0 @@ > ---- > -filter: > - - erb > - - haml > ---- > -<% menu = [ > - { :href => "index.html", :title => "Deltacloud Home", :text => "Home" > }, > - { :href => "tools.html", :title => "Tools", :text => "Tools" }, > - { :href => "download.html", :title => "Get the latest releases", :text > => "Download" }, > - { :href => "contribute.html", :title => "Information about > design/development process", :text => "Contribute" }, > - { :href => "documentation.html", :title => "Project documentation", > :text => "Documentation" }, > - { :href => "page", :title => "Project wiki", :text => "Wiki" } ] %> > - > -#navigation > - #menu.container > - %ul.l0 > - <% menu.each do |link| %> > - %li > - <% current_page = "#{area}.html" unless area.nil? or area.empty? > or (link[:href].index(area) != 0) %> > - <% state = (link[:href] == current_page) ? 'active' : 'inactive' > %> > - %a.<%= state %>{ :href => "./<%= link[:href] %>", :title => "<%= > link[:title] %>" } > - <%= link[:text] %> > - <% end %> > diff --git a/deltacloud.org/content/_navigation.haml b/ > deltacloud.org/content/_navigation.haml > new file mode 100644 > index 0000000..4f7d45a > --- /dev/null > +++ b/deltacloud.org/content/_navigation.haml > @@ -0,0 +1,20 @@ > +--- > +filter: haml > +--- > +- menu = [] > +- menu << { :href => "index.html", :title => "Deltacloud Home", :text => > "Home" } > +- menu << { :href => "tools.html", :title => "Tools", :text => "Tools" } > +- menu << { :href => "download.html", :title => "Get the latest releases", > :text => "Download" } > +- menu << { :href => "contribute.html", :title => "Information about > design/development process", :text => "Contribute" } > +- menu << { :href => "documentation.html", :title => "Project > documentation", :text => "Documentation" } > +- menu << { :href => "page", :title => "Project wiki", :text => "Wiki" } > I couldn't test this, since applying the patch broke these pages, but I suspect the above can be written as you had it before, and would be cleaner than all the repeated 'menu <<'s. Same applies to the sub-menu file. + > +#navigation > + #menu.container > + %ul.l0 > + - menu.each do |link| > + %li > + - current_page = "#{area}.html" unless area.nil? or area.empty? > or (link[:href].index(area) != 0) > + - state = (link[:href] == current_page) ? 'active' : 'inactive' > + %a{ :class => state, :href => "./#{link[:href]}", :title => > link[:title] } > + = link[:text] > diff --git a/deltacloud.org/content/_submenu-documentation.erb b/ > deltacloud.org/content/_submenu-documentation.erb > deleted file mode 100644 > index 05cd8cc..0000000 > --- a/deltacloud.org/content/_submenu-documentation.erb > +++ /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.haml b/ > deltacloud.org/content/_submenu-documentation.haml > new file mode 100644 > index 0000000..98d9e79 > --- /dev/null > +++ b/deltacloud.org/content/_submenu-documentation.haml > @@ -0,0 +1,18 @@ > +--- > +filter: haml > +--- > +- menu = [] > +- menu << { :href => 'documentation.html', :text => 'Overview' } > +- menu << { :href => "api.html" , :text => 'REST API' } > +- menu << { :href => "client-ruby.html" , :text => 'Ruby Client' } > +- menu << { :href => "drivers.html" , :text => 'Drivers' } > +- menu << { :href => "framework.html" , :text => 'Framework' } > + > +#subnavigation > + #submenu.container > + %ul.l1 > + - menu.each do |link| > + %li > + - state = (link[:href] == current_page) ? 'active' : 'inactive' > + %a{:class => state, :href => link[:href]} > + = link[:text] > diff --git a/deltacloud.org/content/api.erb b/ > deltacloud.org/content/api.erb > deleted file mode 100644 > index 1a30cb2..0000000 > --- a/deltacloud.org/content/api.erb > +++ /dev/null > @@ -1,12 +0,0 @@ > ---- > -title: Deltacloud - Documentation > -area: documentation > -extension: html > -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 > new file mode 100644 > index 0000000..1a30cb2 > --- /dev/null > +++ b/deltacloud.org/content/api.haml > @@ -0,0 +1,12 @@ > +--- > +title: Deltacloud - Documentation > +area: documentation > +extension: html > +filter: > + - erb > + - markdown > + - outline > +--- > +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> > + > +<%= File.open('../docs/api.mdown').read %> > In other files, you write this as: = File.open('../docs/api.mdown').read which I believe is the correct way to do it/ > diff --git a/deltacloud.org/content/client-ruby.erb b/ > deltacloud.org/content/client-ruby.erb > deleted file mode 100644 > index ac299b7..0000000 > --- a/deltacloud.org/content/client-ruby.erb > +++ /dev/null > @@ -1,12 +0,0 @@ > ---- > -title: Deltacloud - Documentation > -area: documentation > -extension: html > -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 > new file mode 100644 > index 0000000..ae2d5f4 > --- /dev/null > +++ b/deltacloud.org/content/client-ruby.haml > @@ -0,0 +1,12 @@ > +--- > +title: Deltacloud - Documentation > +area: documentation > +extension: html > +filter: > + - haml > + - 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/contribute.haml b/ > deltacloud.org/content/contribute.haml > index 33c8505..8bf5167 100644 > --- a/deltacloud.org/content/contribute.haml > +++ b/deltacloud.org/content/contribute.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud - Contribute > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > %h1 > Contribute > diff --git a/deltacloud.org/content/dcloud-demo.haml b/ > deltacloud.org/content/dcloud-demo.haml > index 0234519..d6c85b9 100644 > --- a/deltacloud.org/content/dcloud-demo.haml > +++ b/deltacloud.org/content/dcloud-demo.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > %div{ :style => "width:400px; margin:50px auto;" } > %object#FLVPlayer1{ :height => "300", :classid => > "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", :width => "400" } > diff --git a/deltacloud.org/content/dcloud.haml b/ > deltacloud.org/content/dcloud.haml > index 679a5db..b5b56c8 100644 > --- a/deltacloud.org/content/dcloud.haml > +++ b/deltacloud.org/content/dcloud.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > %div{ :style => "width:400px; margin:50px auto;" } > %object#FLVPlayer{ :height => "300", :classid => > "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", :width => "400" } > diff --git a/deltacloud.org/content/documentation.erb b/ > deltacloud.org/content/documentation.erb > deleted file mode 100644 > index 3b7b900..0000000 > --- a/deltacloud.org/content/documentation.erb > +++ /dev/null > @@ -1,9 +0,0 @@ > ---- > -title: Deltacloud - Documentation > -area: documentation > -extension: html > -filter: > - - erb > - - markdown > ---- > -<%= File.open('../docs/documentation.mdown').read %> > diff --git a/deltacloud.org/content/documentation.haml b/ > deltacloud.org/content/documentation.haml > new file mode 100644 > index 0000000..7ddfeeb > --- /dev/null > +++ b/deltacloud.org/content/documentation.haml > @@ -0,0 +1,9 @@ > +--- > +title: Deltacloud - Documentation > +area: documentation > +extension: html > +filter: > + - haml > + - markdown > +--- > += File.open('../docs/documentation.mdown').read > diff --git a/deltacloud.org/content/download.haml b/ > deltacloud.org/content/download.haml > index e60adad..6a4d899 100644 > --- a/deltacloud.org/content/download.haml > +++ b/deltacloud.org/content/download.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud - Download > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > %h1 > Download > diff --git a/deltacloud.org/content/drivers.erb b/ > deltacloud.org/content/drivers.erb > deleted file mode 100644 > index ee130f6..0000000 > --- a/deltacloud.org/content/drivers.erb > +++ /dev/null > @@ -1,12 +0,0 @@ > ---- > -title: Deltacloud - Documentation > -area: documentation > -extension: html > -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 > new file mode 100644 > index 0000000..02c5369 > --- /dev/null > +++ b/deltacloud.org/content/drivers.haml > @@ -0,0 +1,12 @@ > +--- > +title: Deltacloud - Documentation > +area: documentation > +extension: html > +filter: > + - haml > + - 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 > deleted file mode 100644 > index e71b4ef..0000000 > --- a/deltacloud.org/content/framework.erb > +++ /dev/null > @@ -1,12 +0,0 @@ > ---- > -title: Deltacloud - Documentation > -area: documentation > -extension: html > -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 > new file mode 100644 > index 0000000..93b1c30 > --- /dev/null > +++ b/deltacloud.org/content/framework.haml > @@ -0,0 +1,12 @@ > +--- > +title: Deltacloud - Documentation > +area: documentation > +extension: html > +filter: > + - haml > + - markdown > + - outline > +--- > +<toc numbering="off" toc_style="ul" toc_range="h2-h3" /> > + > += File.open('../docs/framework.mdown').read > diff --git a/deltacloud.org/content/index.haml b/ > deltacloud.org/content/index.haml > index bc9e6b4..c7cb982 100644 > --- a/deltacloud.org/content/index.haml > +++ b/deltacloud.org/content/index.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud | Many Clouds. One API. No Problem. > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > #frontpage > %p > diff --git a/deltacloud.org/content/tools.haml b/ > deltacloud.org/content/tools.haml > index 95dae22..25906e3 100644 > --- a/deltacloud.org/content/tools.haml > +++ b/deltacloud.org/content/tools.haml > @@ -1,9 +1,7 @@ > --- > title: Deltacloud - Tools > extension: html > -filter: > - - erb > - - haml > +filter: haml > --- > %h1 > Tools > diff --git a/deltacloud.org/layouts/default.txt b/ > deltacloud.org/layouts/default.txt > index b079e49..0d7ac68 100644 > --- a/deltacloud.org/layouts/default.txt > +++ b/deltacloud.org/layouts/default.txt > @@ -1,14 +1,12 @@ > --- > extension: html > -filter: > - - haml > - - erb > +filter: haml > --- > !!! Strict > %html > %head > %title > - <%= @page.title %> > + = @page.title > %meta{ :name => "keywords", :content => "" } > %meta{ :name => "description", :content => "" } > %meta{ :content => "text/html; charset=utf-8", "http-equiv" => > "Content-Type" } > @@ -46,7 +44,7 @@ filter: > #frontpageHeader > #main > #content-deltacloud.container > - = @content > + ~ @content > #footer-deltacloud > #projects.container > %p#et > -- > 1.6.6.1 > > _______________________________________________ > deltacloud-devel mailing list > [email protected] > https://fedorahosted.org/mailman/listinfo/deltacloud-devel >
_______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
