Download as
Browse Code »

Commit 14a27a705b25402556112ed0500b324c889b45f6

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent f4e85b8c
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

Adding wysiwyg editor to some missing places 

* Site info
  * Send email on community and environment administration
  * Product's description

(AcitonItem1922)
(AcitonItem1947)
(AcitonItem1909)
Showing 5 changed files with 5 additions and 5 deletions   Show diff stats
app/views/admin_panel/site_info.rhtml
  Diff comments   View file @14a27a7
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 <%= labelled_form_field(_('Site name'), text_field(:environment, :name)) %> 9 <%= labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
10 10
11 - <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%') %> 11 + <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
12 12
13 <% button_bar do %> 13 <% button_bar do %>
14 <%= submit_button(:save, _('Save')) %> 14 <%= submit_button(:save, _('Save')) %>
app/views/manage_products/_edit_description.rhtml
  Diff comments   View file @14a27a7
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'}, 6 :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'},
7 :html => {:id => 'product-description-form', :method => 'post'}) do |f| %> 7 :html => {:id => 'product-description-form', :method => 'post'}) do |f| %>
8 8
9 - <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;')) %> 9 + <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;', :class => 'mceEditor')) %>
10 <% button_bar do %> 10 <% button_bar do %>
11 <%= submit_button :save, _('Save') %> 11 <%= submit_button :save, _('Save') %>
12 <%= cancel_edit_product_link(@product, 'description') %> 12 <%= cancel_edit_product_link(@product, 'description') %>
app/views/manage_products/_form.rhtml
  Diff comments   View file @14a27a7
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 <%= display_form_field( _('Name:'), f.text_field(:name) ) %> 6 <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
7 <%= display_form_field( _('Price:'), f.text_field(:price) ) %> 7 <%= display_form_field( _('Price:'), f.text_field(:price) ) %>
8 - <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10) ) %> 8 + <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => 'mceEditor') ) %>
9 <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %> 9 <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %>
10 <% f.fields_for :image_builder, @product.image do |i| %> 10 <% f.fields_for :image_builder, @product.image do |i| %>
11 <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %> 11 <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %>
app/views/profile_members/send_mail.rhtml
  Diff comments   View file @14a27a7
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %> 9 <% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
10 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %> 10 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
11 - <%= labelled_form_field(_('Body:'), f.text_area(:body)) %> 11 + <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
12 <%= submit_button(:send, _('Send')) %> 12 <%= submit_button(:send, _('Send')) %>
13 <%= button :cancel, _('Cancel e-mail'), :action => 'index' %> 13 <%= button :cancel, _('Cancel e-mail'), :action => 'index' %>
14 <% end %> 14 <% end %>
app/views/users/send_mail.rhtml
  Diff comments   View file @14a27a7
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 <% form_for :mailing, :url => {:action => 'send_mail'} do |f| %> 7 <% form_for :mailing, :url => {:action => 'send_mail'} do |f| %>
8 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %> 8 <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
9 - <%= labelled_form_field(_('Body:'), f.text_area(:body)) %> 9 + <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
10 <%= submit_button(:send, _('Send')) %> 10 <%= submit_button(:send, _('Send')) %>
11 <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %> 11 <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
12 <% end %> 12 <% end %>