Download as
Browse Code »

Commit b88d44c4ec0aaa310f3b7a8d5b845b22d8eeee03

Authored by Daniela Feitosa
2 parents 04e25fca 85c76ac6
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/370' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/370
Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
  Diff comments   View file @b88d44c
1 <% self.extend(CustomFormsPlugin::Helper) %> 1 <% self.extend(CustomFormsPlugin::Helper) %>
  2 +<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
2 3
3 <%= error_messages_for :form %> 4 <%= error_messages_for :form %>
4 5
@@ -15,7 +16,7 @@ @@ -15,7 +16,7 @@
15 <% if profile.organization? %> 16 <% if profile.organization? %>
16 <%= labelled_form_field _('Triggered on membership'), f.check_box(:on_membership) %> 17 <%= labelled_form_field _('Triggered on membership'), f.check_box(:on_membership) %>
17 <% end %> 18 <% end %>
18 - <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%') %> 19 + <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
19 20
20 <h2><%= _('Fields') %></h2> 21 <h2><%= _('Fields') %></h2>
21 <table class="action-table" id='fields-table'> 22 <table class="action-table" id='fields-table'>