Merge remote-tracking branch 'origin/master'

Weblate
2 parents 0caa5d16 c366c04f
Showing 162 changed files with 1006 additions and 1083 deletions Show diff stats
app/api/helpers.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/helpers/application_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/tinymce_helper.rb
app/models/article.rb
app/models/event.rb
app/models/external_feed.rb
app/models/person.rb
app/models/raw_html_article.rb
app/models/suggest_article.rb
app/models/text_article.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/views/admin_panel/_signup_intro.html.erb
app/views/admin_panel/_signup_welcome_screen.html.erb
app/views/admin_panel/_signup_welcome_text.html.erb
app/views/admin_panel/_site_info.html.erb
app/views/admin_panel/_terms_of_use.html.erb
@@ -107,7 +107,7 @@ module Api
     def post_article(asset, params)
       return forbidden! unless current_person.can_post_content?(asset)
  
-      klass_type = params[:content_type] || params[:article].delete(:type) || TinyMceArticle.name
+      klass_type = params[:content_type] || params[:article].delete(:type) || TextArticle.name
       return forbidden! unless klass_type.constantize <= Article
  
       article = klass_type.constantize.new(params[:article])
@@ -461,11 +461,9 @@ module Api
  
     def parse_content_type(content_type)
       return nil if content_type.blank?
-      content_types = content_type.split(',').map do |content_type|
-        content_type = content_type.camelcase
-        content_type == 'TextArticle' ? Article.text_article_types : content_type
+      content_type.split(',').map do |content_type|
+        content_type.camelcase
       end
-      content_types.flatten.uniq
     end
  
     def period(from_date, until_date)
@@ -151,6 +151,7 @@ class CmsController &lt; MyProfileController
  
     @article.profile = profile
     @article.author = user
+    @article.editor = current_person.editor
     @article.last_changed_by = user
     @article.created_by = user
  
@@ -399,8 +400,7 @@ class CmsController &lt; MyProfileController
  
   def available_article_types
     articles = [
-      TinyMceArticle,
-      TextileArticle,
+      TextArticle,
       Event
     ]
     articles += special_article_types if params && params[:cms]
@@ -408,9 +408,6 @@ class CmsController &lt; MyProfileController
     if @parent && @parent.blog?
       articles -= Article.folder_types.map(&:constantize)
     end
-    if user.is_admin?(profile.environment)
-      articles << RawHTMLArticle
-    end
     articles
   end
  
@@ -92,7 +92,7 @@ class ProfileEditorController &lt; MyProfileController
   end
  
   def welcome_page
-    @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
+    @welcome_page = profile.welcome_page || TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
     if request.post?
       begin
         @welcome_page.update!(params[:welcome_page])
@@ -109,10 +109,6 @@ module ApplicationHelper
       content = capture(&block)
     end
  
-    if options[:type] == :textile
-      content = RedCloth.new(content).to_html
-    end
-
     options[:class] = '' if ! options[:class]
     options[:class] += ' button icon-help' # with-text
  
@@ -130,13 +126,6 @@ module ApplicationHelper
     text
   end
  
-  # alias for <tt>help(content, :textile)</tt>. You can pass a block in the
-  # same way you would do if you called <tt>help</tt> directly.
-  def help_textile(content = nil, link_name = nil, options = {}, &block)
-    options[:type] = :textile
-    help(content, link_name, options, &block)
-  end
-
   # TODO: do something more useful here
   # TODO: test this helper
   # TODO: add an icon?
@@ -1243,4 +1232,15 @@ module ApplicationHelper
     content.html_safe
   end
  
+  def current_editor_is?(editor)
+    editor.blank? ? false : current_editor == editor
+  end
+
+  def current_editor(mode = '')
+    editor = @article.editor || Article::Editor::TINY_MCE unless @article.nil?
+    editor ||= (current_person.nil? || current_person.editor.nil?) ? Article::Editor::TINY_MCE : current_person.editor
+    editor += '_' + mode unless mode.blank?
+    editor
+  end
+
 end
@@ -158,4 +158,8 @@ module ProfileEditorHelper
     end
   end
  
+  def select_editor(title, object, method, options)
+    labelled_form_field(title, select(object, method, current_person.available_editors.map { |k,v| [v, k] }))
+  end
+
 end
@@ -18,7 +18,8 @@ module TinymceHelper
         insertdatetime media nonbreaking save table contextmenu directionality
         emoticons template paste textcolor colorpicker textpattern],
       :image_advtab => true,
-      :language => tinymce_language
+      :language => tinymce_language,
+      :selector => '.' + current_editor(options[:mode])
  
     options[:toolbar1] = toolbar1(options[:mode])
     options[:menubar] = menubar(options[:mode])
  
 class Article < ApplicationRecord
  
+  module Editor
+    TEXTILE = 'textile'
+    TINY_MCE = 'tiny_mce'
+    RAW_HTML = 'raw_html'
+  end
+
   include SanitizeHelper
  
   attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent,
@@ -11,7 +17,7 @@ class Article &lt; ApplicationRecord
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers, :archived,
-                  :author, :display_preview, :published_at, :person_followers
+                  :author, :display_preview, :published_at, :person_followers, :editor
  
   extend ActsAsHavingImage::ClassMethods
   acts_as_having_image
@@ -518,17 +524,12 @@ class Article &lt; ApplicationRecord
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
  
-  def self.text_article_types
-    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
-  end
-
   scope :published, -> { where 'articles.published = ?', true }
   scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
   scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
   scope :galleries, -> { where "articles.type IN ('Gallery')" }
   scope :images, -> { where :is_image => true }
   scope :no_images, -> { where :is_image => false }
-  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
   scope :files, -> { where :type => 'UploadedFile' }
   scope :with_types, -> types { where 'articles.type IN (?)', types }
  
@@ -711,10 +712,6 @@ class Article &lt; ApplicationRecord
     false
   end
  
-  def tiny_mce?
-    false
-  end
-
   def folder?
     false
   end
@@ -874,6 +871,10 @@ class Article &lt; ApplicationRecord
     true
   end
  
+  def editor?(editor)
+    self.editor == editor
+  end
+
   private
  
   def sanitize_tag_list
@@ -121,10 +121,6 @@ class Event &lt; Article
     true
   end
  
-  def tiny_mce?
-    true
-  end
-
   def notifiable?
     true
   end
@@ -25,7 +25,7 @@ class ExternalFeed &lt; ApplicationRecord
     end
     content = doc.to_s
  
-    article = TinyMceArticle.new
+    article = TextArticle.new
     article.name = title
     article.profile = blog.profile
     article.body = content
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
  
-  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles, :editor
  
   SEARCH_FILTERS = {
     :order => %w[more_recent more_popular more_active],
@@ -341,6 +341,8 @@ class Person &lt; Profile
  
   validates_associated :user
  
+  validates :editor, inclusion: { in: lambda { |p| p.available_editors } }
+
   def email
     self.user.nil? ? nil : self.user.email
   end
@@ -613,8 +615,21 @@ class Person &lt; Profile
     Profile.followed_by self
   end
  
+  def editor?(editor)
+    self.editor == editor
+  end
+
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
  
+  def available_editors
+    available_editors = {
+      Article::Editor::TINY_MCE => _('TinyMCE'),
+      Article::Editor::TEXTILE => _('Textile')
+    }
+    available_editors.merge!({Article::Editor::RAW_HTML => _('Raw HTML')}) if self.is_admin?
+    available_editors
+  end
+
 end
@@ -1,17 +0,0 @@
-class RawHTMLArticle < TextArticle
-
-  def self.type_name
-    _('HTML')
-  end
-
-  def self.short_description
-    _('Raw HTML text article')
-  end
-
-  def self.description
-    _('Allows HTML without filter (only for admins).')
-  end
-
-  xss_terminate :only => [  ]
-
-end
@@ -44,7 +44,7 @@ class SuggestArticle &lt; Task
       type = article[:type].constantize
       return type if type < Article
     end
-    TinyMceArticle
+    TextArticle
   end
  
   def perform
 # a base class for all text article types.
 class TextArticle < Article
  
-  xss_terminate :only => [ :name ], :on => 'validation'
+  def self.short_description
+    _('Text article')
+  end
+
+  def self.description
+    _('Text article to create user content.')
+  end
+
+  xss_terminate :only => [ :name, :body, :abstract ], :with => 'white_list', :on => 'validation', :if => lambda { |a| !a.editor?(Article::Editor::TEXTILE) && !a.editor?(Article::Editor::RAW_HTML) }
+
+  include WhiteListFilter
+  filter_iframes :abstract, :body
+  def iframe_whitelist
+    profile && profile.environment && profile.environment.trusted_sites_for_iframe
+  end
  
   def self.type_name
     _('Article')
@@ -21,6 +35,18 @@ class TextArticle &lt; Article
     true
   end
  
+  def can_display_media_panel?
+    true
+  end
+
+  def self.can_display_blocks?
+    false
+  end
+
+  def notifiable?
+    true
+  end
+
   before_save :set_relative_path
  
   def set_relative_path
@@ -43,4 +69,24 @@ class TextArticle &lt; Article
     parent && parent.kind_of?(Blog) && parent.display_preview
   end
  
+  def to_html(options ={})
+    content = super(options)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  def lead(length = nil)
+    content = super(length)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  protected
+
+  def convert_textile_to_html(textile)
+    converter = RedCloth.new(textile|| '')
+    converter.hard_breaks = false
+    sanitize_html(converter.to_html, :white_list)
+  end
+
 end
@@ -1,44 +0,0 @@
-class TextileArticle < TextArticle
-  include SanitizeHelper
-
-  def self.short_description
-    _('Text article with Textile markup language')
-  end
-
-  def self.description
-    _('Accessible alternative for visually impaired users.')
-  end
-
-  def to_html(options ={})
-    convert_to_html(body)
-  end
-
-  def lead(length = nil)
-    if abstract.blank?
-      super
-    else
-      convert_to_html(abstract)
-    end
-  end
-
-  def notifiable?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-  protected
-
-  def convert_to_html(textile)
-    converter = RedCloth.new(textile|| '')
-    converter.hard_breaks = false
-    sanitize_html(converter.to_html, :white_list)
-  end
-
-end
@@ -1,37 +0,0 @@
-class TinyMceArticle < TextArticle
-
-  def self.short_description
-    _('Text article with visual editor')
-  end
-
-  def self.description
-    _('Not accessible for visually impaired users.')
-  end
-
-  xss_terminate :only => [  ]
-
-  xss_terminate :only => [ :name, :abstract, :body ], :with => 'white_list', :on => 'validation'
-
-  include WhiteListFilter
-  filter_iframes :abstract, :body
-  def iframe_whitelist
-    profile && profile.environment && profile.environment.trusted_sites_for_iframe
-  end
-
-  def notifiable?
-    true
-  end
-
-  def tiny_mce?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-end
@@ -2,4 +2,4 @@
   <%= _('This text will be shown to the user on the top of the sign up form.') %>
 </div>
  
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
 <div class='description'>
   <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
 </div>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
  
 <div class='description'>
   <%= _('If this content is left blank, the following page will be displayed to the user:') %>
@@ -4,4 +4,4 @@
 </div>
  
 <%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
@@ -31,4 +31,4 @@
 <%= balanced_table(fields)%>
  
 <br />
-<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
+<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => current_editor) %>
-<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => 'mceEditor' %>
+<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => current_editor %>
 <h2><%= _('Site info') %></h2>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment, :url => {:action => 'site_info'} do |f| %>
  
-  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
+  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%', :class => current_editor %>
  
   <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
@@ -2,8 +2,6 @@
  
 <%= error_messages_for :environment %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
-_tiny_mce_article.html.erb
 \ No newline at end of file
+_text_article.html.erb
 \ No newline at end of file
@@ -2,8 +2,6 @@
  
 <h1><%= _('My Blog') %></h1>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
  
 <%= render :partial => 'general_fields' %>
@@ -53,7 +51,7 @@
   %>
 </div>
  
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => current_editor)) %>
  
 <div id="blog-image-builder">
   <%= f.fields_for :image_builder, @article.image do |i| %>
-<%= render :file => 'shared/tiny_mce' %>
-
-<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => current_editor)) %>
  
 <%= required_fields_message %>
  
-<%# TODO add Textile help here %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
  
 <%= render :partial => 'general_fields' %>
@@ -15,4 +12,4 @@
  
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
  
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Information about the event:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Information about the event:'} %>
@@ -4,18 +4,16 @@
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
  
 <%= render :partial => 'general_fields' %>
  
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => 'mceEditor', :cols => 64, :rows => 10)) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => current_editor, :cols => 64, :rows => 10)) %>
  
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
  
 <%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
  
 <div id="text_area_terms_of_use">
-  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
+  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => current_editor,:cols => 64, :rows => 10)) %>
 </div>
@@ -1,8 +0,0 @@
-<%= required_fields_message %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -0,0 +1,10 @@
+<%= required_fields_message %>
+
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
+
+<%= render :partial => 'text_fields' %>
+<%= render :partial => 'general_fields' %>
+<%= render :partial => 'translatable' %>
+
+<%= render :partial => 'shared/lead_and_body' %>
+
@@ -7,7 +7,7 @@
  
   <div class='header'><strong><%= _('Insert media') %></strong><%= button('vertical-toggle', _('Show/Hide'), '#') %></div>
  
-  <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
+  <%= render(:partial => 'textile_quick_reference') if @article.editor?(Article::Editor::TEXTILE) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
     <div id='media-upload-form'>
       <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %>
@@ -1,10 +0,0 @@
-<%= required_fields_message %>
-
-<%# TODO add Textile help here %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -1,12 +0,0 @@
-<%= required_fields_message %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<div>
-  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-  <%= render :partial => 'text_fields' %>
-  <%= render :partial => 'general_fields' %>
-  <%= render :partial => 'translatable' %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
-</div>
@@ -2,8 +2,6 @@
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for 'task' do |f| %>
  
   <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
@@ -17,7 +15,7 @@
     <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
   <% end %>
  
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:object => 'task[article]'} %>
  
   <%= hidden_field_tag('back_to', @back_to) %>
  
@@ -25,8 +25,7 @@
  
   <%= required f.text_field(:subject) %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= required f.text_area(:message, :class => 'mceEditor') %>
+  <%= required f.text_area(:message, :class => current_editor) %>
  
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
  
@@ -19,8 +19,7 @@
         <%= @template_params_allowed %>
       </div>
     </div>
-    <%= render :file => 'shared/tiny_mce' %>
-    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => current_editor)) %>
   </div>
  
   <div class="actions">
@@ -35,6 +35,9 @@
       noosfero.profile = <%= (@profile.identifier if @profile).to_json.html_safe %>
     </script>
  
+    <% if current_editor_is?(Article::Editor::TINY_MCE) %>
+      <%= render :file => 'shared/tiny_mce' %>
+    <% end %>
   </head>
   <body class="<%= h body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
@@ -16,8 +16,7 @@
  
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'body ' + current_editor)) %>
  
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :back %>
@@ -16,6 +16,8 @@
     </div>
   </div>
  
+  <%= select_editor(_('Editor'), 'profile_data', 'editor', {}) %>
+
   <%= safe_join(@plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }, "") %>
  
   <div class="formfieldline">
-<%= render :file => 'shared/tiny_mce' %>
-
 <h1><%= _('Editing header and footer') %></h1>
  
 <%= form_tag do %>
@@ -21,9 +19,9 @@
       </div>
     <% end %>
     <h2><%= _('Content for header ') %></h2>
-    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <h2><%= _('Content for footer') %></h2>
-    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <%= button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -8,7 +8,7 @@
     <%= _('Your welcome page will only be displayed if this options is selected.') %>
   </div>
  
-  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor') %>
+  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => current_editor) %>
   <div class='explanation'>
     <%= _('This page will be displayed to the user after his signup with this template.') %>
   </div>
@@ -17,5 +17,3 @@
     <%= submit_button('save',  _('Save'), :cancel => @back_to) %>
   <% end %>
 <% end %>
-
-<%= render :file => 'shared/tiny_mce' %>
@@ -3,7 +3,7 @@
 <% abstract_method ||= :abstract %>
 <% body_label ||= 'Text' %>
 <% body_method ||= :body %>
-<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
+<% editor_type = current_editor %>
 <% lead_id ||= 0%>
 <% f ||= false%>
  
@@ -47,7 +47,9 @@ function tinymce_macros_setup(editor) {
 tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
  
 jQuery(document).ready(function () {
-  <%= tinymce_init_js :mode => mode %>
+  <%= tinymce_init_js %>
+  <%= tinymce_init_js :mode => 'simple' %>
+  <%= tinymce_init_js :mode => 'restricted' %>
 });
 </script>
  
 <%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %>
  
 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
  
-<% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:lead_id => task.id, :f => f}.merge(tiny)%>
+<%= render :partial => 'shared/lead_and_body', :locals => {:lead_id => task.id, :f => f}%>
  
 <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width: 488px;') %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <% unless task.requestor %>
   <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
   <p><%= label_tag(_("Email: %s") % task.email) %> </p>
@@ -14,5 +12,5 @@
   <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
  
   <%= a.hidden_field(:type) %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:f => a, :lead_id => task.id} %>
 <% end %>
@@ -2,7 +2,6 @@
  
 <%= error_messages_for :mailing %>
  
-<%= render :file => 'shared/tiny_mce' %>
 <%= form_for :mailing do |f| %>
   <div class="recipients">
     <%= label_tag(_("Recipients: "), nil, { class: "formlabel" }) %>
@@ -14,7 +13,7 @@
     </div>
   </div>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => current_editor)) %>
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
 <% end %>
@@ -0,0 +1,9 @@
+class AddPeopleAndArticleEditor < ActiveRecord::Migration
+  def change
+    add_column :profiles, :editor, :string, :null => false, :default => Article::Editor::TINY_MCE
+    add_column :articles, :editor, :string, :null => false, :default => Article::Editor::TINY_MCE
+    Article.where(:type => 'TextileArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::TEXTILE)
+    Article.where(:type => 'TinyMceArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::TINY_MCE)
+    Article.where(:type => 'RawHTMLArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::RAW_HTML)
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
  
-ActiveRecord::Schema.define(version: 20160705162914) do
+ActiveRecord::Schema.define(version: 20160809123835) do
  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -168,6 +168,7 @@ ActiveRecord::Schema.define(version: 20160705162914) do
     t.boolean  "show_to_followers",    default: true
     t.integer  "followers_count",      default: 0
     t.boolean  "archived",             default: false
+    t.string   "editor",               default: "tiny_mce", null: false
   end
  
   add_index "articles", ["comments_count"], name: "index_articles_on_comments_count", using: :btree
@@ -631,15 +632,16 @@ ActiveRecord::Schema.define(version: 20160705162914) do
     t.boolean  "is_template",                        default: false
     t.integer  "template_id"
     t.string   "redirection_after_login"
-    t.integer  "friends_count",                      default: 0,     null: false
-    t.integer  "members_count",                      default: 0,     null: false
-    t.integer  "activities_count",                   default: 0,     null: false
+    t.integer  "friends_count",                      default: 0,          null: false
+    t.integer  "members_count",                      default: 0,          null: false
+    t.integer  "activities_count",                   default: 0,          null: false
     t.string   "personal_website"
     t.string   "jabber_id"
     t.integer  "welcome_page_id"
     t.boolean  "allow_members_to_invite",            default: true
     t.boolean  "invite_friends_only",                default: false
     t.boolean  "secret",                             default: false
+    t.string   "editor",                             default: "tiny_mce", null: false
   end
  
   add_index "profiles", ["activities_count"], name: "index_profiles_on_activities_count", using: :btree
@@ -155,7 +155,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Text article with Textile markup language"
+    When I follow "Text article"
     Then I should see "Tag list"
     When I fill in "Title" with "Article with tags"
     And I fill in "Tag list" with "aurium, bug"
@@ -168,7 +168,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     When I follow "New content"
-    When I follow "Text article with visual editor"
+    When I follow "Text article"
     And I fill in "Title" with "My Article"
     And I press "Save"
     Then I should see "My Article"
@@ -203,8 +203,8 @@ Feature: edit article
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "My Article"
     And I press "Save"
     Then I should see "My Article"
@@ -222,12 +222,11 @@ Feature: edit article
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I follow "Cancel" within ".no-boxes"
     Then I should be on /joaosilva/my-folder
  
-  @selenium
   Scenario: save and continue
     Given I am on /joaosilva/save-the-whales
     And I follow "Edit"
@@ -240,8 +239,8 @@ Feature: edit article
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "My new article"
     And I fill in "Text" with "text for the new article"
     And I press "Save and continue"
@@ -287,7 +286,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Text article with visual editor"
+    When I follow "Text article"
     And I fill in "Title" with "My time testing Article"
     And I fill in "Publish date" with "1980-11-15 20:37"
     And I press "Save"
@@ -99,8 +99,8 @@ Feature: forum
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "New discussion topic"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "Topic"
     And I press "Save"
     And I am logged in as "mariasilva"
@@ -8,7 +8,7 @@ Feature: uploads items on media panel
       | joaosilva | Joao Silva |
     And feature "media_panel" is enabled on environment
     And I am logged in as "joaosilva"
-    And I am on /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    And I am on /myprofile/joaosilva/cms/new?type=TextArticle
  
   Scenario: see media panel collapsed
     Then I should see "Insert media"
@@ -123,7 +123,7 @@ Feature: uploads items on media panel
     Given the following files
       | owner     | file          | mime       |
       | joaosilva | other-pic.jpg | image/jpeg |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "Recent media" from "parent_id" within "#published-media"
     Then I should see div with title "other-pic.jpg" within ".items"
@@ -148,7 +148,7 @@ Feature: uploads items on media panel
       | owner      | file          | mime       | parent        |
       | joaosilva  | rails.png     | image/png  | other-gallery |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "joaosilva/Gallery" from "parent_id" within "#published-media"
     Then I should see div with title "other-pic.jpg" within ".items"
@@ -165,7 +165,7 @@ Feature: uploads items on media panel
     And the following files
       | owner      | file          | mime       | parent        |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "joaosilva/Gallery" from "parent_id" within "#published-media"
       And I select "joaosilva/Gallery" from "parent_id" within "#media-upload-form"
@@ -187,7 +187,7 @@ Feature: uploads items on media panel
     And the following files
       | owner      | file          | mime       | parent        |
       | joaosilva  | rails.png     | image/png  | other-gallery |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "Recent media" from "parent_id" within "#published-media"
       And I fill in "Search" with "rails" within "#published-media"
@@ -227,7 +227,7 @@ Feature: uploads items on media panel
       | joaosilva  | other-pic.jpg | image/jpeg | my-gallery    |
       | joaosilva  | rails.png     | image/png  | gallery       |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I should not see "View all"
       And I attach the file "public/503.jpg" to "file"
@@ -15,8 +15,7 @@ Feature: create content on cms
  
   Scenario: list all content types
     Given I follow "New content"
-    Then I should see "Text article with visual editor"
-     And I should see "Text article with Textile markup"
+    Then I should see "Text article"
      And I should see "Folder"
      And I should see "Blog"
      And I should see "Uploaded file"
@@ -30,22 +29,6 @@ Feature: create content on cms
     And I go to joaosilva's cms
     Then I should see "My Folder"
  
-  Scenario: create a tiny_mce article
-    Given I follow "New content"
-    When I follow "Text article with visual editor"
-    And I fill in "Title" with "My tiny_mce article"
-    And I press "Save"
-    And I go to joaosilva's cms
-    Then I should see "My tiny_mce article"
-
-  Scenario: create a textile article
-    Given I follow "New content"
-    When I follow "Text article with Textile markup"
-    And I fill in "Title" with "My textile article"
-    And I press "Save"
-    And I go to joaosilva's cms
-    Then I should see "My textile article"
-
   Scenario: create a Blog
     Given I follow "New content"
     When I follow "Blog"
@@ -47,8 +47,8 @@ Feature: search inside a profile
     And I go to joaosilva's profile
     And I fill in "q" with "article"
     And I press "Search"
-    Then I should see "public article" within ".main-block"
-    And I should not see "private article" within ".main-block"
+    Then I should see "published article" within ".main-block"
+    And I should not see "unpublished article" within ".main-block"
  
   Scenario: search on environment
     Given I go to joaosilva's profile
@@ -60,11 +60,10 @@ Feature: publish article
     And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I should see "Text article with Textile markup language"
-    And I follow "Text article with Textile markup language"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in the following:
       | Title | Sample Article |
-      | Text | this is Maria's first published article |
     And I press "Save"
     And I follow "Spread"
     And I type in "Sample Community" into autocomplete list "search-communities-to-publish" and I choose "Sample Community"
@@ -22,7 +22,6 @@ Feature: search contents
     Then I should see "whales and dolphins" within ".search-text-article-item"
     And I should see "whales and dolphins" within ".only-one-result-box"
     And I should not see "bees and butterflies"
-    And The page should contain ".icon-content-textile-article"
     When I follow "whales and dolphins"
     Then I should be on article "whales and dolphins"
  
@@ -52,7 +52,7 @@ Feature: Use a secret community
     And I go to mycommunity's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I follow "Text article with visual editor"
+    And I follow "Text article"
     And I fill in "Title" with "My public article"
     And I choose "Public"
     And I press "Save and continue"
@@ -101,7 +101,7 @@ end
  
 Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded files|rss feeds)$/ do |content, table|
   klass = {
-    'articles' => TextileArticle,
+    'articles' => TextArticle,
     'events' => Event,
     'blogs' => Blog,
     'folders' => Folder,
@@ -178,7 +178,7 @@ Given /^the following articles? with images?$/ do |table|
     img_tag = "<img "
     img.each { |attr, value| img_tag += "#{attr}=\"#{value}\" " }
     img_tag += "/>"
-    article = TinyMceArticle.new(:profile => owner, :name => item[:name], :body => img_tag)
+    article = TextArticle.new(:profile => owner, :name => item[:name], :body => img_tag)
     if item[:parent]
       article.parent = Article.find_by slug: item[:parent]
     end
@@ -10,7 +10,7 @@ Feature: Create tinyMCE article
  
   @selenium
   Scenario: mce complete  mode should show on message creation
-    Given I am on /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    Given I am on /myprofile/joaosilva/cms/new?type=TextArticle
     Then The tinymce "toolbar1" should be "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
     And The tinymce "menubar" should be "edit insert view tools"
     And The tinymce "toolbar2" should contain "print preview code media | table"
 <div class="notification-plugin-form">
  
-  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => 'mceEditor'} %>
+  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => current_editor('restricted')} %>
  
   <%= button :back, _('Back'), :controller => 'admin_notifications_plugin_admin' %>
  
   <%= form_for :notifications do |f| %>
  
-    <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'restricted'} %>
-
     <%= labelled_form_field(_("Optional Title:"), f.text_field(:title, value: @notification.title)) %>
  
     <%= labelled_form_field(_("Enter your message here:"), f.text_area(:message, abstract_options)) %>
 class Application < Rails::Application
-  config.action_view.sanitized_allowed_attributes << 'data-macro-paragraph_uuid'
+  config.action_view.sanitized_allowed_attributes << 'data-macro-paragraph_uuid' unless config.action_view.sanitized_allowed_attributes.include?('data-macro-paragraph_uuid')
 end
  
 class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
@@ -5,7 +5,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   def setup
     @profile = fast_create(Community)
-    @article = fast_create(TinyMceArticle, :profile_id => profile.id)
+    @article = fast_create(TextArticle, :profile_id => profile.id)
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
   end
@@ -74,7 +74,7 @@ class DiscussionBlockTest &lt; ActiveSupport::TestCase
     b.save
     a1 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     fast_create(Event, :profile_id => community.id)
-    fast_create(TinyMceArticle, :profile_id => community.id)
+    fast_create(TextArticle, :profile_id => community.id)
     a2 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     assert_equivalent [a1, a2], b.discussions
   end
@@ -183,7 +183,7 @@ class DiscussionBlockViewTest &lt; ActionView::TestCase
     b.save
     a1 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     fast_create(Event, :profile_id => community.id)
-    fast_create(TinyMceArticle, :profile_id => community.id)
+    fast_create(TextArticle, :profile_id => community.id)
     a2 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     assert_equivalent [a2.id, a1.id], b.api_content['articles'].map {|a| a[:id]}
   end
@@ -7,6 +7,7 @@ class TinymceHelperTest &lt; ActiveSupport::TestCase
   def setup
     expects(:top_url).returns('/')
     expects(:tinymce_language).returns('en')
+    expects(:current_editor).returns(Article::Editor::TINY_MCE)
     @plugins = mock
     @plugins.expects(:dispatch).returns([]).at_least_once
     @environment = Environment.default
@@ -61,7 +61,7 @@ class CommunityTrackPlugin::Step &lt; Folder
   end
  
   def enabled_tools
-    [TinyMceArticle, Forum]
+    [TextArticle, Forum]
   end
  
   def to_html(options = {})
@@ -5,7 +5,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   def setup
     @profile = Community.create!(:name => 'Sample community', :identifier => 'sample-community')
     @track = create_track('track', @profile)
-    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day, :tool_type => TinyMceArticle.name)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day, :tool_type => TextArticle.name)
  
     user = create_user('testinguser')
     login_as(user.login)
@@ -49,7 +49,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'show tools for a step' do
-    TinyMceArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
+    TextArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } }
   end
@@ -235,7 +235,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
  
   should 'return enabled tools for a step' do
-    assert_includes @step.enabled_tools, TinyMceArticle
+    assert_includes @step.enabled_tools, TextArticle
     assert_includes @step.enabled_tools, Forum
   end
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <div>
   <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
   <%= labelled_form_field(_('Period'), (
@@ -19,4 +17,4 @@
  
 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
  
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
 <div class='community-track'>
   <%= required_fields_message %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-
   <div>
     <%= required labelled_form_field(c_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
   </div>
  
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
  
   <div>
     <%= labelled_form_field(_('Goals:'), text_area(:article, :goals, :rows => 3, :cols => 64)) %>
@@ -22,7 +22,7 @@ class ContextContentPlugin::ContextContentBlock &lt; Block
   end
  
   def available_content_types
-    @available_content_types ||= [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+    @available_content_types ||= [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
     checked_types = types.map {|t| t.constantize}
     checked_types + (@available_content_types - checked_types)
   end
@@ -8,7 +8,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     box = Box.create!(:owner => @profile)
     @block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     @block.title = "New Context Block"
     @block.save!
@@ -21,7 +21,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'display context content block if it has contents' do
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
     assert_no_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a'}
@@ -31,7 +31,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display context content block title if it is not configured to use_parent_title' do
     @block.use_parent_title = false
     @block.save
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
     assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
@@ -40,15 +40,15 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display context content with folder title if it is configured to use_parent_title' do
     @block.use_parent_title = true
     @block.save
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
     assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
   end
  
   should 'display context content block with pagination' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
     get :view_page, @page.url
     assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
     assert_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a', :attributes => {:class => 'button icon-button icon-left disabled'} }
@@ -9,7 +9,7 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
     box = create(Box, :owner_type => 'Profile', :owner_id => @profile.id)
     @block = ContextContentPlugin::ContextContentBlock.new
     @block.box = box
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     owner = create_user('block-owner').person
     @block.box = owner.boxes.last
@@ -23,14 +23,14 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'render error if page do not exists' do
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_response 500
   end
  
   should 'replace div with content for page passed as parameter' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_response :success
     assert_match /context_content_#{@block.id}/, @response.body
@@ -39,7 +39,7 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'do not render pagination buttons if it has only one page' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_no_match /context_content_more_#{@block.id}/, @response.body
   end
@@ -13,7 +13,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
  
     box = Box.create!(:owner => @profile)
     @block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     @block.save!
  
@@ -38,11 +38,11 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     @block.show_parent_content = false
     @block.save!
     get :edit, :id => @block.id, :profile => @profile.identifier
-    post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TinyMceArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
+    post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TextArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
     @block.reload
     assert_equal 'context', @block.title
     refute @block.show_image && !@block.show_name && !@block.show_parent_content
-    assert_equal ['TinyMceArticle', 'Folder'], @block.types
+    assert_equal ['TextArticle', 'Folder'], @block.types
   end
  
 end
@@ -5,7 +5,7 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   def setup
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     @block = ContextContentPlugin::ContextContentBlock.create!
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
   end
  
   should 'describe itself' do
@@ -22,13 +22,13 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
  
   should 'return children of page' do
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [article], @block.contents(folder)
   end
  
   should 'return parent name of the contents' do
     folder = fast_create(Folder, :name => " New Folder")
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal folder.name, @block.parent_title([article])
   end
  
@@ -39,40 +39,40 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   should 'limit number of children to display' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal 2, @block.contents(folder).length
   end
  
   should 'show contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(folder, 2)
   end
  
   should 'show parent contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(article1, 2)
   end
  
   should 'return parent children if page has no children' do
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [article], @block.contents(article)
   end
  
   should 'do not return parent children if show_parent_content is false' do
     @block.show_parent_content = false
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [], @block.contents(article)
   end
  
@@ -82,13 +82,13 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'return available content types with checked types first' do
-    @block.types = ['TinyMceArticle', 'Folder']
-    assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+    @block.types = ['TextArticle', 'Folder']
+    assert_equal [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], @block.available_content_types
   end
  
   should 'return available content types' do
     @block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+    assert_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
   end
  
   should 'return first 2 content types' do
@@ -120,7 +120,7 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
  
     @block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], @block.available_content_types
+    assert_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], @block.available_content_types
   end
  
   should 'return box owner on profile method call' do
@@ -144,7 +144,7 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
   def setup
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     @block = ContextContentPlugin::ContextContentBlock.create!
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
   end
  
   should 'render nothing if it has no content to show' do
@@ -153,7 +153,7 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
  
   should 'render context content block view' do
     @page = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => @page.id)
+    article = fast_create(TextArticle, :parent_id => @page.id)
     contents = [article]
     @block.use_parent_title = true
  
@@ -178,9 +178,9 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
   should 'display pagination links if it has more than one page' do
     @block.limit = 2
     @page = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => @page.id)
+    article1 = fast_create(TextArticle, :parent_id => @page.id)
+    article2 = fast_create(TextArticle, :parent_id => @page.id)
+    article3 = fast_create(TextArticle, :parent_id => @page.id)
     contents = [article1, article2, article3]
     contents.each do |article|
       article.expects(:view_url).returns('http://test.noosfero.plugins')
@@ -180,8 +180,9 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
  
     get :edit, :profile => profile.identifier, :id => form.id
+    expects(:current_editor).returns(Article::Editor::TINY_MCE)
  
-    assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => /#{current_editor}/ }
   end
  
   should 'export submissions as csv' do
 <% self.extend(CustomFormsPlugin::Helper) %>
-<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
  
 <%= error_messages_for :form %>
 <%= required labelled_form_field _('Name'), f.text_field(:name) %>
@@ -17,7 +16,7 @@
   <%= labelled_check_box _('Triggered after membership'), 'form[on_membership]', '1', @form.on_membership %>
   </p>
 <% end %>
-<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
+<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => current_editor('simple')) %>
  
 <h2><%= c_('Fields') %></h2>
  
@@ -12,7 +12,7 @@
   = labelled_field f, :name, t('delivery_plugin.models.method.name'), f.text_field(:name),
     help: t('delivery_plugin.models.method.name_help')
   = labelled_field f, :description, t('delivery_plugin.models.method.instructions'),
-    f.text_area(:description, rows: 5, class: 'mceEditor'), help: t('delivery_plugin.models.method.instructions_help')
+    f.text_area(:description, rows: 5, class: current_editor('simple')), help: t('delivery_plugin.models.method.instructions_help')
  
   fieldset
     legend= t'delivery_plugin.models.method.costs_legend'
@@ -34,5 +34,3 @@
     = submit_button :save, if delivery_method.new_record? then t('delivery_plugin.views.method.edit.add') else t('delivery_plugin.views.method.edit.save') end
     = link_to_function t('delivery_plugin.views.method.edit.back'), "delivery.method.view.toggle()"
  
-= render file: 'shared/tiny_mce', locals: {mode: 'simple'}
-
@@ -24,7 +24,7 @@ class DisplayContentBlock &lt; Block
                               {:value => 'title', :checked => true},
                               {:value => 'abstract', :checked => true}]
   settings_items :display_folder_children, :type => :boolean, :default => true
-  settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle']
+	  settings_items :types, :type => Array, :default => ['TextArticle']
   settings_items :order_by_recent, :type => :boolean, :default => :true
   settings_items :content_with_translations, :type => :boolean, :default => :true
   settings_items :limit_to_show, :type => :integer, :default => 6
@@ -61,7 +61,7 @@ class DisplayContentBlock &lt; Block
   end
  
   def available_content_types
-    @available_content_types ||= [TinyMceArticle, RawHTMLArticle, TextileArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+    @available_content_types ||= [TextArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
     checked_types = types.map {|t| t.constantize}
     checked_types + (@available_content_types - checked_types)
   end
@@ -108,7 +108,7 @@ class DisplayContentBlock &lt; Block
     @parent_nodes ||= self.holder.articles.where(:id => nodes).map { |article| get_parent(article) }.compact.flatten
   end
  
-  VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
+  VALID_CONTENT = ['TextArticle', 'Folder', 'Blog', 'Forum']
  
   include Noosfero::Plugin::HotSpot
  
@@ -39,7 +39,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node content' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -51,7 +51,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
     block.nodes= [article.id]
     block.save!
  
@@ -67,8 +67,8 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
     block.nodes = [article.id]
     block.save!
  
@@ -81,7 +81,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node closed if the node has article with children' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -95,8 +95,8 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
     block.checked_nodes= {a1.id => true}
     block.save!
  
@@ -118,9 +118,9 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
     block.checked_nodes= {a2.id => true, a3.id => true}
     block.save!
  
@@ -148,9 +148,9 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -40,7 +40,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node content' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -52,7 +52,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
     block.nodes= [article.id]
     block.save!
  
@@ -68,8 +68,8 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
     block.nodes = [article.id]
     block.save!
  
@@ -82,7 +82,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node closed if the node has article with children' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
     block.save!
  
     get :index, :block_id => block.id, :profile => profile.identifier
@@ -97,8 +97,8 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
     block.checked_nodes = {a1.id => true}
     block.save!
  
@@ -120,9 +120,9 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
     block.checked_nodes = {a1.id => true}
     block.save!
  
@@ -150,9 +150,9 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -2,7 +2,7 @@ require_relative &#39;../test_helper&#39;
 class DisplayContentBlockTest < ActiveSupport::TestCase
  
   INVALID_KIND_OF_ARTICLE = [Event, RssFeed, UploadedFile, Gallery]
-  VALID_KIND_OF_ARTICLE = [RawHTMLArticle, TextArticle, TextileArticle, TinyMceArticle, Folder, Blog, Forum]
+  VALID_KIND_OF_ARTICLE = [TextArticle, Folder, Blog, Forum]
  
   should 'describe itself' do
     assert_not_equal Block.description, DisplayContentBlock.description
@@ -39,9 +39,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'nodes be the article ids in hash of checked nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -54,9 +54,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'nodes be save in database' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -71,10 +71,10 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'be able to update nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -95,13 +95,13 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "save selected folders and articles" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
     f2 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id, :parent_id => f1.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id)
-    a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id)
+    a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id)
  
     checked_articles= {a1.id => true, a2.id => true, f1.id => false}
  
@@ -115,13 +115,13 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "save selected articles and blogs" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
     b1 = fast_create(Blog, :name => 'test blog 1', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id)
     b2 = fast_create(Blog, :name => 'test blog 2', :profile_id => profile.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id)
-    a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id)
+    a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id)
  
     checked_articles= {a1.id => true, a2.id => true, b1.id => false, b2.id => true}
  
@@ -132,36 +132,10 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equivalent [a1.id, a2.id, b1.id, b2.id], block.nodes
   end
  
-  should 'TextileArticle be saved as node' do
+  should 'TextArticle be saved as node' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    checked_articles= {a1.id => true}
-    block = DisplayContentBlock.new
-    block.stubs(:holder).returns(profile)
-    block.checked_nodes= checked_articles
-    assert_equal [], [a1.id] - block.nodes
-    assert_equal [], block.nodes - [a1.id]
-  end
-
-  should 'TinyMceArticle be saved as node' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    checked_articles= {a1.id => true}
-    block = DisplayContentBlock.new
-    block.stubs(:holder).returns(profile)
-    block.checked_nodes= checked_articles
-    assert_equal [], [a1.id] - block.nodes
-    assert_equal [], block.nodes - [a1.id]
-  end
-
-  should 'RawHTMLArticle be saved as node' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(RawHTMLArticle, :name => 'test article 1', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     checked_articles= {a1.id => true}
     block = DisplayContentBlock.new
@@ -230,9 +204,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "return all root articles from profile" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     block.nodes= [a1.id, a2.id, a3.id]
@@ -247,9 +221,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "return all children of an articles's profile" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -264,9 +238,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity')
     environment = Environment.default
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -283,9 +257,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity')
     environment = Environment.default
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -404,9 +378,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -420,9 +394,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -472,37 +446,37 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'return available content types with checked types first' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
  
-    block.types = ['TinyMceArticle', 'Folder']
-    assert_equivalent [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    block.types = ['TextArticle', 'Folder']
+    assert_equivalent [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
  
   should 'return available content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     block.types = []
-    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
  
   should 'return first 2 content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal 2, block.first_content_types.length
   end
  
   should 'return all but first 2 content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal block.available_content_types.length - 2, block.more_content_types.length
   end
  
   should 'return 2 as default value for first_types_count' do
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal 2, block.first_types_count
   end
  
@@ -527,14 +501,14 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
  
     block.types = []
-    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
   end
  
   should 'do not fail if a selected article was removed' do
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {a1.id => true}
  
@@ -547,16 +521,16 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
  
 end
  
-require 'boxes_helper'
-
 class DisplayContentBlockViewTest < ActionView::TestCase
   include BoxesHelper
+  include DatesHelper
+  helper :dates
  
   should 'list links for all articles title defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -572,8 +546,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'list content for all articles lead defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
-    a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}]
@@ -602,7 +576,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show title if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -616,7 +590,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show abstract if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -630,7 +604,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show body if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -642,7 +616,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     assert_match /#{a.body}/, render_block_content(block)
   end
  
-  should 'show publishd date if defined by user' do
+  should 'show published date if defined by user' do
     profile = create_user('testuser').person
     a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
  
@@ -658,7 +632,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show image if defined by user' do
     profile = create_user('testuser').person
-    a = create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    a = create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
     a.save!
  
     process_delayed_job_queue
@@ -676,8 +650,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in recent order' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -697,8 +671,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in oldest order' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -718,8 +692,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in recent order with limit option' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -741,10 +715,10 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     profile = create_user('testuser').person
     Article.delete_all
  
-    en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
-    en_article2 = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en')
+    en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
+    en_article2 = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en')
  
-    pt_article = fast_create TextileArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id
+    pt_article = fast_create TextArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -771,8 +745,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     profile = create_user('testuser').person
     Article.delete_all
  
-    en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
-    pt_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article)
+    en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
+    pt_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -794,7 +768,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not escape abstract html of articles' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, abstract: "<p class='test-article-abstract'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, abstract: "<p class='test-article-abstract'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -807,7 +781,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not raise if abstract of article is nil' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -823,7 +797,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not escape body html of articles' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, body: "<p class='test-article-body'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, body: "<p class='test-article-body'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'body', :checked => true}] 
@@ -836,7 +810,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not raise if body of article is nil' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -15,7 +15,7 @@
   = f.text_field :title, class: 'form-control'
  
   = f.label :subtitle, t("fb_app_plugin.views.myprofile.catalogs.catalog_subtitle_label")
-  = f.text_area :subtitle, class: 'form-control mceEditor', id: "page-tab-subtitle-#{page_tab.id}"
+  = f.text_area :subtitle, class: 'form-control ' + current_editor, id: "page-tab-subtitle-#{page_tab.id}"
  
   = f.label :config_type, t("fb_app_plugin.views.myprofile.catalogs.catalog_type_chooser_label")
   = f.select :config_type,
@@ -6,7 +6,7 @@ class MarkCommentAsReadPluginProfileControllerTest &lt; ActionController::TestCase
     @controller = MarkCommentAsReadPluginProfileController.new
  
     @profile = create_user('profile').person
-    @article = TinyMceArticle.create!(:profile => @profile, :name => 'An article')
+    @article = TextArticle.create!(:profile => @profile, :name => 'An article')
     @comment = Comment.new(:source => @article, :author => @profile, :body => 'test')
     @comment.save!
     login_as(@profile.identifier)
@@ -4,7 +4,7 @@ class MarkCommentAsReadPlugin::CommentTest &lt; ActiveSupport::TestCase
  
   def setup
     @person = create_user('user').person
-    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @article = TextArticle.create!(:profile => @person, :name => 'An article')
     @comment = Comment.create!(:title => 'title', :body => 'body', :author => @person, :source => @article)
   end
  
@@ -5,7 +5,7 @@ class MarkCommentAsReadPluginTest &lt; ActionView::TestCase
   def setup
     @plugin = MarkCommentAsReadPlugin.new
     @person = create_user('user').person
-    @article = TinyMceArticle.create!(:profile => @person, :name => 'An article')
+    @article = TextArticle.create!(:profile => @person, :name => 'An article')
     @comment = Comment.create!(:source => @article, :author => @person, :body => 'test')
     self.stubs(:user).returns(@person)
     self.stubs(:profile).returns(@person)
@@ -21,7 +21,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'add meta tags with article info' do
-    a = TinyMceArticle.create(name: 'Article to be shared', body: '<p>This article should be shared with all social networks</p>', profile: profile)
+    a = TextArticle.create(name: 'Article to be shared', body: '<p>This article should be shared with all social networks</p>', profile: profile)
  
     get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
  
@@ -37,7 +37,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'add meta tags with article images' do
-    a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/x.png" />', profile: profile)
+    a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/x.png" />', profile: profile)
  
     get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
     assert_tag tag: 'meta', attributes: { name: 'twitter:image', content: /\/images\/x.png/ }
@@ -45,7 +45,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'escape utf8 characters correctly' do
-    a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/ç.png" />', profile: profile)
+    a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/ç.png" />', profile: profile)
  
     get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
     assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/%C3%A7.png/  }
@@ -63,7 +63,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
   should 'not expose metadata on private pages' do
     profile.update_column :public_profile, false
-    a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/x.png" />', profile: profile)
+    a = TextArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/x.png" />', profile: profile)
  
     get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
     assert_no_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/x.png/  }
@@ -10,7 +10,7 @@ class NewsletterPluginSafeStringsTest &lt; ActionDispatch::IntegrationTest
     environment.add_admin(person)
  
     blog = fast_create(Blog, :profile_id => person.id)
-    post = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
     newsletter = NewsletterPlugin::Newsletter.create!(:environment => environment, :person => person, :enabled => true)
     newsletter.blog_ids = [blog.id]
     newsletter.save!
@@ -28,9 +28,9 @@ class NewsletterPluginModerateNewsletterTest &lt; ActiveSupport::TestCase
   should 'set posts for mailing body on perform' do
     person = create_user('john').person
     blog = fast_create(Blog, profile_id: person.id)
-    post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
  
     newsletter = NewsletterPlugin::Newsletter.create!(:environment => person.environment, :person => person, :enabled => true)
     newsletter.blog_ids = [blog.id]
@@ -381,9 +381,9 @@ EOS
     person = fast_create(Person)
     blog = fast_create(Blog, profile_id: person.id)
  
-    post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
  
     newsletter = NewsletterPlugin::Newsletter.create!(
       :environment => person.environment,
@@ -397,9 +397,9 @@ EOS
     person = fast_create(Person)
     blog = fast_create(Blog, profile_id: person.id)
  
-    post_1 = fast_create(TextileArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_2 = fast_create(TextileArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
-    post_3 = fast_create(TextileArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_1 = fast_create(TextArticle, :name => 'First post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_2 = fast_create(TextArticle, :name => 'Second post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
+    post_3 = fast_create(TextArticle, :name => 'Third post', :profile_id => person.id, :parent_id => blog.id, :body => 'Test')
  
     newsletter = NewsletterPlugin::Newsletter.create!(
       :environment => person.environment,
 <h1><%= _('Newsletter settings') %></h1>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= error_messages_for :newsletter %>
  
 <%= form_for(:newsletter, html: { multipart: true }) do |f| %>
@@ -81,7 +79,7 @@
     content_tag('h3', ui_icon('ui-icon-triangle-1-s') +
                 _('Newsletter footer'), :class => 'newsletter-toggle-link', :element_id => '#newsletter-footer-field'),
     content_tag('div',
-      f.text_area(:footer, :style => 'width: 100%', :class => 'mceEditor'),
+      f.text_area(:footer, :style => 'width: 100%', :class => current_editor),
       :id => 'newsletter-footer-field'
     ))
   %>
@@ -51,7 +51,7 @@ class OpenGraphPlugin::PublisherTest &lt; ActiveSupport::TestCase
     user = User.current.person
  
     blog = Blog.create! profile: user, name: 'blog'
-    blog_post = TinyMceArticle.create! profile: user, parent: blog, name: 'blah', author: user
+    blog_post = TextArticle.create! profile: user, parent: blog, name: 'blah', author: user
     assert_last_activity user, :create_an_article, url_for(blog_post)
  
     gallery = Gallery.create! name: 'gallery', profile: user
@@ -65,7 +65,7 @@ class OpenGraphPlugin::PublisherTest &lt; ActiveSupport::TestCase
     assert_last_activity user, :create_an_event, url_for(event)
  
     forum = Forum.create! name: 'forum', profile: user
-    topic = TinyMceArticle.create! profile: user, parent: forum, name: 'blah2', author: user
+    topic = TextArticle.create! profile: user, parent: forum, name: 'blah2', author: user
     assert_last_activity user, :start_a_discussion, url_for(topic, topic.url.merge(og_type: MetadataPlugin.og_types[:forum]))
  
     AddFriend.create!(person: user, friend: @other_actor).finish
@@ -82,7 +82,7 @@ class OpenGraphPlugin::PublisherTest &lt; ActiveSupport::TestCase
     User.current = @actor.user
     user = User.current.person
  
-    blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: user
+    blog_post = TextArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: user
     story = :announce_news_from_a_sse_initiative
     assert_last_activity user, story, passive_url_for(blog_post, nil, OpenGraphPlugin::Stories::Definitions[story])
  
@@ -91,13 +91,13 @@ class OpenGraphPlugin::PublisherTest &lt; ActiveSupport::TestCase
     user = User.current.person
  
     # fan
-    blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: user
+    blog_post = TextArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: user
     assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/coop/blog/blah2'
     # member
-    blog_post = TinyMceArticle.create! profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: user
+    blog_post = TextArticle.create! profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: user
     assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/mycoop/blog/blah2'
  
-    blog_post = TinyMceArticle.create! profile: @community, parent: @community.blog, name: 'blah', author: user
+    blog_post = TextArticle.create! profile: @community, parent: @community.blog, name: 'blah', author: user
     assert_last_activity user, :announce_news_from_a_community, 'http://noosfero.net/comm/blog/blah'
   end
  
@@ -5,8 +5,7 @@ h3= t(&#39;views.cycle._edit_fields.general_settings&#39;)
 = form_for @cycle, as: :cycle , remote: true, url: {action: @cycle.new? ? :new : :edit, id: @cycle.id }, html: {data: {loading: '#cycle-fields form'}} do |f|
  
   = labelled_field f, :name, t('views.cycle._edit_fields.name'), f.text_field(:name), class: 'cycle-field-name'
-  = labelled_field f, :description, t('views.cycle._edit_fields.description'), f.text_area(:description, class: 'mceEditor'), class: 'cycle-field-description'
-  = render file: 'shared/tiny_mce', locals: {mode: 'simple'}
+  = labelled_field f, :description, t('views.cycle._edit_fields.description'), f.text_area(:description, class: current_editor('simple')), class: 'cycle-field-description'
  
   .cycle-fields-block
     = labelled_datetime_range_field f, :start, :finish, t('views.cycle._edit_fields.orders_interval'), class: 'cycle-orders-period'
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
 <% if !@product.description.blank? %>
   <%= @product.description %>
-  <%= edit_product_button_to_remote(@product, 'description', _('Edit description'), :title => _('Edit the description of your product and give consumers more information about what you are advertising')) %>
+  <%= edit_product_button_to_remote(@product, 'description', _('Edit description'), {:title => _('Edit the description of your product and give consumers more information about what you are advertising'), :class => current_editor}) %>
 <% else %>
   <%= edit_product_ui_button_to_remote(
     @product,
-<%= render file: 'shared/tiny_mce', locals: {mode: 'simple'} %>
 <%= remote_form_for(@product,
                    loading: "small_loading('product-description-form')",
                    update: 'product-description',
                    url: {controller: 'products_plugin/page', action: 'edit', id: @product, field: 'description'},
                    html: {id: 'product-description-form', method: 'post'}) do |f| %>
  
-  <%= labelled_form_field(_('Description:'), f.text_area(:description, rows: 15, style: 'width: 90%;', class: 'mceEditor')) %>
+  <%= labelled_form_field(_('Description:'), f.text_area(:description, rows: 15, style: 'width: 90%;', class: current_editor('simple'))) %>
   <%= button_bar do %>
     <%= submit_button :save, _('Save') %>
     <%= cancel_edit_product_link(@product, 'description') %>
@@ -5,7 +5,7 @@
  
   <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
   <%= display_form_field( _('Price:'), f.text_field(:price) ) %>
-  <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => 'mceEditor') ) %>
+  <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => current_editor('simples')) ) %>
   <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %>
   <%= f.fields_for :image_builder, @product.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %>
@@ -42,7 +42,7 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block = ProfileMembersHeadlinesBlock.create
     block.stubs(:owner).returns(community)
     blog = fast_create(Blog, :profile_id => member1.id)
-    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
+    post = fast_create(TextArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
     self.expects(:render).with(:template => 'blocks/profile_members_headlines', :locals => { :block => block }).returns('file-with-authors-and-headlines')
     assert_equal 'file-with-authors-and-headlines', render_block_content(block)
   end
@@ -53,7 +53,7 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block = ProfileMembersHeadlinesBlock.new(:limit => 1, :filtered_roles => [role.id])
     block.expects(:owner).returns(community)
     blog = fast_create(Blog, :profile_id => member1.id)
-    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
+    post = fast_create(TextArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
     assert_equal [member1], block.authors_list
   end
  
@@ -62,7 +62,7 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block.expects(:owner).returns(community)
     private_author = fast_create(Person, :public_profile => false)
     blog = fast_create(Blog, :profile_id => private_author.id)
-    post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => private_author.id, :parent_id => blog.id)
+    post = fast_create(TextArticle, :name => 'headlines', :profile_id => private_author.id, :parent_id => blog.id)
     assert_equal [], block.authors_list
   end
  
@@ -76,7 +76,7 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block.stubs(:owner).returns(community)
     community.members.each do |member|
       blog = fast_create(Blog, :profile_id => member.id)
-      post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member.id, :parent_id => blog.id)
+      post = fast_create(TextArticle, :name => 'headlines', :profile_id => member.id, :parent_id => blog.id)
     end
     assert_equal [author], block.authors_list
   end
@@ -7,7 +7,7 @@ class RecentContentBlock &lt; Block
  
   attr_accessible :presentation_mode, :total_items, :show_blog_picture, :selected_folder
  
-  VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle']
+  VALID_CONTENT = ['TextArticle']
  
   def self.description
     c_('Recent content')
@@ -2,7 +2,7 @@ require_relative &#39;../test_helper&#39;
 class RecentContentBlockTest < ActiveSupport::TestCase
  
   INVALID_KIND_OF_ARTICLE = [RssFeed, UploadedFile, Gallery, Folder, Blog, Forum]
-  VALID_KIND_OF_ARTICLE = [RawHTMLArticle, TextArticle, TextileArticle, TinyMceArticle]
+  VALID_KIND_OF_ARTICLE = [TextArticle]
  
   should 'describe itself' do
     assert_not_equal Block.description, RecentContentBlock.description
@@ -61,9 +61,9 @@ class RecentContentBlockTest &lt; ActiveSupport::TestCase
  
     root = fast_create(Blog, :name => 'test-blog', :profile_id => profile.id)
  
-    a1 = fast_create(TextileArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 2.days)
-    a2 = fast_create(TextileArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 1.days)
-    a3 = fast_create(TextileArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now)
+    a1 = fast_create(TextArticle, :name => 'article #1', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 2.days)
+    a2 = fast_create(TextArticle, :name => 'article #2', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now - 1.days)
+    a3 = fast_create(TextArticle, :name => 'article #3', :profile_id => profile.id, :parent_id => root.id, :created_at => Time.now)
  
     block = RecentContentBlock.new
     block.stubs(:holder).returns(profile)
@@ -29,9 +29,9 @@ class RelevantContentBlockTest &lt; ActiveSupport::TestCase
  
  should 'list most commented articles' do
     Article.delete_all
-    a1 = create(TextileArticle, :name => "art 1", :profile_id => profile.id)
-    a2 = create(TextileArticle, :name => "art 2", :profile_id => profile.id)
-    a3 = create(TextileArticle, :name => "art 3", :profile_id => profile.id)
+    a1 = create(TextArticle, :name => "art 1", :profile_id => profile.id)
+    a2 = create(TextArticle, :name => "art 2", :profile_id => profile.id)
+    a3 = create(TextArticle, :name => "art 3", :profile_id => profile.id)
  
     2.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a2).save! }
     4.times { Comment.create(:title => 'test', :body => 'asdsad', :author => profile, :source => a3).save! }
@@ -4,7 +4,7 @@ Allows to send e-mails through an e-mail form.
  
 h2. Usage
  
-* Create a HTML form using RawHTMLBlock or RawHTMLArticle that invokes the {sendemail} action
+* Create a HTML form using RawHTMLBlock that invokes the {sendemail} action
 * Add a "to" and "message" field and a submit button
 * Make sure to fill in allowed 'to' addresses in plugin settings
  
@@ -29,8 +29,7 @@ class SendEmailPluginTest &lt; ActiveSupport::TestCase
   should 'expand macro used on form on profile context' do
     profile = fast_create(Community)
     @plugin.context.stubs(:profile).returns(profile)
-    article = RawHTMLArticle.create!(:name => 'Raw HTML', :body => "<form action='{sendemail}'></form>", :profile => profile)
-
+    article = TextArticle.create!(:name => 'Text HTML', :body => "<form action='{sendemail}'></form>", :profile => profile, :editor => Article::Editor::RAW_HTML)
     assert_match /profile\/#{profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content(article.to_html, nil).first
   end
  
@@ -72,13 +72,7 @@ class Article
   end
  
   def solr_plugin_f_type
-    #join common types
-    case self.class.name
-    when 'TinyMceArticle', 'TextileArticle'
-      TextArticle.name
-    else
-      self.class.name
-    end
+    self.class.name
   end
  
   def solr_plugin_f_profile_type
@@ -111,8 +105,6 @@ class Article
   # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
   UploadedFile
   TextArticle
-  TinyMceArticle
-  TextileArticle
   Folder
   EnterpriseHomepage
   Gallery
...	...	@@ -107,7 +107,7 @@ module Api
107	107	def post_article(asset, params)
108	108	return forbidden! unless current_person.can_post_content?(asset)
109	109
110		- klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TinyMceArticle.name
	110	+ klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TextArticle.name
111	111	return forbidden! unless klass_type.constantize <= Article
112	112
113	113	article = klass_type.constantize.new(params[:article])
...	...	@@ -461,11 +461,9 @@ module Api
461	461
462	462	def parse_content_type(content_type)
463	463	return nil if content_type.blank?
464		- content_types = content_type.split(',').map do \|content_type\|
465		- content_type = content_type.camelcase
466		- content_type == 'TextArticle' ? Article.text_article_types : content_type
	464	+ content_type.split(',').map do \|content_type\|
	465	+ content_type.camelcase
467	466	end
468		- content_types.flatten.uniq
469	467	end
470	468
471	469	def period(from_date, until_date)
...	...
...	...	@@ -151,6 +151,7 @@ class CmsController < MyProfileController
151	151
152	152	@article.profile = profile
153	153	@article.author = user
	154	+ @article.editor = current_person.editor
154	155	@article.last_changed_by = user
155	156	@article.created_by = user
156	157
...	...	@@ -399,8 +400,7 @@ class CmsController < MyProfileController
399	400
400	401	def available_article_types
401	402	articles = [
402		- TinyMceArticle,
403		- TextileArticle,
	403	+ TextArticle,
404	404	Event
405	405	]
406	406	articles += special_article_types if params && params[:cms]
...	...	@@ -408,9 +408,6 @@ class CmsController < MyProfileController
408	408	if @parent && @parent.blog?
409	409	articles -= Article.folder_types.map(&:constantize)
410	410	end
411		- if user.is_admin?(profile.environment)
412		- articles << RawHTMLArticle
413		- end
414	411	articles
415	412	end
416	413
...	...
...	...	@@ -92,7 +92,7 @@ class ProfileEditorController < MyProfileController
92	92	end
93	93
94	94	def welcome_page
95		- @welcome_page = profile.welcome_page \|\| TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
	95	+ @welcome_page = profile.welcome_page \|\| TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
96	96	if request.post?
97	97	begin
98	98	@welcome_page.update!(params[:welcome_page])
...	...
...	...	@@ -109,10 +109,6 @@ module ApplicationHelper
109	109	content = capture(&block)
110	110	end
111	111
112		- if options[:type] == :textile
113		- content = RedCloth.new(content).to_html
114		- end
115		-
116	112	options[:class] = '' if ! options[:class]
117	113	options[:class] += ' button icon-help' # with-text
118	114
...	...	@@ -130,13 +126,6 @@ module ApplicationHelper
130	126	text
131	127	end
132	128
133		- # alias for <tt>help(content, :textile)</tt>. You can pass a block in the
134		- # same way you would do if you called <tt>help</tt> directly.
135		- def help_textile(content = nil, link_name = nil, options = {}, &block)
136		- options[:type] = :textile
137		- help(content, link_name, options, &block)
138		- end
139		-
140	129	# TODO: do something more useful here
141	130	# TODO: test this helper
142	131	# TODO: add an icon?
...	...	@@ -1243,4 +1232,15 @@ module ApplicationHelper
1243	1232	content.html_safe
1244	1233	end
1245	1234
	1235	+ def current_editor_is?(editor)
	1236	+ editor.blank? ? false : current_editor == editor
	1237	+ end
	1238	+
	1239	+ def current_editor(mode = '')
	1240	+ editor = @article.editor \|\| Article::Editor::TINY_MCE unless @article.nil?
	1241	+ editor \|\|= (current_person.nil? \|\| current_person.editor.nil?) ? Article::Editor::TINY_MCE : current_person.editor
	1242	+ editor += '_' + mode unless mode.blank?
	1243	+ editor
	1244	+ end
	1245	+
1246	1246	end
...	...
...	...	@@ -158,4 +158,8 @@ module ProfileEditorHelper
158	158	end
159	159	end
160	160
	161	+ def select_editor(title, object, method, options)
	162	+ labelled_form_field(title, select(object, method, current_person.available_editors.map { \|k,v\| [v, k] }))
	163	+ end
	164	+
161	165	end
...	...
...	...	@@ -18,7 +18,8 @@ module TinymceHelper
18	18	insertdatetime media nonbreaking save table contextmenu directionality
19	19	emoticons template paste textcolor colorpicker textpattern],
20	20	:image_advtab => true,
21		- :language => tinymce_language
	21	+ :language => tinymce_language,
	22	+ :selector => '.' + current_editor(options[:mode])
22	23
23	24	options[:toolbar1] = toolbar1(options[:mode])
24	25	options[:menubar] = menubar(options[:mode])
...	...
1	1
2	2	class Article < ApplicationRecord
3	3
	4	+ module Editor
	5	+ TEXTILE = 'textile'
	6	+ TINY_MCE = 'tiny_mce'
	7	+ RAW_HTML = 'raw_html'
	8	+ end
	9	+
4	10	include SanitizeHelper
5	11
6	12	attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent,
...	...	@@ -11,7 +17,7 @@ class Article < ApplicationRecord
11	17	:highlighted, :notify_comments, :display_hits, :slug,
12	18	:external_feed_builder, :display_versions, :external_link,
13	19	:image_builder, :show_to_followers, :archived,
14		- :author, :display_preview, :published_at, :person_followers
	20	+ :author, :display_preview, :published_at, :person_followers, :editor
15	21
16	22	extend ActsAsHavingImage::ClassMethods
17	23	acts_as_having_image
...	...	@@ -518,17 +524,12 @@ class Article < ApplicationRecord
518	524	['Folder', 'Blog', 'Forum', 'Gallery']
519	525	end
520	526
521		- def self.text_article_types
522		- ['TextArticle', 'TextileArticle', 'TinyMceArticle']
523		- end
524		-
525	527	scope :published, -> { where 'articles.published = ?', true }
526	528	scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
527	529	scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
528	530	scope :galleries, -> { where "articles.type IN ('Gallery')" }
529	531	scope :images, -> { where :is_image => true }
530	532	scope :no_images, -> { where :is_image => false }
531		- scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
532	533	scope :files, -> { where :type => 'UploadedFile' }
533	534	scope :with_types, -> types { where 'articles.type IN (?)', types }
534	535
...	...	@@ -711,10 +712,6 @@ class Article < ApplicationRecord
711	712	false
712	713	end
713	714
714		- def tiny_mce?
715		- false
716		- end
717		-
718	715	def folder?
719	716	false
720	717	end
...	...	@@ -874,6 +871,10 @@ class Article < ApplicationRecord
874	871	true
875	872	end
876	873
	874	+ def editor?(editor)
	875	+ self.editor == editor
	876	+ end
	877	+
877	878	private
878	879
879	880	def sanitize_tag_list
...	...
...	...	@@ -121,10 +121,6 @@ class Event < Article
121	121	true
122	122	end
123	123
124		- def tiny_mce?
125		- true
126		- end
127		-
128	124	def notifiable?
129	125	true
130	126	end
...	...
...	...	@@ -25,7 +25,7 @@ class ExternalFeed < ApplicationRecord
25	25	end
26	26	content = doc.to_s
27	27
28		- article = TinyMceArticle.new
	28	+ article = TextArticle.new
29	29	article.name = title
30	30	article.profile = blog.profile
31	31	article.body = content
...	...
1	1	# A person is the profile of an user holding all relationships with the rest of the system
2	2	class Person < Profile
3	3
4		- attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles
	4	+ attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles, :editor
5	5
6	6	SEARCH_FILTERS = {
7	7	:order => %w[more_recent more_popular more_active],
...	...	@@ -341,6 +341,8 @@ class Person < Profile
341	341
342	342	validates_associated :user
343	343
	344	+ validates :editor, inclusion: { in: lambda { \|p\| p.available_editors } }
	345	+
344	346	def email
345	347	self.user.nil? ? nil : self.user.email
346	348	end
...	...	@@ -613,8 +615,21 @@ class Person < Profile
613	615	Profile.followed_by self
614	616	end
615	617
	618	+ def editor?(editor)
	619	+ self.editor == editor
	620	+ end
	621	+
616	622	def in_social_circle?(person)
617	623	self.is_a_friend?(person) \|\| super
618	624	end
619	625
	626	+ def available_editors
	627	+ available_editors = {
	628	+ Article::Editor::TINY_MCE => _('TinyMCE'),
	629	+ Article::Editor::TEXTILE => _('Textile')
	630	+ }
	631	+ available_editors.merge!({Article::Editor::RAW_HTML => _('Raw HTML')}) if self.is_admin?
	632	+ available_editors
	633	+ end
	634	+
620	635	end
...	...