Download as
Browse Code »

Commit bc2a582c49fd2e2bd247d1368c6ccf6af8a01d80

Authored by AntonioTerceiro
1 parent 5269fd4b
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

ActionItem21: checkpoint 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@967 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 4 additions and 5 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @bc2a582
1 class CmsController < MyProfileController 1 class CmsController < MyProfileController
2 - 2 +
3 # FIXME add the access control again 3 # FIXME add the access control again
4 # protect 'post_content', :profile, :only => [:edit, :new, :reorder, :delete] 4 # protect 'post_content', :profile, :only => [:edit, :new, :reorder, :delete]
5 5
app/views/cms/text_html_new.rhtml
  Diff comments   View file @bc2a582
  1 +<%= render :file => 'shared/tiny_mce' %>
  2 +
1 <%= error_messages_for 'article' %> 3 <%= error_messages_for 'article' %>
2 4
3 <% labelled_form_for 'article', @article do |f| %> 5 <% labelled_form_for 'article', @article do |f| %>
app/views/cms/view.rhtml
  Diff comments   View file @bc2a582
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 31
32 <% if @article %> 32 <% if @article %>
33 <%= link_to_edit_article(@article) %> 33 <%= link_to_edit_article(@article) %>
  34 + <%= link_to _('Use as homepage'), { :action => 'set_home_page', :id => @article }, { :method => :post } %>
34 <h2><%= @article.name %></h2> 35 <h2><%= @article.name %></h2>
35 <%= @article.to_html %> 36 <%= @article.to_html %>
36 <% end %> 37 <% end %>
public/javascripts/noosfero_tiny_mce.js
View file @5269fd4
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -tinyMCE.init({  
2 - theme : "simple",  
3 - editor_selector : "tiny_mce_editor"  
4 -});