Download as
Browse Code »

Commit 074724cdab82a468ebc56f7bfeb03ee4713fa5b8

Authored by Braulio Bhavamitra
1 parent d354a1df
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Put tinymce into contact view

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
app/views/contact/new.rhtml
  Diff comments   View file @074724c
... ... @@ -18,8 +18,11 @@
18 18 <% unless environment.enabled?('disable_select_city_for_contact') || location_fields.blank? %>
19 19 <%= labelled_form_field _('City and state'), location_fields %>
20 20 <% end %>
21   - <%= required f.text_field(:subject) %>
22   - <%= required f.text_area(:message, :rows => 10, :cols => 60) %>
  21 + <%= f.text_field :subject %>
  22 +
  23 + <%= render :file => 'shared/tiny_mce' %>
  24 + <%= f.text_area :message, :class => 'mceEditor' %>
  25 +
23 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 28 <%= submit_button(:send, _('Send'), :onclick => "$('confirm').value = 'true'") %>
... ...
app/views/profile/send_mail.rhtml
  Diff comments   View file @074724c
... ... @@ -4,11 +4,13 @@
4 4  
5 5 <%= error_messages_for :mailing %>
6 6  
7   -<%= render :file => 'shared/tiny_mce' %>
8   -
9 7 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
  8 +
10 9 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
  10 +
  11 + <%= render :file => 'shared/tiny_mce' %>
11 12 <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
  13 +
12 14 <%= submit_button(:send, _('Send')) %>
13 15 <%= button :cancel, _('Cancel e-mail'), :back %>
14 16 <% end %>
... ...