From 80248ab23e2c2f15dbecfe4a9a6ccbf63ddb4d14 Mon Sep 17 00:00:00 2001 From: miks Date: Wed, 21 Jan 2015 20:46:12 +0200 Subject: [PATCH] Use erb template for admin layout, ruby template is making problems with axlsx --- releaf-core/app/helpers/releaf/builders/page/layout_builder.rb | 2 +- releaf-core/app/views/layouts/releaf/admin.html.erb | 1 + releaf-core/app/views/layouts/releaf/admin.ruby | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 releaf-core/app/views/layouts/releaf/admin.html.erb delete mode 100644 releaf-core/app/views/layouts/releaf/admin.ruby diff --git a/releaf-core/app/helpers/releaf/builders/page/layout_builder.rb b/releaf-core/app/helpers/releaf/builders/page/layout_builder.rb index d253ffd40..d2fec27c0 100644 --- 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 new file mode 100644 index 000000000..2d8cb59fb --- /dev/null +++ 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 deleted file mode 100644 index 3a8112063..000000000 --- a/releaf-core/app/views/layouts/releaf/admin.ruby +++ /dev/null @@ -1 +0,0 @@ -Releaf.layout_builder.new(self).output{ yield }