You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/02/13 17:05:45 UTC
[2/2] git commit: Core: Set the default HAML output format to xhtml
(DTACLOUD-472)
Updated Branches:
refs/heads/master 283f6b8b6 -> eba38a669
Core: Set the default HAML output format to xhtml (DTACLOUD-472)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/eba38a66
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/eba38a66
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/eba38a66
Branch: refs/heads/master
Commit: eba38a669cfdb8d0bbad9f77435e6772c2366cf2
Parents: 504377a
Author: Michal Fojtik <mf...@redhat.com>
Authored: Wed Feb 13 16:37:15 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Wed Feb 13 16:37:15 2013 +0100
----------------------------------------------------------------------
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(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eba38a66/server/lib/cimi/collections/base.rb
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eba38a66/server/lib/cimi/server.rb
----------------------------------------------------------------------
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)
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eba38a66/server/lib/deltacloud/collections/base.rb
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/eba38a66/server/lib/deltacloud/server.rb
----------------------------------------------------------------------
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]