Download as
Browse Code »

Commit 620c0b8696f220b2fae63d77e55c296c300573fd

Authored by Rodrigo Souto
2 parents 6871a9ec e9199bdd
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

Merge commit 'refs/merge-requests/307' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/307
Showing 2 changed files with 8 additions and 3 deletions   Show diff stats
app/views/contact/new.rhtml
  Diff comments   View file @620c0b8
@@ -19,7 +19,10 @@ @@ -19,7 +19,10 @@
19 <%= labelled_form_field _('City and state'), location_fields %> 19 <%= labelled_form_field _('City and state'), location_fields %>
20 <% end %> 20 <% end %>
21 <%= required f.text_field(:subject) %> 21 <%= required f.text_field(:subject) %>
22 - <%= required f.text_area(:message, :rows => 10, :cols => 60) %> 22 +
  23 + <%= render :file => 'shared/tiny_mce' %>
  24 + <%= required f.text_area(:message, :class => 'mceEditor') %>
  25 +
23 <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %> 26 <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
24 27
25 <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %> 28 <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
app/views/profile/send_mail.rhtml
  Diff comments   View file @620c0b8
@@ -4,11 +4,13 @@ @@ -4,11 +4,13 @@
4 4
5 <%= error_messages_for :mailing %> 5 <%= error_messages_for :mailing %>
6 6
7 -<%= render :file => 'shared/tiny_mce' %>  
8 -  
9 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %> 7 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
  8 +
10 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %> 9 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
  10 +
  11 + <%= render :file => 'shared/tiny_mce' %>
11 <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %> 12 <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
  13 +
12 <%= submit_button(:send, _('Send')) %> 14 <%= submit_button(:send, _('Send')) %>
13 <%= button :cancel, _('Cancel e-mail'), :back %> 15 <%= button :cancel, _('Cancel e-mail'), :back %>
14 <% end %> 16 <% end %>