Download as
Browse Code »

Commit 831bebc3090194e7030d2726335b2e5ddf872f61

Authored by Daniela Feitosa
1 parent 91b62197
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

Added WYSIWYG editor on header/footer edition 

(ActionItem1895)
Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
app/views/profile_editor/header_footer.rhtml
  Diff comments   View file @831bebc
@@ -21,9 +21,9 @@ @@ -21,9 +21,9 @@
21 </div> 21 </div>
22 <% end %> 22 <% end %>
23 <h2><%= _('Content for header ') %></h2> 23 <h2><%= _('Content for header ') %></h2>
24 - <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;') %> 24 + <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
25 <h2><%= _('Content for footer') %></h2> 25 <h2><%= _('Content for footer') %></h2>
26 - <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;') %> 26 + <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
27 <% button_bar do %> 27 <% button_bar do %>
28 <%= submit_button(:save, _('Save')) %> 28 <%= submit_button(:save, _('Save')) %>
29 <%= button(:cancel, _('Cancel'), :action => 'index') %> 29 <%= button(:cancel, _('Cancel'), :action => 'index') %>
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @831bebc
@@ -498,6 +498,12 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -498,6 +498,12 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
498 assert_tag :tag => 'textarea', :content => 'my custom footer' 498 assert_tag :tag => 'textarea', :content => 'my custom footer'
499 end 499 end
500 500
  501 + should 'render TinyMce Editor for header and footer' do
  502 + get :header_footer, :profile => profile.identifier
  503 + assert_tag :tag => 'textarea', :attributes => { :id => 'custom_header', :class => 'mceEditor' }
  504 + assert_tag :tag => 'textarea', :attributes => { :id => 'custom_footer', :class => 'mceEditor' }
  505 + end
  506 +
501 should 'save footer and header' do 507 should 'save footer and header' do
502 person = profile 508 person = profile
503 post :header_footer, :profile => profile.identifier, :custom_header => 'new header', :custom_footer => 'new footer' 509 post :header_footer, :profile => profile.identifier, :custom_header => 'new header', :custom_footer => 'new footer'