Download as
Browse Code »

Commit 2f354a9e97983130209f99c0fd4b01ed98b522fa

Authored by Joenio Costa
1 parent 303c546a
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Rename view (rhtml -> html.erb) and hide sideblocks 

(ActionItem3042)
Showing 3 changed files with 6 additions and 5 deletions   Show diff stats
app/controllers/admin/admin_panel_controller.rb
  Diff comments   View file @2f354a9
@@ -7,6 +7,7 @@ class AdminPanelController < AdminController @@ -7,6 +7,7 @@ class AdminPanelController < AdminController
7 end 7 end
8 8
9 def site_info 9 def site_info
  10 + @no_design_blocks = true
10 if request.post? 11 if request.post?
11 if params[:environment][:languages] 12 if params[:environment][:languages]
12 params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact 13 params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
app/views/admin_panel/_signup_welcome_screen.html.erb 0 → 100644
  Diff comments   View file @2f354a9
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +<div class='description'>
  2 + <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>
  3 +</div>
  4 +
  5 +<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
app/views/admin_panel/_signup_welcome_screen.rhtml
View file @303c546
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -<div class='description'>  
2 - <%= _('This text will be showed as a welcome message to users after signup') %><br/><br/>  
3 -</div>  
4 -  
5 -<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>