Use erb template for admin layout, ruby template is making problems w…

…ith axlsx
cubesystems · Jan 21, 2015 · 80248ab · 80248ab
1 parent 2f3e94e
commit 80248ab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/releaf-core/app/helpers/releaf/builders/page/layout_builder.rb b/releaf-core/app/helpers/releaf/builders/page/layout_builder.rb
@@ -3,7 +3,7 @@ class Releaf::Builders::Page::LayoutBuilder
   include Releaf::Builders::Template
 
   def output(&block)
-    doctype << tag(:html) do
+    doctype.html_safe << tag(:html) do
       head << body{ yield }
     end
   end

diff --git a/releaf-core/app/views/layouts/releaf/admin.html.erb b/releaf-core/app/views/layouts/releaf/admin.html.erb
@@ -0,0 +1 @@
+<%= Releaf.layout_builder.new(self).output{ yield }.html_safe %>
diff --git a/releaf-core/app/views/layouts/releaf/admin.ruby b/releaf-core/app/views/layouts/releaf/admin.ruby