Merge branch 'staging' into production

Leandro Santos
2 parents f8ba3fb1 1fbb9828
Showing 4566 changed files with 167267 additions and 2277 deletions Show diff stats
.gitlab-ci.yml
.gitmodules
.travis.yml
Gemfile
Gemfile.lock
HACKING.md
app/api/entities.rb
app/api/helpers.rb
app/api/v1/communities.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/tags_helper.rb
app/helpers/tinymce_helper.rb
app/helpers/token_helper.rb
@@ -59,18 +59,18 @@ selenium-6:
 # NOOSFERO_BUNDLE_OPTS=install makes migrations fails
 # probably because of rubygems-integration
 plugins-1:
-  script: SLICE=1/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-2:
-  script: SLICE=2/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-3:
-  script: SLICE=3/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-4:
-  script: SLICE=4/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-5:
-  script: SLICE=5/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
  
@@ -46,3 +46,63 @@
 [submodule "plugins/serpro_integration"]
 	path = plugins/serpro_integration
 	url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_integration.git
+[submodule "public/designs/themes/conference"]
+	path = public/designs/themes/conference
+	url = https://gitlab.com/noosfero-themes/conference.git
+[submodule "public/designs/themes/participa-site"]
+	path = public/designs/themes/participa-site
+	url = https://gitlab.com/noosfero-themes/participa-site.git
+[submodule "public/designs/themes/presidencia"]
+	path = public/designs/themes/presidencia
+	url = https://gitlab.com/noosfero-themes/presidencia.git
+[submodule "public/designs/themes/planejamento-serpro"]
+	path = public/designs/themes/planejamento-serpro
+	url = https://gitlab.com/noosfero-themes/planejamento-serpro.git
+[submodule "public/designs/themes/voce-serpro"]
+	path = public/designs/themes/voce-serpro
+	url = https://gitlab.com/noosfero-themes/voce-serpro.git
+[submodule "public/designs/themes/softwarepublico"]
+	path = public/designs/themes/softwarepublico
+	url = https://gitlab.com/noosfero-themes/softwarepublico.git
+[submodule "public/designs/themes/mrosc-theme"]
+	path = public/designs/themes/mrosc-theme
+	url = https://gitlab.com/noosfero-themes/mrosc-theme.git
+[submodule "public/designs/themes/colabora"]
+	path = public/designs/themes/colabora
+	url = https://gitlab.com/noosfero-themes/colabora.git
+[submodule "public/designs/themes/inclusao-digital"]
+	path = public/designs/themes/inclusao-digital
+	url = https://gitlab.com/noosfero-themes/inclusao-digital.git
+[submodule "public/designs/themes/participa-consulta"]
+	path = public/designs/themes/participa-consulta
+	url = https://gitlab.com/noosfero-themes/participa-consulta.git
+[submodule "public/designs/themes/participa-theme"]
+	path = public/designs/themes/participa-theme
+	url = https://gitlab.com/noosfero-themes/participa-theme.git
+[submodule "public/designs/themes/serpro"]
+	path = public/designs/themes/serpro
+	url = https://gitlab.com/noosfero-themes/serpro.git
+[submodule "public/designs/themes/voce-serpro-novo"]
+	path = public/designs/themes/voce-serpro-novo
+	url = https://gitlab.com/noosfero-themes/voce-serpro-novo.git
+[submodule "public/designs/themes/juventude"]
+	path = public/designs/themes/juventude
+	url = https://gitlab.com/noosfero-themes/juventude.git
+[submodule "public/designs/themes/new-participa-theme"]
+	path = public/designs/themes/new-participa-theme
+	url = https://gitlab.com/noosfero-themes/new-participa-theme.git
+[submodule "public/designs/themes/participa-event"]
+	path = public/designs/themes/participa-event
+	url = https://gitlab.com/noosfero-themes/participa-event.git
+[submodule "public/designs/themes/participatorio-theme"]
+	path = public/designs/themes/participatorio-theme
+	url = https://gitlab.com/noosfero-themes/participatorio-theme.git
+[submodule "public/designs/themes/sinesp"]
+	path = public/designs/themes/sinesp
+	url = https://gitlab.com/noosfero-themes/sinesp.git
+[submodule "public/designs/themes/maranhao"]
+	path = public/designs/themes/maranhao
+	url = https://gitlab.com/noosfero-themes/maranhao.git
+[submodule "public/designs/themes/minjustica"]
+	path = public/designs/themes/minjustica
+	url = https://gitlab.com/noosfero-themes/minjustica.git
@@ -19,6 +19,10 @@ language: ruby
 rvm:
   - 2.3.1
  
+services:
+  - postgresql
+  - elasticsearch
+
 addons:
   apt:
     packages:
@@ -27,7 +27,7 @@ gem &#39;rest-client&#39;,              &#39;~&gt; 1.6&#39;
 gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 3.1', :require => false
 gem 'locale',                   '~> 2.1'
-gem 'whenever',                 '~> 0.9.4', :require => false
+gem 'whenever',                 '0.9.4', :require => false
 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
 gem 'diffy',                    '~> 3.0'
 gem 'slim'
@@ -35,17 +35,16 @@ gem &#39;activerecord-session_store&#39;, (&#39;1.0.0.pre&#39; if RUBY_VERSION &gt;= &#39;2.3.0&#39;)
  
 # API dependencies
 gem 'grape',                    '~> 0.12'
-gem 'grape-entity',             '0.4.8'
+gem 'grape-entity',             '~>0.4.8'
 gem 'grape_logging'
 gem 'grape-swagger'
 gem 'swagger-ui_rails'
 gem 'kramdown'
 gem 'rack-cors'
 gem 'rack-contrib'
-gem 'liquid',                    '~> 3.0.3'
  
 gem 'api-pagination',           '>= 4.1.1'
-gem 'liquid',                    '~> 3.0.3'
+gem 'liquid',                    '>= 3.0.3'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -84,7 +83,7 @@ group :cucumber do
   gem 'cucumber'
   gem 'cucumber-rails',         '~> 1.4.2', :require => false
   gem 'database_cleaner',       '~> 1.3'
-  gem 'selenium-webdriver',     '>= 2.50'
+  gem 'selenium-webdriver',     '>= 2.53'
   gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
 end
  
@@ -444,7 +444,7 @@ DEPENDENCIES
   gdata (> 0.0.0)!
   gettext (~> 3.1)
   grape (~> 0.12)
-  grape-entity (= 0.4.8)
+  grape-entity (~> 0.4.8)
   grape-swagger
   grape_logging
   honeypot (= 0.0.0)!
@@ -452,7 +452,7 @@ DEPENDENCIES
   kandadaboggu-vote_fu (> 0.0.0)!
   kramdown
   launchy
-  liquid (~> 3.0.3)
+  liquid (>= 3.0.3)
   locale (~> 2.1)
   minitest
   minitest-reporters
@@ -479,7 +479,7 @@ DEPENDENCIES
   ruby-feedparser (~> 0.7)
   ruby_bosh (> 0.0.0)!
   sass-rails
-  selenium-webdriver (>= 2.50)
+  selenium-webdriver (>= 2.53)
   slim
   spring
   sprockets-rails (~> 2.1)
@@ -489,7 +489,7 @@ DEPENDENCIES
   unicorn (~> 4.8)
   validates_as_cnpj (= 0.0.0)!
   validates_multiparameter_assignments (= 0.0.0)!
-  whenever (~> 0.9.4)
+  whenever (= 0.9.4)
   will_paginate (~> 3.0.7)
   xss_terminate (= 0.0.0)!
  
@@ -31,7 +31,7 @@ If you want to use a different port than 3000, pass `-p &lt;PORT&gt;` to `./script/dev
 Instructions for other systems
 ------------------------------
  
-On other OS, you have 2 options:
+On other OS, you have many options:
  
 ### 1) using a chroot or a VM with Debian stable (easier)
  
@@ -45,6 +45,14 @@ You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea 
  
 If you write such script for your own OS, *please* share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
  
+### 3) Installing dependencies via Rubygems and RVM
+
+To setup the development environment through Rubygems you just need to install some basic deps and then install the gems defined on the Gemfile. Further instructions can be found on: http://noosfero.org/bin/view/Development/DepsWithRVMAndGems
+
+### 4) Using a docker image
+
+Use a docker image to run an out-of-the-box development environment. Further information can be found on: https://hub.docker.com/r/noosfero/dev-rails4/
+
 Submitting your changes back
 ----------------------------
  
@@ -38,6 +38,13 @@ module Api
       PERMISSIONS[current_permission] <= PERMISSIONS[permission]
     end
  
+    def self.expose_optional_field?(field, options = {})
+      return false if options[:params].nil? 
+      optional_fields = options[:params][:optional_fields] || []
+      optional_fields.include?(field.to_s)
+    end
+
+
     class Image < Entity
       root 'images', 'image'
  
@@ -166,7 +173,8 @@ module Api
         community.admins.map{|admin| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
       end
       expose :categories, :using => Category
-      expose :members, :using => Person , :if => lambda{ |community, options| community.display_info_to? options[:current_person] }
+      expose :members_count
+      expose :members, :if => lambda {|community, options| Entities.expose_optional_field?(:members, options)}
     end
  
     class CommentBase < Entity
@@ -213,7 +221,7 @@ module Api
       expose :comments_count
       expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
       expose :type
-      expose :comments, using: CommentBase, :if => lambda{|obj,opt| opt[:params] && ['1','true',true].include?(opt[:params][:show_comments])}
+      expose :comments, using: CommentBase, :if => lambda{|comment,options| Entities.expose_optional_field?(:comments, options)}
       expose :published
       expose :accept_comments?, as: :accept_comments
     end
@@ -57,9 +57,11 @@ module Api
     def present_partial(model, options)
       if(params[:fields].present?)
         begin
-          fields = JSON.parse(params[:fields])
+          fields = JSON.parse((params.to_hash[:fields] || params.to_hash['fields']).to_json)
           if fields.present?
-            options.merge!(fields.symbolize_keys.slice(:only, :except))
+            fields = fields.symbolize_keys
+            options.merge!(:only => fields[:only]) if fields[:only].present?
+            options.merge!(:except => fields[:except]) if fields[:except].present?
           end
         rescue
           fields = params[:fields]
@@ -116,7 +118,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])
@@ -503,11 +505,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)
@@ -18,7 +18,7 @@ module Api
           communities = select_filtered_collection_of(environment, 'communities', params)
           communities = profiles_for_person(communities, current_person)
           communities = communities.by_location(params) # Must be the last. May return Exception obj
-          present communities, :with => Entities::Community, :current_person => current_person
+          present communities, :with => Entities::Community, :current_person => current_person, :params => params
         end
  
  
@@ -49,7 +49,7 @@ module Api
  
         get ':id' do
           community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
-          present community, :with => Entities::Community, :current_person => current_person
+          present community, :with => Entities::Community, :current_person => current_person, :params => params
         end
  
       end
@@ -146,11 +146,14 @@ class CmsController &lt; MyProfileController
     parent = check_parent(params[:parent_id])
     if parent
       @article.parent = parent
+      @article.published = parent.published
+      @article.show_to_followers = parent.show_to_followers
       @parent_id = parent.id
     end
  
     @article.profile = profile
     @article.author = user
+    @article.editor = current_person.editor
     @article.last_changed_by = user
     @article.created_by = user
  
@@ -399,8 +402,7 @@ class CmsController &lt; MyProfileController
  
   def available_article_types
     articles = [
-      TinyMceArticle,
-      TextileArticle,
+      TextArticle,
       Event
     ]
     articles += special_article_types if params && params[:cms]
@@ -408,9 +410,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
  
@@ -95,7 +95,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])
@@ -164,6 +164,7 @@ class AccountController &lt; ApplicationController
   def logout
     if logged_in?
       self.current_user.forget_me
+      current_user.update({:chat_status_at => DateTime.now}.merge({:last_chat_status => current_user.chat_status, :chat_status => 'offline'}))
     end
     reset_session
     session[:notice] = _("You have been logged out.")
@@ -113,8 +113,20 @@ class ChatController &lt; PublicController
   end
  
   #TODO Ideally this is done through roster table on ejabberd.
-  def roster_groups
-    render :text => user.memberships.map {|m| {:jid => m.jid, :name => m.name}}.to_json
+  def rosters
+    rooms = user.memberships.map {|m| {:jid => m.jid, :name => m.name}}
+    friends = user.friends.map {|f| {:jid => f.jid, :name => f.name}}
+    rosters = {:rooms => rooms, :friends => friends}
+    render :text => rosters.to_json
+  end
+
+  def availabilities
+    availabilities = user.friends.map do |friend|
+      status = friend.user.chat_status
+      status = 'offline' if status.blank?
+      {:jid => friend.jid, :status => status}
+    end
+    render :text => availabilities.to_json
   end
  
   protected
@@ -19,6 +19,11 @@ class ProfileController &lt; PublicController
       @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
       @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
+
+    # TODO Find a way to filter these through sql
+    @network_activities = filter_private_scraps(@network_activities)
+    @activities = filter_private_scraps(@activities)
+
     @tags = profile.article_tags
     allow_access_to_page
   end
@@ -231,6 +236,7 @@ class ProfileController &lt; PublicController
     @scrap = Scrap.new(params[:scrap])
     @scrap.sender= sender
     @scrap.receiver= receiver
+    @scrap.marked_people = treat_followed_entries(params[:filter_followed])
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
     activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
@@ -253,6 +259,14 @@ class ProfileController &lt; PublicController
     end
   end
  
+  def search_followed
+    result = []
+    circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
+    followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
+    result = circles + followed
+    render :text => prepare_to_token_input_by_class(result).to_json
+  end
+
   def view_more_activities
     @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_activities_list', :locals => {:activities => @activities}
@@ -434,7 +448,6 @@ class ProfileController &lt; PublicController
     end
   end
  
-
   protected
  
   def check_access_to_profile
@@ -480,4 +493,39 @@ class ProfileController &lt; PublicController
     render_not_found unless profile.allow_followers?
   end
  
+  def treat_followed_entries(entries)
+    return [] if entries.blank? || profile != user
+
+    followed = []
+    entries.split(',').map do |entry|
+      klass, identifier = entry.split('_')
+      case klass
+      when 'Person'
+        followed << Person.find(identifier)
+      when 'Circle'
+        circle = Circle.find(identifier)
+        followed += Profile.in_circle(circle)
+      end
+    end
+    followed.uniq
+  end
+
+  def filter_private_scraps(activities)
+    activities = Array(activities)
+    activities.delete_if do |item|
+      if item.kind_of?(ProfileActivity)
+        target = item.activity
+        owner = profile
+      else
+        target = item.target
+        owner = item.user
+      end
+      !environment.admins.include?(user) &&
+      owner != user &&
+      target.is_a?(Scrap) &&
+      target.marked_people.present? &&
+      !target.marked_people.include?(user)
+    end
+    activities
+  end
 end
@@ -111,10 +111,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
  
@@ -132,13 +128,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?
@@ -552,7 +541,7 @@ module ApplicationHelper
         )
       label_html = self.class.content_tag 'label', text,
                                         :class => 'formlabel'
-      control_html = self.class.content_tag 'div', html,
+      control_html = self.class.content_tag 'div', html.html_safe,
                                         :class => 'formfield type-radio '+
                                         'fieldgroup linesize'+line_size.to_s()
  
@@ -977,11 +966,16 @@ module ApplicationHelper
     content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?
   end
  
-  def task_information(task)
+  def task_information(task, params = {})
     values = {}
     values.merge!(task.information[:variables]) if task.information[:variables]
     values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
-    values.merge!({:target => link_to(task.target.name, task.target.url)}) if (task.target && task.target.respond_to?(:url))
+    if (task.target && task.target.respond_to?(:url))
+      values.merge!({:target => link_to(task.target.name, task.target.url)})
+      target_detail = _("in %s").html_safe % values[:target]
+      target_detail = '' if task.target.identifier == params[:profile]
+      values.merge!({:target_detail => target_detail}) 
+    end
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     (task.information[:message] % values).html_safe
@@ -1245,4 +1239,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
@@ -161,6 +161,10 @@ module ArticleHelper
     array.map { |object| {:label => object.name, :value => object.name} }
   end
  
+  def prepare_to_token_input_by_class(array)
+    array.map { |object| {:id => "#{object.class.name}_#{object.id || object.name}", :name => "#{object.name} (#{_(object.class.name)})", :class => object.class.name}}
+  end
+
   def cms_label_for_new_children
     _('New article')
   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
@@ -67,4 +67,17 @@ module TagsHelper
     end.join("\n").html_safe
   end
  
+  def linked_article_tags(article)
+    if @profile
+      # We are rendering a page inside a profile, so link to the profile tag search.
+      url = { :controller => 'profile', :profile => @profile.identifier, :action => 'tags' }
+      tagname_option = :id
+    else
+      # We are rendering a page outside a profile, so link to the global tag search.
+      url = { :action => 'tag' }
+      tagname_option = :tag
+    end
+    article.tags.map { |t| link_to(t, url.merge(tagname_option=>t.name) ) }.join("\n")
+  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])
@@ -5,10 +5,11 @@ module TokenHelper
   end
  
   def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
-    options[:min_chars] ||= 3
+    options[:min_chars] ||= 2
     options[:hint_text] ||= _("Type in a search term")
     options[:no_results_text] ||= _("No results")
     options[:searching_text] ||= _("Searching...")
+    options[:placeholder] ||= 'null'
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
@@ -20,6 +21,9 @@ module TokenHelper
     options[:on_delete] ||= 'null'
     options[:on_ready] ||= 'null'
     options[:query_param] ||= 'q'
+    options[:theme] ||= 'null'
+    options[:results_formatter] ||= 'null'
+    options[:token_formatter] ||= 'null'
  
     result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
     result += javascript_tag("jQuery('##{element_id}')
@@ -29,6 +33,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
+        placeholder: #{options[:placeholder].to_json},
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
@@ -39,6 +44,9 @@ module TokenHelper
         onAdd: #{options[:on_add]},
         onDelete: #{options[:on_delete]},
         onReady: #{options[:on_ready]},
+        theme: #{options[:theme] == 'null' ? options[:theme] : options[:theme].to_json},
+        resultsFormater: #{options[:results_formatter]},
+        tokenFormater: #{options[:token_formatter]},
       });
     ")
     result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
@@ -19,8 +19,13 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     # Notify the user
     ActionTrackerNotification.create(:profile_id => tracked_action.user.id, :action_tracker_id => tracked_action.id)
  
-    # Notify all followers
-    ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    if target.is_a?(Scrap) && target.marked_people.present?
+      # Notify only marked people
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")
+    else
+      # Notify all followers
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    end
  
     if tracked_action.user.is_a? Organization
       ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
@@ -9,9 +9,6 @@ class ApproveArticle &lt; Task
       if target.person? && requestor != target
         self.errors.add(:requestor, _('You can not post articles to other users.'))
       end
-      if target.organization? && !target.members.include?(requestor) && target.environment.portal_community != target
-        self.errors.add(:requestor, _('Only members can post articles on communities.'))
-      end
     end
   end
  
  
 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
@@ -879,6 +876,10 @@ class Article &lt; ApplicationRecord
     true
   end
  
+  def editor?(editor)
+    self.editor == editor
+  end
+
   private
  
   def sanitize_tag_list
 class Circle < ApplicationRecord
+  SEARCHABLE_FIELDS = {
+    :name => {:label => _('Name'), :weight => 1}
+  }
+
+  _('Circle')
+
   has_many :profile_followers
   belongs_to :person
  
@@ -122,10 +122,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],
@@ -124,6 +124,8 @@ class Person &lt; Profile
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
   }, through: :suggested_profiles, source: :suggestion
  
+  has_and_belongs_to_many :marked_scraps, :join_table => :private_scraps, :class_name => 'Scrap'
+
   scope :more_popular, -> { order 'friends_count DESC' }
  
   scope :abusers, -> {
@@ -344,6 +346,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
@@ -616,8 +620,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
@@ -2,7 +2,7 @@ class Scrap &lt; ApplicationRecord
  
   include SanitizeHelper
  
-  attr_accessible :content, :sender_id, :receiver_id, :scrap_id
+  attr_accessible :content, :sender_id, :receiver_id, :scrap_id, :marked_people
  
   SEARCHABLE_FIELDS = {
     :content => {:label => _('Content'), :weight => 1},
@@ -19,6 +19,8 @@ class Scrap &lt; ApplicationRecord
     where profile_activities: {activity_type: 'Scrap'}
   }, foreign_key: :activity_id, dependent: :destroy
  
+  has_and_belongs_to_many :marked_people, :join_table => :private_scraps, :class_name => 'Person'
+
   after_create :create_activity
   after_update :update_activity
  
@@ -44,7 +44,7 @@ class SuggestArticle &lt; Task
       type = article[:type].constantize
       return type if type < Article
     end
-    TinyMceArticle
+    TextArticle
   end
  
   def perform
@@ -65,7 +65,7 @@ class SuggestArticle &lt; Task
  
   def information
     variables = requestor.blank? ? {:requestor => sender} : {}
-    { :message => _('%{requestor} suggested the publication of the article: %{subject}.').html_safe,
+    { :message => _('%{requestor} suggested the publication %{target_detail} of the article: %{subject}.').html_safe,
       :variables => variables }
   end
  
 # 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
@@ -9,6 +9,12 @@ class UploadedFile &lt; Article
  
   attr_accessible :uploaded_data, :title
  
+  include Noosfero::Plugin::HotSpot
+
+  def environment
+    profile.environment
+  end
+
   def self.type_name
     _('File')
   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' %>
@@ -16,4 +13,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>
@@ -72,7 +75,7 @@
         </div><!-- end id="content" -->
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
-    <%= render_environment_features(:logged_in) if logged_in? %>
+    <%= render_environment_features(:logged_in).html_safe if logged_in? %>
     <div id="footer">
       <div id="theme-footer">
         <%= theme_footer %>
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val('')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
-    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
+  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val(''); jQuery('#filter-followed').tokenInput('clear')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
+    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :rows => 2, :class => 'autogrow' %>
+    <% if profile == user %>
+      <%= token_input_field_tag(:filter_followed, 'filter-followed', {:action => 'search_followed'}, {:theme => 'facebook', :placeholder => _('Filter followed, friends or group of friends to send them a private scrap...')}) %>
+    <% end %>
     <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
@@ -22,8 +22,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 %>
@@ -4,7 +4,7 @@
   <div class='pending-tasks'>
     <h2><%= _('You have %s pending requests' % @pending_tasks.count) %></h2>
     <ul>
-      <%= safe_join(@pending_tasks.limit(5).map {|task| content_tag('li', task_information(task).html_safe)}) %>
+      <%= safe_join(@pending_tasks.limit(5).map {|task| content_tag('li', task_information(task, params).html_safe)}) %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
@@ -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>
  
@@ -2,7 +2,7 @@
   <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
   <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
   <div class="task-information">
-    <%= task_information(task) %>
+    <%= task_information(task, params) %>
   </div>
  
   <%= yield %> <%# ??? %>
 <%= 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 %>
@@ -47,7 +47,7 @@
  
  
   <div class="task_information">
-    <%= task_information(task) %>
+    <%= task_information(task, params) %>
   </div>
  
   <%= fields_for "tasks[#{task.id}][task]", task do |f| %>
 <div class="title">
-  <%= task_information(task) %>
+  <%= task_information(task, params) %>
 </div>
 <div class="status">
   <%= _(Task::Status.names[task.status]) %>
@@ -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,8 @@
+class CreatePrivateScraps < ActiveRecord::Migration
+  def change
+    create_table :private_scraps do |t|
+      t.references :person
+      t.references :scrap
+    end
+  end
+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: 20160608123748) 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: 20160608123748) 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
@@ -528,6 +529,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.datetime "updated_at"
   end
  
+  create_table "private_scraps", force: :cascade do |t|
+    t.integer "person_id"
+    t.integer "scrap_id"
+  end
+
   create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
@@ -630,15 +636,16 @@ ActiveRecord::Schema.define(version: 20160608123748) 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
@@ -60,8 +60,9 @@ Depends: adduser,
          ruby-feedparser (>= 0.7-3~),
          ruby-gettext,
          ruby-grape,
-         ruby-grape-entity (= 0.4.8),
+         ruby-grape-entity (>= 0.4.8),
          ruby-grape-logging,
+         ruby-liquid (>= 3.0.3),
          ruby-minitest,
          ruby-nokogiri,
          ruby-pg,
@@ -107,7 +108,7 @@ Description: free web-based platform for social networks (apache frontend)
  
 Package: noosfero-chat
 Architecture: all
-Depends: noosfero (>= 1.2), ejabberd, odbc-postgresql, pidgin-data
+Depends: noosfero (>= 1.5.1), ejabberd (>= 16.06), odbc-postgresql, pidgin-data
 Description: free web-based platform for social networks (ejabberd based chat)
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+  # comma-separated, e.g. "mysql, pgsql, sqlite3"
+  dbc_dbtypes="pgsql"
+
+  . /usr/share/dbconfig-common/dpkg/config
+fi
+
+db_input high noosfero-chat/environment || true
+db_go
+
+db_input high noosfero-chat/admin || true
+db_go
+
 debian/default/noosfero-chat                etc/default
-util/chat/ejabberd.cfg                      etc/ejabberd
+util/chat/ejabberd.yml                      etc/ejabberd
 debian/update-noosfero-odbc                 usr/sbin
 etc/security/limits.d/noosfero-chat.conf    etc/security/limits.d
 etc/pam.d/noosfero-chat                     etc/pam.d
@@ -4,18 +4,32 @@ set -e
  
 . /usr/share/debconf/confmodule
  
-echo -n "Fetching noosfero domain ..."
-domain=$(noosfero-runner 'puts Environment.default.default_hostname(true)')
+db_get noosfero-chat/environment
+if [ ! -z "$RET" ]; then
+  environment="${RET}_production"
+else
+  environment="production"
+fi
+
+domain=$(noosfero-runner 'puts Environment.default.default_hostname(true)' $environment)
 echo " [domain = $domain]"
  
-ejabberd_config='/etc/ejabberd/ejabberd.cfg'
+db_get noosfero-chat/admin
+if [ ! -z "$RET" ]; then
+  admin="$RET@$domain"
+else
+  admin="admin@$domain"
+fi
+echo " [admin = $admin]"
+
+ejabberd_config='/etc/ejabberd/ejabberd.yml'
 if test -f $ejabberd_config; then
-  sed -i "s/acl, *\([^,]*\), *{user, *\([^,]*\), *[^}]*/acl, \1, {user, \2, \"$domain\"/" /etc/ejabberd/ejabberd.cfg
-  sed -i "s/hosts, *\[[^]]*/hosts, [\"$domain\"/" /etc/ejabberd/ejabberd.cfg
+  sed -i "s/HOST_DOMAIN/$domain/" /etc/ejabberd/ejabberd.yml
+  sed -i "s/ACL_ADMIN_ACCOUNT/$admin/" /etc/ejabberd/ejabberd.yml
 fi
  
 echo -n 'Fetching noosfero database name ...'
-noosfero_database=$(noosfero-runner 'puts Environment.connection_config[:database]')
+noosfero_database=$(noosfero-runner 'puts Environment.connection_config[:database]' $environment)
 echo " [database = $noosfero_database]"
  
 echo 'Creating ejabberd schema ...'
@@ -29,7 +43,7 @@ else
   echo " => GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;"
 fi
  
-su - $noosfero_user -c 'rails dbconsole production < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql > /dev/null'
+su - $noosfero_user -c "rails dbconsole $environment < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql > /dev/null"
  
 if which update-noosfero-odbc &> /dev/null ; then
   update-noosfero-odbc
@@ -37,6 +51,7 @@ fi
  
 ejabberd_default='/etc/default/ejabberd'
 noosfero_chat_default='/etc/default/noosfero-chat'
+
 if test -f $ejabberd_default; then
   if ! cat $ejabberd_default | grep "^\. $noosfero_chat_default" > /dev/null ; then
     echo 'Extending ejabberd defaults with noosfero-chat defaults ...'
@@ -0,0 +1,19 @@
+Template: noosfero-chat/environment
+Type: string
+Description: Choose the environment in which the chat will be installed
+ Noosfero Chat currently does not support multitenancy environments. If your
+ system is using a multitenancy setup with multiple environments, you will need
+ to fill below the environment in which you want the chat installed
+ uses. For example, if your environment is 'social_production', you should
+ enter below 'social'.
+ .
+ If you are not using a multitenancy setup, you may leave this option blank, in
+ which case the used environment will be 'production'.
+
+Template: noosfero-chat/admin
+Type: string
+Description: Choose the admin of the chat
+ Enter the user identifier to define the user that will have administrator
+ privileges on the chat.
+ .
+ If you leave this option blank the user defined will be 'admin'.
@@ -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,
@@ -118,6 +118,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     language = item.delete("language")
     category = item.delete("category")
     filename = item.delete("filename")
+    mime = item.delete("mime") || 'binary/octet-stream'
     translation_of_id = nil
     if item["translation_of"]
       if item["translation_of"] != "nil"
@@ -131,7 +132,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
       :language => language,
       :translation_of_id => translation_of_id)
     if !filename.blank?
-      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
+      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", mime))
     end
     result = klass.new(item)
     if !parent.blank?
@@ -178,7 +179,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
@@ -366,6 +367,10 @@ Then /^The page should not contain &quot;(.*)&quot;$/ do |selector|
   page.should have_no_css("#{selector}")
 end
  
+Then /^The page should contain only (\d+) "(.*)"$/ do |count, selector|
+  page.should have_css(selector, :count => count)
+end
+
 Given /^the mailbox is empty$/ do
   ActionMailer::Base.deliveries = []
 end
@@ -653,6 +658,15 @@ Given /^the environment is configured to (.*) after signup$/ do |option|
   environment.save
 end
  
+When /^I click "(.*?)"$/ do |selector|
+  find(selector).click
+end
+
+Then /^the element "(.*)" has class "(.*)"$/ do |el_selector, el_class|
+  class_list = find(el_selector)[:class].split(' ')
+  class_list.should include(el_class)
+end
+
 When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
@@ -671,3 +685,7 @@ Given /^the field (.*) is public for all users$/ do |field|
     person.save!
   end
 end
+
+When(/^I press "(.*?)" by selector$/) do |selector|
+   page.execute_script("jQuery('#{selector}').click();")
+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"
@@ -124,3 +124,8 @@ end
 Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
   load file
 end
+
+# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
+Dir.glob(File.join('plugins', '*', 'lib', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -10,7 +10,8 @@ class Noosfero::Plugin::Settings
   end
  
   def settings
-    @base.settings["#{@plugin.public_name}_plugin".to_sym] ||= {}
+    settings_field = @base.class.settings_field
+    @base.send(settings_field)["#{@plugin.public_name}_plugin".to_sym] ||= {}
   end
  
   def method_missing(method, *args, &block)
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.4'
+  VERSION = '1.5'
 end
  
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
 <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
-    tools = [TinyMceArticle, Forum]
+    tools = [TextArticle, Forum]
     tools << CommunityHubPlugin::Hub if environment.plugin_enabled?('CommunityHubPlugin')
     tools << ProposalsDiscussionPlugin::Discussion if environment.plugin_enabled?('ProposalsDiscussionPlugin')
     tools << PairwisePlugin::PairwiseContent if environment.plugin_enabled?('PairwisePlugin')
@@ -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
@@ -237,7 +237,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)) %>
...	...	@@ -59,18 +59,18 @@ selenium-6:
59	59	# NOOSFERO_BUNDLE_OPTS=install makes migrations fails
60	60	# probably because of rubygems-integration
61	61	plugins-1:
62		- script: SLICE=1/5 bundle exec rake test:noosfero_plugins
	62	+ script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
63	63	stage: all-tests
64	64	plugins-2:
65		- script: SLICE=2/5 bundle exec rake test:noosfero_plugins
	65	+ script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
66	66	stage: all-tests
67	67	plugins-3:
68		- script: SLICE=3/5 bundle exec rake test:noosfero_plugins
	68	+ script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
69	69	stage: all-tests
70	70	plugins-4:
71		- script: SLICE=4/5 bundle exec rake test:noosfero_plugins
	71	+ script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
72	72	stage: all-tests
73	73	plugins-5:
74		- script: SLICE=5/5 bundle exec rake test:noosfero_plugins
	74	+ script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
75	75	stage: all-tests
76	76
...	...
...	...	@@ -46,3 +46,63 @@
46	46	[submodule "plugins/serpro_integration"]
47	47	path = plugins/serpro_integration
48	48	url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_integration.git
	49	+[submodule "public/designs/themes/conference"]
	50	+ path = public/designs/themes/conference
	51	+ url = https://gitlab.com/noosfero-themes/conference.git
	52	+[submodule "public/designs/themes/participa-site"]
	53	+ path = public/designs/themes/participa-site
	54	+ url = https://gitlab.com/noosfero-themes/participa-site.git
	55	+[submodule "public/designs/themes/presidencia"]
	56	+ path = public/designs/themes/presidencia
	57	+ url = https://gitlab.com/noosfero-themes/presidencia.git
	58	+[submodule "public/designs/themes/planejamento-serpro"]
	59	+ path = public/designs/themes/planejamento-serpro
	60	+ url = https://gitlab.com/noosfero-themes/planejamento-serpro.git
	61	+[submodule "public/designs/themes/voce-serpro"]
	62	+ path = public/designs/themes/voce-serpro
	63	+ url = https://gitlab.com/noosfero-themes/voce-serpro.git
	64	+[submodule "public/designs/themes/softwarepublico"]
	65	+ path = public/designs/themes/softwarepublico
	66	+ url = https://gitlab.com/noosfero-themes/softwarepublico.git
	67	+[submodule "public/designs/themes/mrosc-theme"]
	68	+ path = public/designs/themes/mrosc-theme
	69	+ url = https://gitlab.com/noosfero-themes/mrosc-theme.git
	70	+[submodule "public/designs/themes/colabora"]
	71	+ path = public/designs/themes/colabora
	72	+ url = https://gitlab.com/noosfero-themes/colabora.git
	73	+[submodule "public/designs/themes/inclusao-digital"]
	74	+ path = public/designs/themes/inclusao-digital
	75	+ url = https://gitlab.com/noosfero-themes/inclusao-digital.git
	76	+[submodule "public/designs/themes/participa-consulta"]
	77	+ path = public/designs/themes/participa-consulta
	78	+ url = https://gitlab.com/noosfero-themes/participa-consulta.git
	79	+[submodule "public/designs/themes/participa-theme"]
	80	+ path = public/designs/themes/participa-theme
	81	+ url = https://gitlab.com/noosfero-themes/participa-theme.git
	82	+[submodule "public/designs/themes/serpro"]
	83	+ path = public/designs/themes/serpro
	84	+ url = https://gitlab.com/noosfero-themes/serpro.git
	85	+[submodule "public/designs/themes/voce-serpro-novo"]
	86	+ path = public/designs/themes/voce-serpro-novo
	87	+ url = https://gitlab.com/noosfero-themes/voce-serpro-novo.git
	88	+[submodule "public/designs/themes/juventude"]
	89	+ path = public/designs/themes/juventude
	90	+ url = https://gitlab.com/noosfero-themes/juventude.git
	91	+[submodule "public/designs/themes/new-participa-theme"]
	92	+ path = public/designs/themes/new-participa-theme
	93	+ url = https://gitlab.com/noosfero-themes/new-participa-theme.git
	94	+[submodule "public/designs/themes/participa-event"]
	95	+ path = public/designs/themes/participa-event
	96	+ url = https://gitlab.com/noosfero-themes/participa-event.git
	97	+[submodule "public/designs/themes/participatorio-theme"]
	98	+ path = public/designs/themes/participatorio-theme
	99	+ url = https://gitlab.com/noosfero-themes/participatorio-theme.git
	100	+[submodule "public/designs/themes/sinesp"]
	101	+ path = public/designs/themes/sinesp
	102	+ url = https://gitlab.com/noosfero-themes/sinesp.git
	103	+[submodule "public/designs/themes/maranhao"]
	104	+ path = public/designs/themes/maranhao
	105	+ url = https://gitlab.com/noosfero-themes/maranhao.git
	106	+[submodule "public/designs/themes/minjustica"]
	107	+ path = public/designs/themes/minjustica
	108	+ url = https://gitlab.com/noosfero-themes/minjustica.git
...	...
...	...	@@ -19,6 +19,10 @@ language: ruby
19	19	rvm:
20	20	- 2.3.1
21	21
	22	+services:
	23	+ - postgresql
	24	+ - elasticsearch
	25	+
22	26	addons:
23	27	apt:
24	28	packages:
...	...
...	...	@@ -27,7 +27,7 @@ gem 'rest-client', '~> 1.6'
27	27	gem 'exception_notification', '~> 4.0.1'
28	28	gem 'gettext', '~> 3.1', :require => false
29	29	gem 'locale', '~> 2.1'
30		-gem 'whenever', '~> 0.9.4', :require => false
	30	+gem 'whenever', '0.9.4', :require => false
31	31	gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
32	32	gem 'diffy', '~> 3.0'
33	33	gem 'slim'
...	...	@@ -35,17 +35,16 @@ gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
35	35
36	36	# API dependencies
37	37	gem 'grape', '~> 0.12'
38		-gem 'grape-entity', '0.4.8'
	38	+gem 'grape-entity', '~>0.4.8'
39	39	gem 'grape_logging'
40	40	gem 'grape-swagger'
41	41	gem 'swagger-ui_rails'
42	42	gem 'kramdown'
43	43	gem 'rack-cors'
44	44	gem 'rack-contrib'
45		-gem 'liquid', '~> 3.0.3'
46	45
47	46	gem 'api-pagination', '>= 4.1.1'
48		-gem 'liquid', '~> 3.0.3'
	47	+gem 'liquid', '>= 3.0.3'
49	48
50	49	# asset pipeline
51	50	gem 'uglifier', '>= 1.0.3'
...	...	@@ -84,7 +83,7 @@ group :cucumber do
84	83	gem 'cucumber'
85	84	gem 'cucumber-rails', '~> 1.4.2', :require => false
86	85	gem 'database_cleaner', '~> 1.3'
87		- gem 'selenium-webdriver', '>= 2.50'
	86	+ gem 'selenium-webdriver', '>= 2.53'
88	87	gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
89	88	end
90	89
...	...
...	...	@@ -444,7 +444,7 @@ DEPENDENCIES
444	444	gdata (> 0.0.0)!
445	445	gettext (~> 3.1)
446	446	grape (~> 0.12)
447		- grape-entity (= 0.4.8)
	447	+ grape-entity (~> 0.4.8)
448	448	grape-swagger
449	449	grape_logging
450	450	honeypot (= 0.0.0)!
...	...	@@ -452,7 +452,7 @@ DEPENDENCIES
452	452	kandadaboggu-vote_fu (> 0.0.0)!
453	453	kramdown
454	454	launchy
455		- liquid (~> 3.0.3)
	455	+ liquid (>= 3.0.3)
456	456	locale (~> 2.1)
457	457	minitest
458	458	minitest-reporters
...	...	@@ -479,7 +479,7 @@ DEPENDENCIES
479	479	ruby-feedparser (~> 0.7)
480	480	ruby_bosh (> 0.0.0)!
481	481	sass-rails
482		- selenium-webdriver (>= 2.50)
	482	+ selenium-webdriver (>= 2.53)
483	483	slim
484	484	spring
485	485	sprockets-rails (~> 2.1)
...	...	@@ -489,7 +489,7 @@ DEPENDENCIES
489	489	unicorn (~> 4.8)
490	490	validates_as_cnpj (= 0.0.0)!
491	491	validates_multiparameter_assignments (= 0.0.0)!
492		- whenever (~> 0.9.4)
	492	+ whenever (= 0.9.4)
493	493	will_paginate (~> 3.0.7)
494	494	xss_terminate (= 0.0.0)!
495	495
...	...
...	...	@@ -31,7 +31,7 @@ If you want to use a different port than 3000, pass `-p <PORT>` to `./script/dev
31	31	Instructions for other systems
32	32	------------------------------
33	33
34		-On other OS, you have 2 options:
	34	+On other OS, you have many options:
35	35
36	36	### 1) using a chroot or a VM with Debian stable (easier)
37	37
...	...	@@ -45,6 +45,14 @@ You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea
45	45
46	46	If you write such script for your own OS, please share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
47	47
	48	+### 3) Installing dependencies via Rubygems and RVM
	49	+
	50	+To setup the development environment through Rubygems you just need to install some basic deps and then install the gems defined on the Gemfile. Further instructions can be found on: http://noosfero.org/bin/view/Development/DepsWithRVMAndGems
	51	+
	52	+### 4) Using a docker image
	53	+
	54	+Use a docker image to run an out-of-the-box development environment. Further information can be found on: https://hub.docker.com/r/noosfero/dev-rails4/
	55	+
48	56	Submitting your changes back
49	57	----------------------------
50	58
...	...
...	...	@@ -38,6 +38,13 @@ module Api
38	38	PERMISSIONS[current_permission] <= PERMISSIONS[permission]
39	39	end
40	40
	41	+ def self.expose_optional_field?(field, options = {})
	42	+ return false if options[:params].nil?
	43	+ optional_fields = options[:params][:optional_fields] \|\| []
	44	+ optional_fields.include?(field.to_s)
	45	+ end
	46	+
	47	+
41	48	class Image < Entity
42	49	root 'images', 'image'
43	50
...	...	@@ -166,7 +173,8 @@ module Api
166	173	community.admins.map{\|admin\| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
167	174	end
168	175	expose :categories, :using => Category
169		- expose :members, :using => Person , :if => lambda{ \|community, options\| community.display_info_to? options[:current_person] }
	176	+ expose :members_count
	177	+ expose :members, :if => lambda {\|community, options\| Entities.expose_optional_field?(:members, options)}
170	178	end
171	179
172	180	class CommentBase < Entity
...	...	@@ -213,7 +221,7 @@ module Api
213	221	expose :comments_count
214	222	expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
215	223	expose :type
216		- expose :comments, using: CommentBase, :if => lambda{\|obj,opt\| opt[:params] && ['1','true',true].include?(opt[:params][:show_comments])}
	224	+ expose :comments, using: CommentBase, :if => lambda{\|comment,options\| Entities.expose_optional_field?(:comments, options)}
217	225	expose :published
218	226	expose :accept_comments?, as: :accept_comments
219	227	end
...	...
...	...	@@ -57,9 +57,11 @@ module Api
57	57	def present_partial(model, options)
58	58	if(params[:fields].present?)
59	59	begin
60		- fields = JSON.parse(params[:fields])
	60	+ fields = JSON.parse((params.to_hash[:fields] \|\| params.to_hash['fields']).to_json)
61	61	if fields.present?
62		- options.merge!(fields.symbolize_keys.slice(:only, :except))
	62	+ fields = fields.symbolize_keys
	63	+ options.merge!(:only => fields[:only]) if fields[:only].present?
	64	+ options.merge!(:except => fields[:except]) if fields[:except].present?
63	65	end
64	66	rescue
65	67	fields = params[:fields]
...	...	@@ -116,7 +118,7 @@ module Api
116	118	def post_article(asset, params)
117	119	return forbidden! unless current_person.can_post_content?(asset)
118	120
119		- klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TinyMceArticle.name
	121	+ klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TextArticle.name
120	122	return forbidden! unless klass_type.constantize <= Article
121	123
122	124	article = klass_type.constantize.new(params[:article])
...	...	@@ -503,11 +505,9 @@ module Api
503	505
504	506	def parse_content_type(content_type)
505	507	return nil if content_type.blank?
506		- content_types = content_type.split(',').map do \|content_type\|
507		- content_type = content_type.camelcase
508		- content_type == 'TextArticle' ? Article.text_article_types : content_type
	508	+ content_type.split(',').map do \|content_type\|
	509	+ content_type.camelcase
509	510	end
510		- content_types.flatten.uniq
511	511	end
512	512
513	513	def period(from_date, until_date)
...	...
...	...	@@ -18,7 +18,7 @@ module Api
18	18	communities = select_filtered_collection_of(environment, 'communities', params)
19	19	communities = profiles_for_person(communities, current_person)
20	20	communities = communities.by_location(params) # Must be the last. May return Exception obj
21		- present communities, :with => Entities::Community, :current_person => current_person
	21	+ present communities, :with => Entities::Community, :current_person => current_person, :params => params
22	22	end
23	23
24	24
...	...	@@ -49,7 +49,7 @@ module Api
49	49
50	50	get ':id' do
51	51	community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
52		- present community, :with => Entities::Community, :current_person => current_person
	52	+ present community, :with => Entities::Community, :current_person => current_person, :params => params
53	53	end
54	54
55	55	end
...	...
...	...	@@ -146,11 +146,14 @@ class CmsController < MyProfileController
146	146	parent = check_parent(params[:parent_id])
147	147	if parent
148	148	@article.parent = parent
	149	+ @article.published = parent.published
	150	+ @article.show_to_followers = parent.show_to_followers
149	151	@parent_id = parent.id
150	152	end
151	153
152	154	@article.profile = profile
153	155	@article.author = user
	156	+ @article.editor = current_person.editor
154	157	@article.last_changed_by = user
155	158	@article.created_by = user
156	159
...	...	@@ -399,8 +402,7 @@ class CmsController < MyProfileController
399	402
400	403	def available_article_types
401	404	articles = [
402		- TinyMceArticle,
403		- TextileArticle,
	405	+ TextArticle,
404	406	Event
405	407	]
406	408	articles += special_article_types if params && params[:cms]
...	...	@@ -408,9 +410,6 @@ class CmsController < MyProfileController
408	410	if @parent && @parent.blog?
409	411	articles -= Article.folder_types.map(&:constantize)
410	412	end
411		- if user.is_admin?(profile.environment)
412		- articles << RawHTMLArticle
413		- end
414	413	articles
415	414	end
416	415
...	...