From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/lib/cimi/collections/base.rb | 1 + server/lib/cimi/server.rb | 1 + server/lib/deltacloud/collections/base.rb | 1 + server/lib/deltacloud/server.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/server/lib/cimi/collections/base.rb b/server/lib/cimi/collections/base.rb index 30c595b..d999c18 100644 --- a/server/lib/cimi/collections/base.rb +++ b/server/lib/cimi/collections/base.rb @@ -43,6 +43,7 @@ module CIMI::Collections set :views, root + '/views/cimi' set :public_folder, root + '/public' set :documentation_class, CIMI + set :haml, :format => :xhtml error do report_error diff --git a/server/lib/cimi/server.rb b/server/lib/cimi/server.rb index d23b949..a1a9dc2 100644 --- a/server/lib/cimi/server.rb +++ b/server/lib/cimi/server.rb @@ -44,6 +44,7 @@ module CIMI enable :method_override disable :show_exceptions disable :dump_errors + set :haml, :format => :xhtml helpers Sinatra::Rabbit::URLFor(CIMI.collections) diff --git a/server/lib/deltacloud/collections/base.rb b/server/lib/deltacloud/collections/base.rb index 6562448..fe8ba2b 100644 --- a/server/lib/deltacloud/collections/base.rb +++ b/server/lib/deltacloud/collections/base.rb @@ -38,6 +38,7 @@ module Deltacloud::Collections set :public_folder, root + '/public' # A class where the Rabbit will look up for 'collections' set :documentation_class, Deltacloud + set :haml, :format => :xhtml error do report_error diff --git a/server/lib/deltacloud/server.rb b/server/lib/deltacloud/server.rb index 7c2b7bf..0ef925f 100644 --- a/server/lib/deltacloud/server.rb +++ b/server/lib/deltacloud/server.rb @@ -42,6 +42,7 @@ module Deltacloud helpers Sinatra::Rabbit::URLFor(Deltacloud.collections) set :config, Deltacloud[:deltacloud] + set :haml, :format => :xhtml get '/' do if params[:force_auth] -- 1.8.1.2
