From 2f354a9e97983130209f99c0fd4b01ed98b522fa Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Thu, 5 Jun 2014 17:36:18 +0000
Subject: [PATCH] Rename view (rhtml -> html.erb) and hide sideblocks

---
 app/controllers/admin/admin_panel_controller.rb       | 1 +
 app/views/admin_panel/_signup_welcome_screen.html.erb | 5 +++++
 app/views/admin_panel/_signup_welcome_screen.rhtml    | 5 -----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 app/views/admin_panel/_signup_welcome_screen.html.erb
 delete mode 100644 app/views/admin_panel/_signup_welcome_screen.rhtml

diff --git a/app/controllers/admin/admin_panel_controller.rb b/app/controllers/admin/admin_panel_controller.rb
index 14106cc..6c2b103 100644
--- a/app/controllers/admin/admin_panel_controller.rb
+++ b/app/controllers/admin/admin_panel_controller.rb
@@ -7,6 +7,7 @@ class AdminPanelController < AdminController
   end
 
   def site_info
+    @no_design_blocks = true
     if request.post?
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
diff --git a/app/views/admin_panel/_signup_welcome_screen.html.erb b/app/views/admin_panel/_signup_welcome_screen.html.erb
new file mode 100644
index 0000000..26bdb53
--- /dev/null
+++ b/app/views/admin_panel/_signup_welcome_screen.html.erb
@@ -0,0 +1,5 @@
+<div class='description'>
+  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
+</div>
+
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
diff --git a/app/views/admin_panel/_signup_welcome_screen.rhtml b/app/views/admin_panel/_signup_welcome_screen.rhtml
deleted file mode 100644
index 26bdb53..0000000
--- a/app/views/admin_panel/_signup_welcome_screen.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class='description'>
-  <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
-</div>
-
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
--
libgit2 0.21.2