Download as
Browse Code »

Commit bc63865f82546fd7c1be86dd9574648922a9abb3

Authored by AntonioTerceiro
1 parent 94b55416
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem296: removing sideboxes from header/footer edit 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2358 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 6 additions and 3 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @bc63865
@@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base @@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base
17 !@no_design_blocks 17 !@no_design_blocks
18 end 18 end
19 def uses_design_blocks? 19 def uses_design_blocks?
20 - self.class.uses_design_blocks? 20 + !@no_design_blocks && self.class.uses_design_blocks?
21 end 21 end
22 module UsesDesignBlocksHelper 22 module UsesDesignBlocksHelper
23 def uses_design_blocks? 23 def uses_design_blocks?
app/controllers/my_profile/profile_editor_controller.rb
  Diff comments   View file @bc63865
@@ -50,6 +50,7 @@ class ProfileEditorController < MyProfileController @@ -50,6 +50,7 @@ class ProfileEditorController < MyProfileController
50 end 50 end
51 51
52 def header_footer 52 def header_footer
  53 + @no_design_blocks = true
53 if request.post? 54 if request.post?
54 @profile.update_attributes!(:custom_footer => params[:custom_footer], :custom_header => params[:custom_header]) 55 @profile.update_attributes!(:custom_footer => params[:custom_footer], :custom_header => params[:custom_header])
55 redirect_to :action => 'index' 56 redirect_to :action => 'index'
app/views/profile_editor/header_footer.rhtml
  Diff comments   View file @bc63865
@@ -4,8 +4,10 @@ @@ -4,8 +4,10 @@
4 4
5 <% form_tag do %> 5 <% form_tag do %>
6 <div style='width: 90%; margin: auto;'> 6 <div style='width: 90%; margin: auto;'>
7 - <%= labelled_form_field(_('Content for header '), text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;')) %>  
8 - <%= labelled_form_field(_('Content for footer'), text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;')) %> 7 + <h2><%= _('Content for header ') %></h2>
  8 + <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;') %>
  9 + <h2><%= _('Content for footer') %></h2>
  10 + <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;') %>
9 <% button_bar do %> 11 <% button_bar do %>
10 <%= submit_button(:save, _('Save')) %> 12 <%= submit_button(:save, _('Save')) %>
11 <%= button(:cancel, _('Cancel'), :action => 'index') %> 13 <%= button(:cancel, _('Cancel'), :action => 'index') %>