merging with master

Leandro Santos
2 parents 5fa41591 c5df21ab
Showing 404 changed files with 23824 additions and 10101 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
Gemfile
INSTALL.https.md
INSTALL.md
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/organizations_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/maps_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/chat_helper.rb
@@ -0,0 +1,24 @@
+before_script:
+  - mkdir -p tmp/pids log
+  - bundle check || bundle install
+  - script/noosfero-plugins disableall
+  - bundle exec rake makemo &>/dev/null
+# database
+  - cp config/database.yml.gitlab-ci config/database.yml
+  - createdb gitlab_ci_test || true
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
+
+units:
+  script: bundle exec rake test:units
+functionals:
+  script: bundle exec rake test:functionals
+integration:
+  script: bundle exec rake test:integration
+cucumber:
+  script: bundle exec rake cucumber
+selenium:
+  script: bundle exec rake selenium
+plugins:
+  script: bundle exec rake test:noosfero_plugins
+
@@ -0,0 +1,50 @@
+language: ruby
+rvm:
+# for 2.2 support we need to upgrade the pg gem
+  - 2.1.6
+cache: bundler
+
+sudo: false
+addons:
+  apt:
+    packages:
+      - po4a
+      - iso-codes
+      - tango-icon-theme
+      - pidgin-data
+      # for gem extensions
+      - libmagickwand-dev
+      - libpq-dev
+      - libreadline-dev
+      - libsqlite3-dev
+      - libxslt1-dev
+
+before_install:
+# FIXME: workaround while https://github.com/travis-ci/travis-ci/issues/4210 is open
+  - rm config/initializers/default_icon_theme.rb
+# selenium support
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+before_script:
+  - mkdir -p tmp/pids log
+  - bundle check || bundle install
+  - script/noosfero-plugins disableall
+  - bundle exec rake makemo &>/dev/null
+# database
+  - cp config/database.yml.travis config/database.yml
+  - psql -c 'create database myapp_test;' -U postgres
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
+
+env:
+  - TASK=test:units
+  - TASK=test:functionals
+  - TASK=test:integration
+  - TASK=cucumber
+  - TASK=selenium
+  - TASK=test:noosfero_plugins
+
+script:
+  - bundle exec rake $TASK
+
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.21'
+gem 'rails',                    '~> 3.2.22'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
@@ -18,7 +18,7 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -32,6 +32,7 @@ group :test do
   gem 'rspec',                  '~> 2.14.0'
   gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
+  gem 'test-unit' if RUBY_VERSION >= '2.2.0'
 end
 group :cucumber do
@@ -11,8 +11,8 @@ as below:
     # mkdir /etc/noosfero/ssl
     # cd /etc/noosfero/ssl
-	  # openssl genrsa 1024 > noosfero.key
-    # openssl req -new -x509 -nodes -sha1 -days $[10*365] -key noosfero.key > noosfero.cert
+    # openssl genrsa 2048 > noosfero.key
+    # openssl req -new -x509 -sha256 -nodes -days $[10*365] -key noosfero.key > noosfero.cert
     # cat noosfero.key noosfero.cert > noosfero.pem
 ## Web server configuration
@@ -74,7 +74,7 @@ downloading from git
 Here we are cloning the noosfero repository from git. Note: you will need to install git before.
-    $ git clone git://gitorious.org/noosfero/noosfero.git current
+    $ git clone https://gitlab.com/noosfero/noosfero.git current
     $ cd current
     $ git checkout -b stable origin/stable
@@ -71,22 +71,4 @@ class AdminPanelController &lt; AdminController
       end
     end
   end
-
-  def manage_organizations_status
-    scope = environment.organizations
-    @filter = params[:filter] || 'any'
-    @title = "Organization profiles"
-    @title = @title+" - "+@filter if @filter != 'any'
-
-    if @filter == 'enabled'
-      scope = scope.visible
-    elsif @filter == 'disabled'
-      scope = scope.disabled
-    end
-
-    scope = scope.order('name ASC')
-
-    @q = params[:q]
-    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
-  end
 end
@@ -0,0 +1,66 @@
+class OrganizationsController < AdminController
+
+  protect 'manage_environment_organizations', :environment
+
+  def index
+    @filter = params[:filter] || 'any'
+    @title = _('Organization profiles')
+    @type = params[:type] || "any"
+    @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
+    @types_filter = @types_filter | @plugins.dispatch(:organization_types_filter_options)
+
+    scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
+    if scope.blank?
+      scope = environment.organizations
+      scope = scope.where(:type => @type) if @type != 'any'
+    end
+
+    if @filter == 'enabled'
+      scope = scope.visible
+    elsif @filter == 'disabled'
+      scope = scope.disabled
+    end
+
+    scope = scope.order('name ASC')
+
+    @q = params[:q]
+    @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  end
+
+  def activate
+    organization = environment.organizations.find(params[:id])
+    if organization.enable
+      render :text => (_('%s enabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be enabled') % organization.name).to_json
+    end
+  end
+
+  def deactivate
+    organization = environment.organizations.find(params[:id])
+    if organization.disable
+      render :text => (_('%s disabled') % organization.name).to_json
+    else
+      render :text => (_('%s could not be disable') % organization.name).to_json
+    end
+  end
+
+  def destroy
+    if request.post?
+      organization = environment.organizations.find(params[:id])
+      if organization && organization.destroy
+        render :text => (_('%s removed') % organization.name).to_json
+      else
+        render :text => (_('%s could not be removed') % organization.name).to_json
+      end
+    else
+      render :nothing => true
+    end
+  end
+
+  private
+
+  def per_page
+    10
+  end
+end
@@ -72,8 +72,8 @@ class ApplicationController &lt; ActionController::Base
     FastGettext.available_locales = environment.available_locales
     FastGettext.default_locale = environment.default_locale
     FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
-    I18n.locale = FastGettext.locale
-    I18n.default_locale = FastGettext.default_locale
+    I18n.locale = FastGettext.locale.to_s.gsub '_', '-'
+    I18n.default_locale = FastGettext.default_locale.to_s.gsub '_', '-'
     if params[:lang]
       session[:lang] = params[:lang]
     end
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
@@ -101,6 +101,11 @@ class CmsController &lt; MyProfileController
     record_coming
     if request.post?
       @article.image = nil if params[:remove_image] == 'true'
+      if @article.image.present? && params[:article][:image_builder] &&
+        params[:article][:image_builder][:label]
+        @article.image.label = params[:article][:image_builder][:label]
+        @article.image.save!
+      end
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -112,6 +117,11 @@ class CmsController &lt; MyProfileController
         end
       end
     end
+
+    unless @article.kind_of?(RssFeed)
+      @escaped_body = CGI::escapeHTML(@article.body || '')
+      @escaped_abstract = CGI::escapeHTML(@article.abstract || '')
+    end
   end
   def new
@@ -144,7 +154,13 @@ class CmsController &lt; MyProfileController
     article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
     article_data.merge!(params[:article]) if params[:article]
     article_data.merge!(:profile => profile) if profile
-    @article = klass.new(article_data)
+
+    @article = if params[:clone]
+      current_article = profile.articles.find(params[:id])
+      current_article.copy_without_save
+    else
+      klass.new(article_data)
+    end
     parent = check_parent(params[:parent_id])
     if parent
 class FriendsController < MyProfileController
-  
+
   protect 'manage_friends', :profile
-  
+
   def index
-    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+    @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
     if is_cache_expired?(profile.manage_friends_cache_key(params))
       @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
     end
@@ -18,7 +18,7 @@ class FriendsController &lt; MyProfileController
   end
   def suggest
-    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+    @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
   end
   def remove_suggestion
@@ -26,13 +26,13 @@ class FriendsController &lt; MyProfileController
     redirect_to :action => 'suggest' unless @person
     if @person && request.post?
       profile.remove_suggestion(@person)
-      @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+      @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
       render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => params[:per_page] || per_page }
     end
   end
   def connections
-    @suggestion = profile.profile_suggestions.of_person.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_person.enabled.find_by_suggestion_id(params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
@@ -35,7 +35,7 @@ class ManageProductsController &lt; ApplicationController
   end
   def categories_for_selection
-    @category = Category.find(params[:category_id]) if params[:category_id]
+    @category = environment.categories.find_by_id params[:category_id]
     @object_name = params[:object_name]
     if @category
       @categories = @category.children
@@ -95,6 +95,20 @@ class ManageProductsController &lt; ApplicationController
     end
   end
+  def show_category_tree
+    @category = environment.categories.find params[:category_id]
+    render :partial => 'selected_category_tree'
+  end
+
+  def search_categories
+    @term = params[:term].downcase
+    conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
+    @categories = ProductCategory.all :conditions => conditions, :limit => 10
+    render :json => (@categories.map do |category|
+      {:label => category.name, :value => category.id}
+    end)
+  end
+
   def add_input
     @product = @profile.products.find(params[:id])
     @input = @product.inputs.build
@@ -16,6 +16,7 @@ class MapsController &lt; MyProfileController
         Profile.transaction do
           if profile.update_attributes!(params[:profile_data])
+            BlockSweeper.expire_blocks profile.blocks.select{ |b| b.class == LocationBlock }
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
           end
@@ -40,7 +40,7 @@ class MembershipsController &lt; MyProfileController
   end
   def suggest
-    @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
+    @suggestions = profile.suggested_profiles.of_community.enabled.includes(:suggestion).limit(per_page)
   end
   def remove_suggestion
@@ -49,13 +49,13 @@ class MembershipsController &lt; MyProfileController
     redirect_to :action => 'suggest' unless @community
     if @community && request.post?
       profile.remove_suggestion(@community)
-      @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(custom_per_page)
+      @suggestions = profile.suggested_profiles.of_community.enabled.includes(:suggestion).limit(custom_per_page)
       render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => custom_per_page}
     end
   end
   def connections
-    @suggestion = profile.profile_suggestions.of_community.enabled.find_by_suggestion_id(params[:id])
+    @suggestion = profile.suggested_profiles.of_community.enabled.find_by_suggestion_id(params[:id])
     if @suggestion
       @tags = @suggestion.tag_connections
       @profiles = @suggestion.profile_connections
 class TasksController < MyProfileController
-  protect 'perform_task', :profile
-  
+  protect [:perform_task, :view_tasks], :profile, :only => [:index]
+  protect :perform_task, :profile, :except => [:index]
+
   def index
-    @filter_type = params[:filter_type] = params[:filter_type].blank? ? nil : params[:filter_type]
-    @filter_text = params[:filter_text].blank? ? nil : params[:filter_text]
+    @filter_type = params[:filter_type].presence
+    @filter_text = params[:filter_text].presence
+    @filter_responsible = params[:filter_responsible]
     @task_types = Task.pending_types_for(profile)
-    @tasks = Task.pending_all(profile,params).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+
+    @tasks = Task.pending_all(profile, @filter_type, @filter_text).order_by('created_at', 'asc')
+    @tasks = @tasks.where(:responsible_id => @filter_responsible.to_i != -1 ? @filter_responsible : nil) if @filter_responsible.present?
+    @tasks = @tasks.paginate(:per_page => Task.per_page, :page => params[:page])
+
     @failed = params ? params[:failed] : {}
+
+    @responsible_candidates = profile.members.by_role(profile.roles.reject {|r| !r.has_permission?('perform_task')}) if profile.organization?
+
+    @view_only = !current_person.has_permission?(:perform_task, profile)
   end
   def processed
     @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
+  def change_responsible
+    task = profile.tasks.find(params[:task_id])
+
+    if task.responsible.present? && task.responsible.id != params[:old_responsible_id].to_i
+      return render :json => {:notice => _('Task already assigned!'), :success => false, :current_responsible => task.responsible.id}
+    end
+
+    responsible = profile.members.find(params[:responsible_id]) if params[:responsible_id].present?
+    task.responsible = responsible
+    task.save!
+    render :json => {:notice => _('Task responsible successfully updated!'), :success => true, :new_responsible => {:id => responsible.present? ? responsible.id : nil}}
+  end
+
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
   def close
@@ -26,7 +49,7 @@ class TasksController &lt; MyProfileController
           task = profile.find_in_all_tasks(id)
           begin
             task.update_attributes(value[:task])
-            task.send(decision)
+            task.send(decision, current_person)
           rescue Exception => ex
             message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
             failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
@@ -2,6 +2,7 @@ class ChatController &lt; PublicController
   before_filter :login_required
   before_filter :check_environment_feature
+  before_filter :can_send_message, :only => :register_message
   def start_session
     login = user.jid
@@ -54,6 +55,16 @@ class ChatController &lt; PublicController
     end
   end
+  def avatars
+    profiles = environment.profiles.where(:identifier => params[:profiles])
+    avatar_map = profiles.inject({}) do |result, profile|
+      result[profile.identifier] = profile_icon(profile, :minor)
+      result
+    end
+
+    render_json avatar_map
+  end
+
   def update_presence_status
     if request.xhr?
       current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
@@ -62,11 +73,17 @@ class ChatController &lt; PublicController
   end
   def save_message
-    to = environment.profiles.find_by_identifier(params[:to])
-    body = params[:body]
-
-    ChatMessage.create!(:to => to, :from => user, :body => body)
-    render :text => 'ok'
+    if request.post?
+      to = environment.profiles.where(:identifier => params[:to]).first
+      body = params[:body]
+
+      begin
+        ChatMessage.create!(:to => to, :from => user, :body => body)
+        return render_json({:status => 0})
+      rescue Exception => exception
+        return render_json({:status => 3, :message => exception.to_s, :backtrace => exception.backtrace})
+      end
+    end
   end
   def recent_messages
@@ -90,8 +107,9 @@ class ChatController &lt; PublicController
   end
   def recent_conversations
-    conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {|e| e['identifier']}
-    render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json
+    profiles = Profile.find_by_sql("select profiles.* from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc")
+    jids = profiles.map(&:jid).reverse
+    render :json => jids.to_json
   end
   #TODO Ideally this is done through roster table on ejabberd.
@@ -108,4 +126,14 @@ class ChatController &lt; PublicController
     end
   end
+  def can_send_message
+    return render_json({:status => 1, :message => 'Missing parameters!'}) if params[:from].nil? || params[:to].nil? || params[:message].nil?
+    return render_json({:status => 2, :message => 'You can not send message as another user!'}) if params[:from] != user.jid
+    # TODO Maybe register the jid in a table someday to avoid this below
+    return render_json({:status => 3, :messsage => 'You can not send messages to strangers!'}) if user.friends.where(:identifier => params[:to].split('@').first).blank?
+  end
+
+  def render_json(result)
+    render :text => result.to_json
+  end
 end
@@ -11,6 +11,7 @@ class ContentViewerController &lt; ApplicationController
     path = get_path(params[:page], params[:format])
     @version = params[:version].to_i
+    @npage = params[:npage] || '1'
     if path.blank?
       @page = profile.home_page
@@ -127,7 +128,7 @@ class ContentViewerController &lt; ApplicationController
     end
     unless @page.display_to?(user)
-      if !profile.visible? || profile.secret? || (user && user.follows?(profile))
+      if !profile.visible? || profile.secret? || (user && user.follows?(profile)) || user.blank?
         render_access_denied
       else #!profile.public?
         private_profile_partial_parameters
@@ -871,7 +871,7 @@ module ApplicationHelper
       field_html += capture(&block)
     end
-    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
+    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index') || (controller.controller_name == 'home' && controller.action_name == 'index' && user.nil?)
       if profile.signup_fields.include?(name)
         result = field_html
       end
@@ -931,6 +931,19 @@ module ApplicationHelper
     article_helper.cms_label_for_edit
   end
+  def label_for_clone_article(article)
+    translated_types = {
+      Folder => _('Folder'),
+      Blog => _('Blog'),
+      Event => _('Event'),
+      Forum => _('Forum')
+    }
+
+    translated_type = translated_types[article.class] || _('Article')
+
+    _('Clone %s') % translated_type
+  end
+
   def add_rss_feed_to_head(title, url)
     content_for :feeds do
       tag(:link, :rel => 'alternate', :type => 'application/rss+xml', :title => title, :href => url_for(url))
@@ -1172,7 +1185,7 @@ module ApplicationHelper
       pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     admin_link +
     manage_enterprises +
@@ -1202,35 +1215,6 @@ module ApplicationHelper
     list.sort.inject(Hash.new(0)){|h,i| h[i] += 1; h }.collect{ |x, n| [n, connector, x].join(" ") }.sort
   end
-  #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
-  def time_ago_as_sentence(from_time, include_seconds = false)
-    to_time = Time.now
-    from_time = Time.parse(from_time.to_s)
-    from_time = from_time.to_time if from_time.respond_to?(:to_time)
-    to_time = to_time.to_time if to_time.respond_to?(:to_time)
-    distance_in_minutes = (((to_time - from_time).abs)/60).round
-    distance_in_seconds = ((to_time - from_time).abs).round
-    case distance_in_minutes
-      when 0..1
-        return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
-        case distance_in_seconds
-          when 0..4   then _('less than 5 seconds')
-          when 5..9   then _('less than 10 seconds')
-          when 10..19 then _('less than 20 seconds')
-          when 20..39 then _('half a minute')
-          when 40..59 then _('less than a minute')
-          else             _('1 minute')
-        end
-
-      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour ago')
-      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day ago')
-      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
-      else                      show_time(from_time)
-    end
-  end
-
   def comment_balloon(options = {}, &block)
     wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
     (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
@@ -1249,7 +1233,7 @@ module ApplicationHelper
   def task_information(task)
     values = {}
-    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     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
     values.merge!(task.information[:variables]) if task.information[:variables]
@@ -22,7 +22,9 @@ module BlogHelper
       :param_name => 'npage',
       :previous_label => _('&laquo; Newer posts'),
       :next_label => _('Older posts &raquo;'),
-      :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+      :params => {:action=>"view_page",
+                  :page=>articles.first.parent.path.split('/'),
+                  :controller=>"content_viewer"}
     }) if articles.present? && conf[:paginate]
     content = []
     artic_len = articles.length
@@ -44,7 +46,7 @@ module BlogHelper
   end
   def display_post(article, format = 'full')
-    no_comments = (format == 'full') ? false : true
+    no_comments = (format == 'full' || format == 'compact' ) ? false : true
     title = article_title(article, :no_comments => no_comments)
     method = "display_#{format.split('+')[0]}_format"
     html = send(method, FilePresenter.for(article)).html_safe
@@ -55,8 +57,12 @@ module BlogHelper
       else
         '<div class="post-pic" style="background-image:url('+img+')"></div>'
       end
-    end.to_s +
-    title + html
+    end.to_s + title + html
+  end
+
+  def display_compact_format(article)
+    render :file => 'content_viewer/_display_compact_format',
+           :locals => { :article => article, :format => "compact" }
   end
   def display_full_format(article)
@@ -122,7 +122,7 @@ module BoxesHelper
   end
   def wrap_main_content(content)
-    (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
+    content_tag('div', content, :class => 'main-content')
   end
   def extract_block_content(content)
@@ -9,12 +9,12 @@ module ChatHelper
     avatar = profile_image(user, :portrait, :class => 'avatar')
     content_tag('span',
       link_to(avatar + content_tag('span', user.name) + ui_icon('ui-icon-triangle-1-s'),
-        '#',
+        '',
         :onclick => 'toggleMenu(this); return false',
         :class => icon_class + ' simplemenu-trigger'
       ) +
       content_tag('ul',
-        links.map{|link| content_tag('li', link_to(link[1], '#', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
+        links.map{|link| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
         :style => 'display: none; z-index: 100',
         :class => 'simplemenu-submenu'
       ),
 module CommentHelper
+  include DatesHelper
   def article_title(article, args = {})
     title = article.title
@@ -15,7 +16,7 @@ module CommentHelper
         content_tag('span', show_date(article.published_at), :class => 'date') +
         content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
@@ -2,6 +2,7 @@ module ContentViewerHelper
   include BlogHelper
   include ForumHelper
+  include DatesHelper
   def display_number_of_comments(n)
     base_str = "<span class='comment-count hide'>#{n}</span>"
@@ -24,16 +25,35 @@ module ContentViewerHelper
       unless args[:no_comments] || !article.accept_comments
         comments = (" - %s") % link_to_comments(article)
       end
+      date_format = show_with_right_format_date article
       title << content_tag('span',
-        content_tag('span', show_date(article.published_at), :class => 'date') +
+        date_format +
         content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
   end
+  def show_with_right_format_date article
+    date_format = article.environment.date_format
+    use_numbers = false
+    year = true
+    left_time = false
+    if date_format ==  'numbers_with_year'
+      use_numbers = true
+    elsif date_format == 'numbers'
+      use_numbers = true
+      year = false
+    elsif date_format == 'month_name'
+      year = false
+    elsif date_format == 'past_time'
+      left_time = true
+    end
+    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+  end
+
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
     reference_to_article number_of_comments(article), article, 'comments_list'
@@ -2,6 +2,7 @@ require &#39;noosfero/i18n&#39;
 module DatesHelper
+  include ActionView::Helpers::DateHelper
   def months
     I18n.t('date.month_names')
   end
@@ -15,10 +16,12 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false, year=true)
+  def show_date(date, use_numbers = false, year = true, left_time = false)
     if date && use_numbers
       date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
       date_format % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date && left_time
+      date_format = time_ago_in_words(date)
     elsif date
       date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
       date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
 module EventsHelper
+  include DatesHelper
   def list_events(date, events)
     title = _('Events for %s') % show_date_month(date)
     content_tag('h2', title) +
-require 'short_filename'
-
 module FolderHelper
-  include ShortFilename
   include ArticleHelper
   def list_contents(configure={})
@@ -10,8 +7,8 @@ module FolderHelper
     configure[:list_type] ||= :folder
     if !configure[:contents].blank?
       configure[:contents] = configure[:contents].paginate(
-        :order => "updated_at DESC",
-        :per_page => 10,
+        :order => "name ASC",
+        :per_page => 30,
         :page => params[:npage]
       )
@@ -25,49 +22,32 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_content_in_listing(configure={})
-    recursive = configure[:recursive] || false
-    list_type = configure[:list_type] || :folder
-    level = configure[:level] || 0
-    content = FilePresenter.for configure[:content]
+  def display_content_icon(content_item)
+    content = FilePresenter.for content_item
     content_link = if content.image?
-         link_to('&nbsp;' * (level * 4) +
-           image_tag(icon_for_article(content)) + short_filename(content.name),
+         link_to(
+           image_tag(icon_for_article(content, :bigicon)),
            content.url.merge(:view => true)
          )
        else
-         link_to('&nbsp;' * (level * 4) +
-           short_filename(content.name),
-           content.url.merge(:view => true), :class => icon_for_article(content)
+         link_to('',
+          content.url.merge(:view => true),
+          :class => icon_for_article(content, :bigicon)
          )
        end
-    result = content_tag(
-      'tr',
-      content_tag('td', content_link ) +
-      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
-      :class => "#{list_type}-item"
-    )
-    if recursive
-      result + content.children.map {|item|
-        display_content_in_listing :content=>item, :recursive=>recursive,
-                                   :list_type=>list_type, :level=>level+1
-      }.join("\n")
-    else
-      result
-    end
   end
-  def icon_for_article(article)
+  def icon_for_article(article, size = 'icon')
     article = FilePresenter.for article
-    icon = article.respond_to?(:icon_name) ?
-             article.icon_name :
-             article.class.icon_name(article)
-    if (icon =~ /\//)
-      icon
+    if article.respond_to?(:sized_icon)
+      article.sized_icon(size)
     else
-      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      icon = article.respond_to?(:icon_name) ?
+              article.icon_name :
+              article.class.icon_name(article)
+      klasses = "#{size} " + [icon].flatten.map{|name| "#{size}-"+name}.join(' ')
       if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
-        klasses += ' icon-upload-file'
+        klasses += " #{size}-upload-file"
       end
       klasses
     end
 module ForumHelper
+  include ActionView::Helpers::DateHelper
   def cms_label_for_new_children
     _('New discussion topic')
@@ -42,9 +43,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
@@ -75,9 +75,12 @@ module ManageProductsHelper
   end
   def categories_container(categories_selection_html, hierarchy_html = '')
-    hidden_field_tag('selected_category_id') +
-    content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
-    content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
+    content_tag 'div',
+      render('categories_autocomplete') +
+      hidden_field_tag('selected_category_id') +
+      content_tag('div', hierarchy_html, :id => 'hierarchy_navigation') +
+      content_tag('div', categories_selection_html, :id => 'categories_container_wrapper'),
+    :id => 'categories-container'
   end
   def select_for_categories(categories, level = 0)
@@ -141,8 +141,9 @@ module ProfileEditorHelper
     )
   end
-  def control_panel_button(title, icon, url)
-    link_to title, url, :class => 'control-panel-%s' % icon
+  def control_panel_button(title, icon, url, html_options = {})
+    html_options ||= {}
+    link_to title, url, html_options.merge(:class => 'control-panel-%s' % icon)
   end
   def unchangeable_privacy_field(profile)
@@ -106,6 +106,10 @@ module SearchHelper
     end
   end
+  def city_with_state_for_profile(p)
+    city_with_state(p.region) || [p.city, p.state].compact.reject(&:blank?).join(', ')
+  end
+
   def display_selector(asset, display, float = 'right')
     display = nil if display.blank?
     display ||= asset_class(asset).default_search_display
@@ -14,7 +14,7 @@ module UsersHelper
     select_field = select_tag(:filter, options, :onchange => onchange)
     content_tag('div',
       content_tag('strong', _('Filter')) + ': ' + select_field,
-      :class => "environment-users-customize-search"
+      :class => "environment-profiles-customize-search"
     )
   end
@@ -54,7 +54,7 @@ class AddFriend &lt; Task
   end
   def remove_from_suggestion_list(task)
-    suggestion = task.requestor.profile_suggestions.find_by_suggestion_id task.target.id
+    suggestion = task.requestor.suggested_profiles.find_by_suggestion_id task.target.id
     suggestion.disable if suggestion
   end
 end
@@ -28,7 +28,7 @@ class Article &lt; ActiveRecord::Base
   def initialize(*params)
     super
-    if !params.blank? && params.first.has_key?(:profile)
+    if !params.blank? && params.first.has_key?(:profile) && !params.first[:profile].blank?
       profile = params.first[:profile]
       self.published = false unless profile.public?
     end
@@ -96,6 +96,8 @@ class Article &lt; ActiveRecord::Base
   belongs_to :translation_of, :class_name => 'Article', :foreign_key => :translation_of_id
   before_destroy :rotate_translations
+  acts_as_voteable
+
   before_create do |article|
     article.published_at ||= Time.now
     if article.reference_article && !article.parent
@@ -129,7 +131,7 @@ class Article &lt; ActiveRecord::Base
   scope :by_range, lambda { |range| {
     :conditions => [
-      'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
+      'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
     ]
   }}
@@ -577,25 +579,24 @@ class Article &lt; ActiveRecord::Base
     profile.visible? && profile.public? && published?
   end
-
-  def copy(options = {})
+  def copy_without_save(options = {})
     attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
     attrs.merge!(options)
     object = self.class.new
     attrs.each do |key, value|
       object.send(key.to_s+'=', value)
     end
+    object
+  end
+
+  def copy(options = {})
+    object = copy_without_save(options)
     object.save
     object
   end
   def copy!(options = {})
-    attrs = attributes.reject! { |key, value| ATTRIBUTES_NOT_COPIED.include?(key.to_sym) }
-    attrs.merge!(options)
-    object = self.class.new
-    attrs.each do |key, value|
-      object.send(key.to_s+'=', value)
-    end
+    object = copy_without_save(options)
     object.save!
     object
   end
@@ -723,8 +724,9 @@ class Article &lt; ActiveRecord::Base
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
-  def lead
-    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+  def lead(length = nil)
+    content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+    length.present? ? content.truncate(length) : content
   end
   def short_lead
@@ -2,7 +2,7 @@ class Block &lt; ActiveRecord::Base
   attr_accessible :title, :display, :limit, :box_id, :posts_per_page,
                   :visualization_format, :language, :display_user,
-                  :box, :edit_modes, :move_modes
+                  :box, :edit_modes, :move_modes, :mirror
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
@@ -15,11 +15,23 @@ class Block &lt; ActiveRecord::Base
   acts_as_list :scope => :box
   belongs_to :box
+  belongs_to :mirror_block, :class_name => "Block"
+  has_many :observers, :class_name => "Block", :foreign_key => "mirror_block_id"
   acts_as_having_settings
   scope :enabled, :conditions => { :enabled => true }
+  after_save do |block|
+    if block.owner.kind_of?(Profile) && block.owner.is_template? && block.mirror?
+      block.observers.each do |observer|
+        observer.copy_from(block)
+        observer.title = block.title
+        observer.save
+      end
+    end
+  end
+
   def embedable?
     false
   end
@@ -269,6 +281,10 @@ class Block &lt; ActiveRecord::Base
     self.position = block.position
   end
+  def add_observer(block)
+    self.observers << block
+  end
+
   private
   def home_page_path
@@ -76,9 +76,12 @@ class Blog &lt; Folder
   end
   settings_items :visualization_format, :type => :string, :default => 'full'
-  validates_inclusion_of :visualization_format, :in => [ 'full', 'short', 'short+pic' ], :if => :visualization_format
+  validates_inclusion_of :visualization_format,
+                         :in => [ 'full', 'short', 'short+pic', 'compact'],
+                         :if => :visualization_format
-  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
+  settings_items :display_posts_in_current_language,
+                 :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -4,4 +4,5 @@ class ChatMessage &lt; ActiveRecord::Base
   belongs_to :to, :class_name => 'Profile'
   belongs_to :from, :class_name => 'Profile'
+  validates_presence_of :from, :to
 end
@@ -37,6 +37,8 @@ class Comment &lt; ActiveRecord::Base
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
+  acts_as_voteable
+
   def comment_root
     (reply_of && reply_of.comment_root) || self
   end
@@ -3,7 +3,17 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount
+  attr_accessible :name, :is_default, :signup_welcome_text_subject,
+                  :signup_welcome_text_body, :terms_of_use,
+                  :message_for_disabled_enterprise, :news_amount_by_folder,
+                  :default_language, :languages, :description,
+                  :organization_approval_method, :enabled_plugins,
+                  :enabled_features, :redirection_after_login,
+                  :redirection_after_signup, :contact_email, :theme,
+                  :reports_lower_bound, :noreply_email,
+                  :signup_welcome_screen_body, :members_whitelist_enabled,
+                  :members_whitelist, :highlighted_news_amount,
+                  :portal_news_amount, :date_format
   has_many :users
@@ -14,6 +24,12 @@ class Environment &lt; ActiveRecord::Base
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
+  validates_inclusion_of :date_format,
+                         :in => [ 'numbers_with_year', 'numbers',
+                                  'month_name_with_year', 'month_name',
+                                  'past_time'],
+                         :if => :date_format
+
   def self.verify_filename(filename)
     filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
@@ -29,6 +45,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
     'manage_environment_users' => N_('Manage environment users'),
+    'manage_environment_organizations' => N_('Manage environment organizations'),
     'manage_environment_templates' => N_('Manage environment templates'),
     'manage_environment_licenses' => N_('Manage environment licenses'),
     'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
@@ -74,7 +91,8 @@ class Environment &lt; ActiveRecord::Base
         'edit_profile_design',
         'manage_products',
         'manage_friends',
-        'perform_task'
+        'perform_task',
+        'view_tasks'
       ]
     )
   end
@@ -98,47 +98,19 @@ class Event &lt; Article
     start_date..(end_date||start_date)
   end
-  # FIXME this shouldn't be needed
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include DatesHelper
+  def first_paragraph
+    paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
   def to_html(options = {})
+    event = self
+    format = options[:format]
-    result = ''
-    html = ::Builder::XmlMarkup.new(:target => result)
-
-    html.div(:class => 'event-info' ) {
-      html.ul(:class => 'event-data' ) {
-        html.li(:class => 'event-dates' ) {
-          html.span _('When:')
-          html.text! show_period(start_date, end_date)
-        } if start_date.present? || end_date.present?
-        html.li {
-          html.span _('URL:')
-          html.a(self.link || "", 'href' => self.link || "")
-        } if self.link.present?
-        html.li {
-          html.span _('Address:')
-          html.text! self.address || ""
-        } if self.address.present?
-      }
-
-      # TODO: some good soul, please clean this ugly hack:
-      if self.body
-        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
-      end
-    }
-
-    if self.body
-      if options[:format] == 'short'
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
-      else
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
-      end
+    proc do
+      render :file => 'content_viewer/event_page', :locals => { :event => event,
+        :format => format }
     end
-
-    result
   end
   def duration
@@ -23,7 +23,7 @@ class Image &lt; ActiveRecord::Base
   postgresql_attachment_fu
-  attr_accessible :uploaded_data
+  attr_accessible :uploaded_data, :label
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
@@ -147,6 +147,12 @@ class Organization &lt; Profile
     ]
   end
+  def short_name chars = 40
+    s = self.display_name
+    s = super(chars) if s.blank?
+    s
+  end
+
   def notification_emails
     emails = [contact_email].select(&:present?) + admins.map(&:email)
     if emails.empty?
@@ -84,9 +84,9 @@ roles] }
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
-  has_many :profile_suggestions, :foreign_key => :person_id, :order => 'score DESC', :dependent => :destroy
-  has_many :suggested_people, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
-  has_many :suggested_communities, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
+  has_many :suggested_profiles, :class_name => 'ProfileSuggestion', :foreign_key => :person_id, :order => 'score DESC', :dependent => :destroy
+  has_many :suggested_people, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
+  has_many :suggested_communities, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
   scope :more_popular, :order => 'friends_count DESC'
@@ -103,6 +103,8 @@ roles] }
   belongs_to :user, :dependent => :delete
+  acts_as_voter
+
   def can_change_homepage?
     !environment.enabled?('cant_change_homepage') || is_admin?
   end
@@ -522,7 +524,7 @@ roles] }
   end
   def remove_suggestion(profile)
-    suggestion = profile_suggestions.find_by_suggestion_id profile.id
+    suggestion = suggested_profiles.find_by_suggestion_id profile.id
     suggestion.disable if suggestion
   end
@@ -10,6 +10,9 @@ class ProductCategory &lt; Category
     :joins => :products,
     :conditions => ['products.profile_id = ?', enterprise.id]
   }}
+  scope :by_environment, lambda { |environment| {
+    :conditions => ['environment_id = ?', environment.id]
+  }}
   scope :unique_by_level, lambda { |level| {
     :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
   }}
@@ -71,6 +71,7 @@ class Profile &lt; ActiveRecord::Base
     'manage_friends'       => N_('Manage friends'),
     'validate_enterprise'  => N_('Validate enterprise'),
     'perform_task'         => N_('Perform task'),
+    'view_tasks'           => N_('View tasks'),
     'moderate_comments'    => N_('Moderate comments'),
     'edit_appearance'      => N_('Edit appearance'),
     'view_private_content' => N_('View private content'),
@@ -392,6 +393,9 @@ class Profile &lt; ActiveRecord::Base
         new_block = block.class.new(:title => block[:title])
         new_block.copy_from(block)
         new_box.blocks << new_block
+        if block.mirror?
+          block.add_observer(new_block)
+        end
       end
     end
   end
@@ -1021,7 +1025,7 @@ private :generate_url, :url_options
   end
   def remove_from_suggestion_list(person)
-    suggestion = person.profile_suggestions.find_by_suggestion_id self.id
+    suggestion = person.suggested_profiles.find_by_suggestion_id self.id
     suggestion.disable if suggestion
   end
@@ -113,14 +113,14 @@ class ProfileSuggestion &lt; ActiveRecord::Base
     suggested_profiles = all_suggestions(person)
     return if suggested_profiles.nil?
-    already_suggested_profiles = person.profile_suggestions.map(&:suggestion_id).join(',')
+    already_suggested_profiles = person.suggested_profiles.map(&:suggestion_id).join(',')
     suggested_profiles = suggested_profiles.where("profiles.id NOT IN (#{already_suggested_profiles})") if already_suggested_profiles.present?
     #TODO suggested_profiles = suggested_profiles.order('score DESC')
     suggested_profiles = suggested_profiles.limit(N_SUGGESTIONS)
     return if suggested_profiles.blank?
     suggested_profiles.each do |suggested_profile|
-      suggestion = person.profile_suggestions.find_or_initialize_by_suggestion_id(suggested_profile.id)
+      suggestion = person.suggested_profiles.find_or_initialize_by_suggestion_id(suggested_profile.id)
       RULES.each do |rule, options|
         begin
           value = suggested_profile.send("#{rule}_count").to_i
@@ -273,7 +273,7 @@ class ProfileSuggestion &lt; ActiveRecord::Base
   end
   def self.generate_profile_suggestions(person, force = false)
-    return if person.profile_suggestions.enabled.count >= MIN_LIMIT && !force
+    return if person.suggested_profiles.enabled.count >= MIN_LIMIT && !force
     Delayed::Job.enqueue ProfileSuggestionsJob.new(person.id) unless ProfileSuggestionsJob.exists?(person.id)
   end
@@ -33,6 +33,8 @@ class Task &lt; ActiveRecord::Base
   belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
+  belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
+  belongs_to :closed_by, :class_name => 'Person', :foreign_key => :closed_by_id
   validates_uniqueness_of :code, :on => :create
   validates_presence_of :code
@@ -76,11 +78,9 @@ class Task &lt; ActiveRecord::Base
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
-  def finish
+  def finish(closed_by=nil)
     transaction do
-      self.status = Task::Status::FINISHED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::FINISHED, closed_by)
       self.perform
       begin
         send_notification(:finished)
@@ -105,11 +105,9 @@ class Task &lt; ActiveRecord::Base
   # this method cancels the task. At the end a message (as returned by
   # #cancel_message) is sent to the requestor with #notify_requestor.
-  def cancel
+  def cancel(closed_by=nil)
     transaction do
-      self.status = Task::Status::CANCELLED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::CANCELLED, closed_by)
       begin
         send_notification(:cancelled)
       rescue NotImplementedError => ex
@@ -118,6 +116,13 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  def close(status, closed_by)
+    self.status = status
+    self.end_date = Time.now
+    self.closed_by = closed_by
+    self.save!
+  end
+
   # Here are the tasks customizable options.
   def title
@@ -239,9 +244,9 @@ class Task &lt; ActiveRecord::Base
   scope :opened, :conditions => { :status =>  [Task::Status::ACTIVE, Task::Status::HIDDEN] }
   scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
-  scope :like, ->(field,value) { where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value}
-  scope :pending_all, ->(profile, params){
-    self.to(profile).without_spam.pending.of(params[:filter_type]).like('data', params[:filter_text])
+  scope :like, lambda { |field, value| where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value}
+  scope :pending_all, lambda { |profile, filter_type, filter_text|
+    self.to(profile).without_spam.pending.of(filter_type).like('data', filter_text)
   }
   scope :to, lambda { |profile|
-require 'short_filename'
-
 # Article type that handles uploaded files.
 #
 # Limitation: only file metadata are versioned. Only the latest version
@@ -14,8 +12,6 @@ class UploadedFile &lt; Article
   track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
-  include ShortFilename
-
   def title
     if self.name.present? then self.name else self.filename end
   end
@@ -65,7 +61,7 @@ class UploadedFile &lt; Article
   #  :min_size => 2.megabytes
   #  :max_size => 5.megabytes
   has_attachment :storage => :file_system,
-    :thumbnails => { :icon => [24,24], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
+    :thumbnails => { :icon => [24,24], :bigicon => [50,50], :thumb => '130x130>', :slideshow => '320x240>', :display => '640X480>' },
     :thumbnail_class => Thumbnail,
     :max_size => self.max_size
@@ -67,7 +67,8 @@ class User &lt; ActiveRecord::Base
   attr_writer :person_data
   def person_data
-    @person_data || {}
+    @person_data = {} if @person_data.nil?
+    @person_data
   end
   def email_domain
@@ -320,6 +321,8 @@ class User &lt; ActiveRecord::Base
     {
       'login' => self.login,
+      'name' => self.person.name,
+      'email' => self.email,
       'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
@@ -4,6 +4,10 @@ class FilePresenter::Image &lt; FilePresenter
     f.image? ? 10 : nil
   end
+  def sized_icon(size)
+    public_filename size
+  end
+
   def icon_name
     public_filename :icon
   end
@@ -3,6 +3,21 @@
 <%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+
+<%= labelled_form_field(
+  _("Article's date format"),
+  select(:environment, :date_format,
+    options_for_select([
+      [ _('mm/dd/yyyy'), 'numbers_with_year'],
+      [ _('mm/dd'), 'numbers'],
+      [ _('Month dd, yyyy'), 'month_name_with_year'],
+      [ _('Month dd'), 'month_name'],
+      [ _('X minutes/hours/days/months/years ago'), 'past_time']
+      ], environment.date_format
+    )
+  )
+) %>
+
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
 <%= label_tag :languages, _('Available languages') %>
@@ -18,9 +18,9 @@
 <table>
   <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
+  <tr><td><%= link_to _('Organizations'), :controller => 'organizations' %></td></tr>
   <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-  <tr><td><%= link_to _('Manage organizations status'), :action => 'manage_organizations_status' %></td></tr>
 </table>
@@ -1,69 +0,0 @@
-<h1><%= _('Manage organizations') %></h1>
-
-<%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
-
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
-    </span>
-
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-
-  <div class="environment-users-results-header">
-    <div id='environment-users-filter-title'><%= @title %></div>
-
-    <div id="environment-users-filter-filter">
-      <strong><%= _("Filter by: ") %></strong>
-
-      <select id="profile_filter_select">
-        <%= options_for_select([['Any', 'any'],["Disabled profiles", "disabled"], ["Enabled profiles", "enabled"]], @filter) %>
-      </select>
-    </div>
-    <div style="clear: both"></div>
-  </div>
-
-  <table>
-    <colgroup>
-      <col width="80%">
-      <col width="20%">
-    </colgroup>
-
-    <tr>
-      <th><%= _('Member') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-
-    <% @collection.each do |p| %>
-      <tr title="<%= p.name %>">
-        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
-
-        <td class='actions'>
-          <div class="members-buttons-cell">
-            <% if p.visible %>
-              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller => "profile_editor", :action => 'deactivate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
-            <% else %>
-              <%= button_without_text :'activate-user', _('Activate'), {:controller => "profile_editor", :action => 'activate_profile', :profile => p.identifier, :id => p.id}, :confirm => _("Do you want to activate this profile ?") %>
-            <% end %>
-              <%= button_without_text :'delete', _('Remove'), {:controller => "profile_editor", :action => 'destroy_profile', :profile => p.identifier, :id => p.id, :return_to => "/admin/admin_panel/manage_organizations_status"}, :method => :post, :confirm => _("Do you want to deactivate this profile ?") %>
-         </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-
-<% end %>
-
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
-
-<% button_bar do %>
-  <%= button :back, _('Back'), :controller => 'admin_panel' %>
-<% end %>
-
-<script type="text/javascript">
-  jQuery(document).ready(function(){
-    jQuery("#profile_filter_select").change(function(){
-      document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
-    });
-  });
-</script>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<li><%= report_abuse(profile, :button) %></li>
+<%= render_environment_features(:profile_actions) %>
@@ -13,8 +13,6 @@
       </li>
     <% end %>
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
   <% end %>
 </ul>
@@ -8,5 +8,5 @@
       <li><%= button(:'menu-mail', _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button'} ) %></li>
   <% end %>
-  <li><%= report_abuse(profile, :button) %></li>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
 </ul>
@@ -11,6 +11,6 @@
       <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
     <% end %>
-    <li><%= report_abuse(profile, :button) %></li>
+    <%= render :partial => 'blocks/profile_info_actions/common' %>
   <% end %>
 </ul>
@@ -28,6 +28,12 @@
       </div>
     <% end %>
+    <% if @block.owner.kind_of?(Profile) && @block.owner.is_template? %>
+      <div class="mirror_block">
+        <%= labelled_check_box(_("Mirror"), "block[mirror]", value = "1", checked = @block.mirror) %>
+      </div>
+    <% end %>
+
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= modal_close_button(_('Cancel')) %>
 <p>
 <%= ui_icon('ui-icon-alert') %>
-<%= _('Could not connect to chat') %>, <a id='chat-retry' href='#' data-jid='<%= user.jid %>'><%= _('try again') %></a>.
+<%= _('Could not connect to chat') %>, <a id='chat-retry' href='' data-jid='<%= user.jid %>'><%= _('try again') %></a>.
 </p>
@@ -67,7 +67,8 @@
 <%= labelled_form_field(_('How to display posts:'), f.select(:visualization_format, [
   [ _('Full post'), 'full'],
   [ _('First paragraph'), 'short'],
-  [ _('First paragraph, with post picture'), 'short+pic']
+  [ _('First paragraph, with post picture'), 'short+pic'],
+  [ _("Title, Image, Lead"), 'compact']
 ])) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Blog.posts_per_page_options)) %>
@@ -0,0 +1,29 @@
+<% @articles.each do |article| article = FilePresenter.for article %>
+  <tr title="<%= article.title%>" >
+    <td class="article-name">
+      <%= link_to_article(article) %>
+    </td>
+    <% short_description =  article.respond_to?(:short_description) ?
+          article.short_description :
+          article.class.short_description %>
+    <td class="article-mime" title=<%= short_description.to_json %>>
+      <%= short_description %>
+    </td>
+  <td class="last-update">
+    <%= time_ago_in_words article.updated_at %>
+  </td>
+    <td class="article-controls">
+      <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
+      <%= button_without_text :eyes, _('Public view'), article.view_url %>
+      <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
+      <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
+        <% if profile.home_page != article %>
+          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+        <% else %>
+          <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+        <% end %>
+      <% end %>
+      <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
+    </td>
+  </tr>
+<% end %>
@@ -37,6 +37,7 @@
   <tr>
     <th><%= _('Name') %></th>
     <th><%= _('Type') %></th>
+    <th><%= _('Last update') %></th>
     <th><%= _('Actions') %></th>
   </tr>
@@ -54,32 +55,7 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| article = FilePresenter.for article %>
-    <tr title="<%= article.title%>" >
-      <td class="article-name">
-        <%= link_to_article(article) %>
-      </td>
-      <% short_description =  article.respond_to?(:short_description) ?
-            article.short_description :
-            article.class.short_description %>
-      <td class="article-mime" title=<%= short_description.to_json %>>
-        <%= short_description %>
-      </td>
-      <td class="article-controls">
-        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit, article) %>
-        <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(article) unless remove_content_button(:spread, article) %>
-        <% if user.can_change_homepage? && !remove_content_button(:home, article) %>
-          <% if profile.home_page != article %>
-            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
-          <% else %>
-            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
-          <% end %>
-        <% end %>
-        <%= display_delete_button(article) if !remove_content_button(:delete, article) %>
-      </td>
-    </tr>
-  <% end %>
+  <%= render 'view_items' %>
 </table>
@@ -0,0 +1,20 @@
+<% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
+  <h1 class="title">
+    <% if no_link %>
+      <%= h(@page.title) %>
+    <% else %>
+      <%= link_to(@page.name, @page.url) %>
+    <% end %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+  <% unless @page.abstract.blank? %>
+    <div class="preview">
+      <%= @page.lead %>
+    </div>
+  <% end %>
+<% else %>
+  <h1 class="title">
+    <%= h(@page.title) %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+<% end %>
@@ -30,6 +30,10 @@
       <% end %>
       <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
+
+      <% content = content_tag('span', label_for_clone_article(@page)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %>
+      <%= expirable_button @page, :clone, content, url %>
     <% end %>
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
@@ -58,9 +62,9 @@
     <% if @page.blog? and !@page.image.nil? %>
       <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
     <% end %>
-    <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
-    <%= article_title(@page, :no_link => true) %>
+    <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
   </div>
 </div>
@@ -0,0 +1,21 @@
+<% if article.image %>
+  <% className = "article-compact-abstract-with-image" %>
+  <% if article.image.thumbnails_processed? %>
+    <% image_file = article.image.public_filename(:big) %>
+  <% else %>
+    <% image_file = "/images/icons-app/image-loading-thumb.png" %>
+  <% end %>
+<% else %>
+  <% className = "article-compact-abstract" %>
+<% end %>
+
+<div>
+  <% if article.image %>
+    <div class = "article-compact-image">
+      <%= image_tag(image_file) %>
+    </div>
+  <% end %>
+  <div class = <%= className %> >
+      <%= article.lead(400) %>
+  </div>
+</div>
@@ -0,0 +1,29 @@
+<span class="publishing-info">
+  <span class="date">
+    <%= show_date(@page.published_at) %>
+  </span>
+  <span class="author">
+    <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
+  </span>
+<% unless @no_comments %>
+  <span class="comments">
+    <%= (" - %s") % link_to_comments(@page)%>
+  </span>
+<% end %>
+</span>
+
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
@@ -8,7 +8,7 @@
   </div>
 </div>
 <hr class="pre-posts"/>
-<div class="blog-posts">
+<div class="blog-posts page-<%= @npage %>">
   <% paginate = true %>
   <%=
    posts = @posts
@@ -0,0 +1,41 @@
+<div class="event-card">
+  <div class="event-image">
+    <% if event.image %>
+      <%= image_tag(event.image.public_filename(:big)) %>
+    <% end %>
+  </div>
+  <div class="about-event">
+    <% if event.start_date.present? || event.end_date.present? %>
+      <span class="event-date">
+        <%= show_period(event.start_date, event.end_date) %>
+      </span>
+    <% end %>
+    <% if event.link.present? %>
+      <span class="event-link">
+        <%= link_to event.link, event.link %>
+      </span>
+    <% end %>
+    <% if event.address.present? %>
+      <span class="event-address">
+        <span>
+          <%= event.address %>
+        </span>
+      </span>
+    <% end %>
+  </div>
+</div>
+
+<div class="event-body">
+  <% if format == 'short' %>
+    <%= display_short_format event, :comments_link => false, :read_more_link => false %>
+  <% else %>
+    <% unless event.abstract.blank? %>
+      <div class="event-lead">
+        <%= event.article_lead %>
+      </div>
+    <% end %>
+    <div class="event-content">
+      <%= event.body %>
+    </div>
+  <% end %>
+</div>
 <% unless folder.body.blank? %>
-  <div>
+  <div class="folder-description">
     <%= folder.body %>
   </div>
-  <hr/>
 <% end %>
 <% if folder.children.empty? %>
@@ -24,22 +24,6 @@
   <%= render :partial => 'article_toolbar' %>
 </div>
-<% if @page.display_hits? || @page.license.present? %>
-  <div id='article-sub-header'>
-    <% if @page.display_hits? %>
-      <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-      </div>
-    <% end %>
-
-    <% if @page.license.present? %>
-      <div id="article-license">
-        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -47,6 +31,12 @@
 <% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <% if @page.image.present? && !@page.event? %>
+      <div class="article-body-img">
+        <%= image_tag(@page.image.public_filename) %>
+        <p><%= @page.image.label%></p>
+      </div>
+    <% end %>
     <%= article_to_html(@page, options) %>
     <br style="clear:both" />
   </div> <!-- end class="article-body" -->
@@ -27,6 +27,7 @@
     <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
+      noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
     </script>
   </head>
@@ -0,0 +1,8 @@
+<%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
+
+<%= javascript_include_tag '/javascripts/product_categories.js' %>
+<%= javascript_tag do %>
+  product_categories.autocomplete.search_url = <%= url_for(:controller => :manage_products, :action => :search_categories).to_json %>
+  product_categories.autocomplete.select_url = <%= url_for(:controller => :manage_products, :action => :show_category_tree).to_json %>
+  product_categories.autocomplete.load('#product_category_id')
+<% end %>
@@ -0,0 +1,2 @@
+<%= categories_container selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true) %>
+
@@ -16,7 +16,7 @@
     <h3><%= _('Edit category of this product:') %></h3>
-    <%= categories_container(selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true)) %>
+    <%= render 'manage_products/selected_category_tree' %>
     <div id='categories_selection_actionbar'>
       <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
@@ -0,0 +1,41 @@
+<div class='results'>
+  <table id='organizations-list'>
+    <colgroup>
+      <col width="60%">
+      <col width="20%">
+      <col width="20%">
+    </colgroup>
+
+    <tr>
+      <th><%= _('Profile') %></th>
+      <th><%= _('Actions') %></th>
+      <th><%= _('Type') %>
+
+      <%= select_tag(:type, options_for_select(@types_filter, @type)) %>
+      </th>
+    </tr>
+
+    <% @collection.each do |p| %>
+      <tr title="<%= p.name %>">
+        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+        <td class='actions'>
+          <div class="members-buttons-cell">
+            <% if p.visible %>
+              <%= button_without_text :'deactivate-user', _('Deactivate'), {:action => 'deactivate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to deactivate this organization?") %>
+            <% else %>
+              <%= button_without_text :'activate-user', _('Activate'), {:action => 'activate', :id => p.id}, :class => 'action', 'data-confirm' => _("Do you want to activate this organization?") %>
+            <% end %>
+            <%= button_without_text :'delete', _('Remove'), {:action => 'destroy', :id => p.id}, :class => 'action', 'data-method' => :post, 'data-confirm' => _("Do you want to destroy this organization?") %>
+         </div>
+        </td>
+
+        <td> <%= _("#{p.type}") %> </td>
+      </tr>
+    <% end %>
+  </table>
+
+  <div>
+    <%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
+  </div>
+</div>
@@ -0,0 +1,30 @@
+<h1><%= _('Organizations') %></h1>
+
+<%= form_tag( { :action => 'index' }, :method => 'get', :id => 'manage-profiles' ) do %>
+
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _('Find organizations'), :style=>"width:85%" %>
+    </span>
+
+    <%= submit_button(:search, _('Search')) %>
+  </div>
+
+  <div class="environment-profiles-results-header">
+    <div id='environment-profiles-filter-title'><%= @title %></div>
+
+    <div id="environment-profiles-filter-filter">
+      <strong><%= _("Filter by: ") %></strong>
+      <%= select_tag(:filter, options_for_select([[_('Any'), 'any'],[_('Disabled'), "disabled"], [_('Enabled') , "enabled"]], @filter)) %>
+    </div>
+    <div style="clear: both"></div>
+  </div>
+
+  <%= render :partial => 'results' %>
+
+  <% button_bar do %>
+    <%= button :back, _('Back'), :controller => 'admin_panel' %>
+  <% end %>
+<% end %>
+
+<%= javascript_include_tag 'manage-organizations' %>
@@ -0,0 +1 @@
+../../views/shared/admin/profiles/index.js.rb
 \ No newline at end of file
@@ -19,7 +19,7 @@
         <span style="font-size: 12px;"><%= comment.title %></span><br/>
       <% end %>
       <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
-      <span style="font-size: 8px; color: #929292"><%= time_ago_as_sentence(comment.created_at) %></span>
+      <span style="font-size: 8px; color: #929292"><%= time_ago_in_words(comment.created_at) %></span>
   <br style="clear: both;" />
   <% unless comment.replies.blank? %>
@@ -6,7 +6,7 @@
     <p>
     <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
     <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
-    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
     <p>
     <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
@@ -5,7 +5,7 @@
   <td>
     <p>
       <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
   </td>
 </tr>
@@ -12,7 +12,7 @@
           <span style="font-size: 14px">
             <%= task_information(task) %>
           </span>
-          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(task.created_at) %></span>
+          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(task.created_at) %></span>
         </div>
       </td>
     </tr>
@@ -5,7 +5,7 @@
     <td>
       <p>
         <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
       </p>
   </td>
 </tr>
@@ -40,7 +40,7 @@
       <%= txt2html comment.body %>
     </div>
     <div class="profile-activity-time">
-      <%= time_ago_as_sentence(comment.created_at) %>
+      <%= time_ago_in_words(comment.created_at) %>
     </div>
   </div>
@@ -12,7 +12,7 @@
     <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
   </div>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -22,5 +22,5 @@
     <% end %>
   </ul>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
-  <hr />  
+  <hr />
 </li>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -4,7 +4,7 @@
   </div>
   <div class='profile-activity-description'>
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
     <div class='profile-wall-actions'>
       <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
     </div>
@@ -5,7 +5,7 @@
 <h1><%= _('Content tagged with "%s"') % escaped_tag %></h1>
 <p>
-<%= link_to image_tag('icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
+<%= link_to image_tag('/images/icons-mime/rss-feed.png', :alt => _('Feed for this tag'), :title => _('Feed for this tag')), tag_feed_path, :class => 'blog-feed-link'%>
 </p>
 <% cache_timeout(@tag_cache_key, 4.hour) do %>
@@ -73,7 +73,7 @@
   <%= control_panel_button(_('Edit welcome page'), 'welcome-page', :action => 'welcome_page') if has_welcome_page %>
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
-    <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
+    <%= control_panel_button(button[:title], button[:icon], button[:url], button[:html_options]) %>
   <% end %>
 <% end %>
-  <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
+<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
+<%= labelled_form_field(_("Image Label:"), i.text_field(:label)) %>
+<%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
@@ -0,0 +1,11 @@
+<div id="list-item">
+  <div class="item-info">
+    <div class="item-icon" >
+      <%= display_content_icon(content) %>
+    </div>
+    <span class="item-description">
+      <%= link_to(content.name, content.url) %>
+    </span>
+    <span class="item-date"><%= _("Published at: #{show_date(content.updated_at)}") %></span>
+  </div>
+</div>
@@ -19,17 +19,27 @@
 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
+  <% abstract_options = {:style => 'width: 100%; height: 200px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, abstract_options)) %>
   <% else %>
-    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(abstract_label), text_area_tag("article[abstract]", @escaped_abstract, abstract_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, abstract_options)) %>
+    <% end %>
   <% end %>
 </div>
 <div style="margin-top: 10px;">
+  <% body_options = {:style => 'width: 100%; height: 400px;', :class => editor_type} %>
   <% if f %>
-    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(body_label), f.text_area(body_method, body_options)) %>
   <% else %>
-    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
+    <% if @article.kind_of?(Article) %>
+      <%= labelled_form_field(_(body_label), text_area_tag("article[body]", @escaped_body, body_options)) %>
+    <% else %>
+      <%= labelled_form_field(_(body_label), text_area(object, body_method, body_options)) %>
+    <% end %>
   <% end %>
 </div>
@@ -0,0 +1 @@
+jQuery('#manage-profiles .results').replaceWith('<%= escape_javascript(render 'results') %>');
-<table class="<%= list_type %>-content">
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
+<ul class="<%= list_type %>-content">
   <% contents.each do |content| %>
-    <% if content.display_to?(user) %>
-      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
-    <% end %>
+    <li class="<%= list_type %>-item">
+      <% if content.display_to?(user) %>
+        <%= render :partial => 'shared/content_item', :locals => { :content => content } %>
+      <% end %>
+    </li>
   <% end %>
-</table>
+</ul>
 <p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -7,13 +7,13 @@
       var $own_name = '<%= user.name %>';
       var $muc_domain = '<%= "conference.#{environment.default_hostname}" %>';
       var $bosh_service = '//<%= environment.default_hostname %>/http-bind';
-      var $user_unavailable_error = '<%= _("<strong>ooops!</strong> The message could not be sent because the user is not online") %>';
+      var $user_unavailable_error = '<%= _("The user is not online now. He/She will receive these messages as soon as he/she gets online.") %>';
       var $update_presence_status_every = <%= User.expires_chat_status_every.minutes %>;
       var $presence = '<%= current_user.last_chat_status %>';
     </script>
-
   <div id="chat-label">
+    <span id="unread-messages"></span>
     <span class="right-arrow">&#9654;</span>
     <span class="title"><%= _('Chat') %></span>
   </div>
@@ -98,10 +98,5 @@
           </div>
         </div>
       </div>
-
-      <div class="error-message">
-        <span class='error'>%{text}</span>
-      </div>
-
     </div>
   </div>
@@ -0,0 +1,8 @@
+<% label_name = profile.person? ? _('Open chat') : _('Join chat room') %>
+<% display = profile.person? ? profile.friends.include?(user) : profile.members.include?(user) %>
+
+<% if display %>
+  <li>
+    <%= button(:chat, label_name , {}, :class => 'open-conversation', 'data-jid' => profile.jid) %>
+  </li>
+<% end %>
@@ -2,7 +2,7 @@
 <% task.abuse_reports.each do |abuse_report| %>
   <div>
     <strong style="word-wrap: break-word; display: block; padding-right: 40px">"<%= abuse_report.reason %>"</strong> <br />
-    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%></i> <br />
+    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_in_words(abuse_report.created_at) }%></i> <br />
     <% if !abuse_report.content.blank? %>
       <button class="display-abuse-report-details" data-report="<%=abuse_report.id%>"><%=_('View details')%></button>
       <div style='display: none' id=<%= 'abuse-report-details-'+abuse_report.id.to_s %> class="abuse-report-details">
@@ -2,8 +2,26 @@
   <%= render :partial => 'task_icon', :locals => {:task => task} %>
+  <% if !@view_only && profile.organization? && @responsible_candidates.present? %>
+    <div class="task_responsible">
+      <span class="label"><%= _('Assign to:') %></span>
+      <span>
+        <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %>
+        <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %>
+      </span>
+    </div>
+  <% end %>
+
+  <% if @view_only && task.responsible.present? %>
+    <div class="task_responsible">
+      <span class="label"><%= _('Assigned to:') %></span>
+      <span class="value"><%= task.responsible.name %></span>
+    </div>
+  <% end %>
+
   <div class="task_decisions">
-    <%=
+    <% unless @view_only %>
+      <%=
         labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept',
                               :id => "decision-finish-#{task.id}",
                               :class => 'task_accept_radio',
@@ -19,9 +37,12 @@
                               :class => 'task_skip_radio',
                               :disabled => task.skip_disabled?,
                               :task_id => "#{task.id}")
-    %>
+      %>
+    <% end %>
   </div><!-- class="task_decisions" -->
+  <div class="task_date"><%= show_time(task.created_at) %></div>
+
   <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
@@ -21,58 +21,66 @@
   </div>
 <% end %>
-<%= form_tag '#', :method => 'post' do %>
-
-    <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
-        <p>
-          <%= labelled_select(_('Type of task')+': ', :filter_type, :first, :last, @filter_type,  type_collection, {:id => 'filter-type'}) %>
-        </p>
-        <p>
-          <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text-autocomplete',:value => @filter_text}) %>
-        </p>
-        <p>
-          <%= submit_button(:search, _('Search')) %>
-        </p>
+<%= form_tag '#', :method => 'get' do %>
+  <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+    <p>
+      <%= labelled_select(_('Type of task')+': ', :filter_type, :first, :last, @filter_type,  type_collection, {:id => 'filter-type'}) %>
+    </p>
+    <p>
+      <%= labelled_text_field(_("Text filter")+': ', :filter_text, nil, {:id => 'filter-text',:value => @filter_text}) %>
+    </p>
+    <% if profile.organization? %>
+      <p>
+        <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates, :class => 'filter_responsible') %>
+      </p>
     <% end %>
+    <p>
+      <%= submit_button(:search, _('Search')) %>
+    </p>
+  <% end %>
 <% end %>
+
 <% if @tasks.empty? %>
   <p>
     <em><%= _('No pending tasks for %s') % profile.name %></em>
   </p>
 <% else %>
   <%= form_tag :action => 'close' do%>
-    <% button_bar do %>
+    <% button_bar(:class => 'task-actions') do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
       <%= submit_button :save, _("Apply!") %>
       <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-    <% end %>
+    <% end unless @view_only %>
     <ul class='task-list'>
-      <p>
-      <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
-      </p>
+      <% unless @view_only %>
+        <p>
+        <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
+        </p>
+      <% end %>
       <div class="task_boxes">
-          <% @tasks.each do |task| %>
-            <%= render :partial => 'task', :locals => { :task => task } %>
-          <% end %>
+        <%= render :partial => 'task', :collection => @tasks %>
       </div>
-      <p>
-      <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "down-set-all-tasks-to") %>
-      </p>
+
+      <% unless @view_only %>
+        <p>
+        <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "down-set-all-tasks-to") %>
+        </p>
+      <% end %>
     </ul>
     <%= pagination_links(@tasks)%>
-    <% button_bar do %>
+    <% button_bar(:class => 'task-actions') do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
       <%= submit_button :save, _("Apply!") %>
       <%= button(:edit, _('View processed tasks'), :action => 'processed') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-    <% end %>
+    <% end unless @view_only %>
   <% end %>
 <% end %>
 </p>
-<div class="environment-users-results-header">
-  <div id='environment-users-filter-title'><%= users_filter_title(@filter) %></div>
+<div class="environment-profiles-results-header">
+  <div id='environment-profiles-filter-title'><%= users_filter_title(@filter) %></div>
   <%= filter_selector(@filter) %>
   <div style="clear: both"></div>
 </div>
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+before_script:
	2	+ - mkdir -p tmp/pids log
	3	+ - bundle check \|\| bundle install
	4	+ - script/noosfero-plugins disableall
	5	+ - bundle exec rake makemo &>/dev/null
	6	+# database
	7	+ - cp config/database.yml.gitlab-ci config/database.yml
	8	+ - createdb gitlab_ci_test \|\| true
	9	+ - bundle exec rake db:schema:load &>/dev/null
	10	+ - bundle exec rake db:migrate &>/dev/null
	11	+
	12	+units:
	13	+ script: bundle exec rake test:units
	14	+functionals:
	15	+ script: bundle exec rake test:functionals
	16	+integration:
	17	+ script: bundle exec rake test:integration
	18	+cucumber:
	19	+ script: bundle exec rake cucumber
	20	+selenium:
	21	+ script: bundle exec rake selenium
	22	+plugins:
	23	+ script: bundle exec rake test:noosfero_plugins
	24	+
@@ -0,0 +1,50 @@		@@ -0,0 +1,50 @@
	1	+language: ruby
	2	+rvm:
	3	+# for 2.2 support we need to upgrade the pg gem
	4	+ - 2.1.6
	5	+cache: bundler
	6	+
	7	+sudo: false
	8	+addons:
	9	+ apt:
	10	+ packages:
	11	+ - po4a
	12	+ - iso-codes
	13	+ - tango-icon-theme
	14	+ - pidgin-data
	15	+ # for gem extensions
	16	+ - libmagickwand-dev
	17	+ - libpq-dev
	18	+ - libreadline-dev
	19	+ - libsqlite3-dev
	20	+ - libxslt1-dev
	21	+
	22	+before_install:
	23	+# FIXME: workaround while https://github.com/travis-ci/travis-ci/issues/4210 is open
	24	+ - rm config/initializers/default_icon_theme.rb
	25	+# selenium support
	26	+ - export DISPLAY=:99.0
	27	+ - sh -e /etc/init.d/xvfb start
	28	+
	29	+before_script:
	30	+ - mkdir -p tmp/pids log
	31	+ - bundle check \|\| bundle install
	32	+ - script/noosfero-plugins disableall
	33	+ - bundle exec rake makemo &>/dev/null
	34	+# database
	35	+ - cp config/database.yml.travis config/database.yml
	36	+ - psql -c 'create database myapp_test;' -U postgres
	37	+ - bundle exec rake db:schema:load &>/dev/null
	38	+ - bundle exec rake db:migrate &>/dev/null
	39	+
	40	+env:
	41	+ - TASK=test:units
	42	+ - TASK=test:functionals
	43	+ - TASK=test:integration
	44	+ - TASK=cucumber
	45	+ - TASK=selenium
	46	+ - TASK=test:noosfero_plugins
	47	+
	48	+script:
	49	+ - bundle exec rake $TASK
	50	+
	@@ -74,7 +74,7 @@ downloading from git		@@ -74,7 +74,7 @@ downloading from git
74		74
75	Here we are cloning the noosfero repository from git. Note: you will need to install git before.	75	Here we are cloning the noosfero repository from git. Note: you will need to install git before.
76		76
77	- $ git clone git://gitorious.org/noosfero/noosfero.git current	77	+ $ git clone https://gitlab.com/noosfero/noosfero.git current
78	$ cd current	78	$ cd current
79	$ git checkout -b stable origin/stable	79	$ git checkout -b stable origin/stable
80		80
	@@ -71,22 +71,4 @@ class AdminPanelController < AdminController		@@ -71,22 +71,4 @@ class AdminPanelController < AdminController
71	end	71	end
72	end	72	end
73	end	73	end
74	-
75	- def manage_organizations_status
76	- scope = environment.organizations
77	- @filter = params[:filter] \|\| 'any'
78	- @title = "Organization profiles"
79	- @title = @title+" - "+@filter if @filter != 'any'
80	-
81	- if @filter == 'enabled'
82	- scope = scope.visible
83	- elsif @filter == 'disabled'
84	- scope = scope.disabled
85	- end
86	-
87	- scope = scope.order('name ASC')
88	-
89	- @q = params[:q]
90	- @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => 10, :page => params[:npage]})[:results]
91	- end
92	end	74	end
@@ -0,0 +1,66 @@		@@ -0,0 +1,66 @@
	1	+class OrganizationsController < AdminController
	2	+
	3	+ protect 'manage_environment_organizations', :environment
	4	+
	5	+ def index
	6	+ @filter = params[:filter] \|\| 'any'
	7	+ @title = _('Organization profiles')
	8	+ @type = params[:type] \|\| "any"
	9	+ @types_filter = [[_('All'), 'any'], [_('Community'), 'Community'], [_('Enterprise'), 'Enterprise']]
	10	+ @types_filter = @types_filter \| @plugins.dispatch(:organization_types_filter_options)
	11	+
	12	+ scope = @plugins.dispatch_first(:filter_manage_organization_scope, @type)
	13	+ if scope.blank?
	14	+ scope = environment.organizations
	15	+ scope = scope.where(:type => @type) if @type != 'any'
	16	+ end
	17	+
	18	+ if @filter == 'enabled'
	19	+ scope = scope.visible
	20	+ elsif @filter == 'disabled'
	21	+ scope = scope.disabled
	22	+ end
	23	+
	24	+ scope = scope.order('name ASC')
	25	+
	26	+ @q = params[:q]
	27	+ @collection = find_by_contents(:organizations, environment, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
	28	+ end
	29	+
	30	+ def activate
	31	+ organization = environment.organizations.find(params[:id])
	32	+ if organization.enable
	33	+ render :text => (_('%s enabled') % organization.name).to_json
	34	+ else
	35	+ render :text => (_('%s could not be enabled') % organization.name).to_json
	36	+ end
	37	+ end
	38	+
	39	+ def deactivate
	40	+ organization = environment.organizations.find(params[:id])
	41	+ if organization.disable
	42	+ render :text => (_('%s disabled') % organization.name).to_json
	43	+ else
	44	+ render :text => (_('%s could not be disable') % organization.name).to_json
	45	+ end
	46	+ end
	47	+
	48	+ def destroy
	49	+ if request.post?
	50	+ organization = environment.organizations.find(params[:id])
	51	+ if organization && organization.destroy
	52	+ render :text => (_('%s removed') % organization.name).to_json
	53	+ else
	54	+ render :text => (_('%s could not be removed') % organization.name).to_json
	55	+ end
	56	+ else
	57	+ render :nothing => true
	58	+ end
	59	+ end
	60	+
	61	+ private
	62	+
	63	+ def per_page
	64	+ 10
	65	+ end
	66	+end
1	class FriendsController < MyProfileController	1	class FriendsController < MyProfileController
2	-	2	+
3	protect 'manage_friends', :profile	3	protect 'manage_friends', :profile
4	-	4	+
5	def index	5	def index
6	- @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)	6	+ @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
7	if is_cache_expired?(profile.manage_friends_cache_key(params))	7	if is_cache_expired?(profile.manage_friends_cache_key(params))
8	@friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])	8	@friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
9	end	9	end
	@@ -18,7 +18,7 @@ class FriendsController < MyProfileController		@@ -18,7 +18,7 @@ class FriendsController < MyProfileController
18	end	18	end
19		19
20	def suggest	20	def suggest
21	- @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)	21	+ @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
22	end	22	end
23		23
24	def remove_suggestion	24	def remove_suggestion
	@@ -26,13 +26,13 @@ class FriendsController < MyProfileController		@@ -26,13 +26,13 @@ class FriendsController < MyProfileController
26	redirect_to :action => 'suggest' unless @person	26	redirect_to :action => 'suggest' unless @person
27	if @person && request.post?	27	if @person && request.post?
28	profile.remove_suggestion(@person)	28	profile.remove_suggestion(@person)
29	- @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)	29	+ @suggestions = profile.suggested_profiles.of_person.enabled.includes(:suggestion).limit(per_page)
30	render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => params[:per_page] \|\| per_page }	30	render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions, :per_page => params[:per_page] \|\| per_page }
31	end	31	end
32	end	32	end
33		33
34	def connections	34	def connections
35	- @suggestion = profile.profile_suggestions.of_person.enabled.find_by_suggestion_id(params[:id])	35	+ @suggestion = profile.suggested_profiles.of_person.enabled.find_by_suggestion_id(params[:id])
36	if @suggestion	36	if @suggestion
37	@tags = @suggestion.tag_connections	37	@tags = @suggestion.tag_connections
38	@profiles = @suggestion.profile_connections	38	@profiles = @suggestion.profile_connections
	@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController		@@ -35,7 +35,7 @@ class ManageProductsController < ApplicationController
35	end	35	end
36		36
37	def categories_for_selection	37	def categories_for_selection
38	- @category = Category.find(params[:category_id]) if params[:category_id]	38	+ @category = environment.categories.find_by_id params[:category_id]
39	@object_name = params[:object_name]	39	@object_name = params[:object_name]
40	if @category	40	if @category
41	@categories = @category.children	41	@categories = @category.children
	@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController		@@ -95,6 +95,20 @@ class ManageProductsController < ApplicationController
95	end	95	end
96	end	96	end
97		97
		98	+ def show_category_tree
		99	+ @category = environment.categories.find params[:category_id]
		100	+ render :partial => 'selected_category_tree'
		101	+ end
		102	+
		103	+ def search_categories
		104	+ @term = params[:term].downcase
		105	+ conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
		106	+ @categories = ProductCategory.all :conditions => conditions, :limit => 10
		107	+ render :json => (@categories.map do \|category\|
		108	+ {:label => category.name, :value => category.id}
		109	+ end)
		110	+ end
		111	+
98	def add_input	112	def add_input
99	@product = @profile.products.find(params[:id])	113	@product = @profile.products.find(params[:id])
100	@input = @product.inputs.build	114	@input = @product.inputs.build
	@@ -16,6 +16,7 @@ class MapsController < MyProfileController		@@ -16,6 +16,7 @@ class MapsController < MyProfileController
16		16
17	Profile.transaction do	17	Profile.transaction do
18	if profile.update_attributes!(params[:profile_data])	18	if profile.update_attributes!(params[:profile_data])
		19	+ BlockSweeper.expire_blocks profile.blocks.select{ \|b\| b.class == LocationBlock }
19	session[:notice] = _('Address was updated successfully!')	20	session[:notice] = _('Address was updated successfully!')
20	redirect_to :action => 'edit_location'	21	redirect_to :action => 'edit_location'
21	end	22	end
	@@ -40,7 +40,7 @@ class MembershipsController < MyProfileController		@@ -40,7 +40,7 @@ class MembershipsController < MyProfileController
40	end	40	end
41		41
42	def suggest	42	def suggest
43	- @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)	43	+ @suggestions = profile.suggested_profiles.of_community.enabled.includes(:suggestion).limit(per_page)
44	end	44	end
45		45
46	def remove_suggestion	46	def remove_suggestion
	@@ -49,13 +49,13 @@ class MembershipsController < MyProfileController		@@ -49,13 +49,13 @@ class MembershipsController < MyProfileController
49	redirect_to :action => 'suggest' unless @community	49	redirect_to :action => 'suggest' unless @community
50	if @community && request.post?	50	if @community && request.post?
51	profile.remove_suggestion(@community)	51	profile.remove_suggestion(@community)
52	- @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(custom_per_page)	52	+ @suggestions = profile.suggested_profiles.of_community.enabled.includes(:suggestion).limit(custom_per_page)
53	render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => custom_per_page}	53	render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions, :per_page => custom_per_page}
54	end	54	end
55	end	55	end
56		56
57	def connections	57	def connections
58	- @suggestion = profile.profile_suggestions.of_community.enabled.find_by_suggestion_id(params[:id])	58	+ @suggestion = profile.suggested_profiles.of_community.enabled.find_by_suggestion_id(params[:id])
59	if @suggestion	59	if @suggestion
60	@tags = @suggestion.tag_connections	60	@tags = @suggestion.tag_connections
61	@profiles = @suggestion.profile_connections	61	@profiles = @suggestion.profile_connections
	@@ -2,6 +2,7 @@ class ChatController < PublicController		@@ -2,6 +2,7 @@ class ChatController < PublicController
2		2
3	before_filter :login_required	3	before_filter :login_required
4	before_filter :check_environment_feature	4	before_filter :check_environment_feature
		5	+ before_filter :can_send_message, :only => :register_message
5		6
6	def start_session	7	def start_session
7	login = user.jid	8	login = user.jid
	@@ -54,6 +55,16 @@ class ChatController < PublicController		@@ -54,6 +55,16 @@ class ChatController < PublicController
54	end	55	end
55	end	56	end
56		57
		58	+ def avatars
		59	+ profiles = environment.profiles.where(:identifier => params[:profiles])
		60	+ avatar_map = profiles.inject({}) do \|result, profile\|
		61	+ result[profile.identifier] = profile_icon(profile, :minor)
		62	+ result
		63	+ end
		64	+
		65	+ render_json avatar_map
		66	+ end
		67	+
57	def update_presence_status	68	def update_presence_status
58	if request.xhr?	69	if request.xhr?
59	current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] \|\| {}))	70	current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] \|\| {}))
	@@ -62,11 +73,17 @@ class ChatController < PublicController		@@ -62,11 +73,17 @@ class ChatController < PublicController
62	end	73	end
63		74
64	def save_message	75	def save_message
65	- to = environment.profiles.find_by_identifier(params[:to])
66	- body = params[:body]
67	-
68	- ChatMessage.create!(:to => to, :from => user, :body => body)
69	- render :text => 'ok'	76	+ if request.post?
		77	+ to = environment.profiles.where(:identifier => params[:to]).first
		78	+ body = params[:body]
		79	+
		80	+ begin
		81	+ ChatMessage.create!(:to => to, :from => user, :body => body)
		82	+ return render_json({:status => 0})
		83	+ rescue Exception => exception
		84	+ return render_json({:status => 3, :message => exception.to_s, :backtrace => exception.backtrace})
		85	+ end
		86	+ end
70	end	87	end
71		88
72	def recent_messages	89	def recent_messages
	@@ -90,8 +107,9 @@ class ChatController < PublicController		@@ -90,8 +107,9 @@ class ChatController < PublicController
90	end	107	end
91		108
92	def recent_conversations	109	def recent_conversations
93	- conversations_order = ActiveRecord::Base.connection.execute("select profiles.identifier from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc").entries.map {\|e\| e['identifier']}
94	- render :json => {:order => conversations_order.reverse, :domain => environment.default_hostname.gsub('.','-')}.to_json	110	+ profiles = Profile.find_by_sql("select profiles.* from profiles inner join (select distinct r.id as id, MAX(r.created_at) as created_at from (select from_id, to_id, created_at, (case when from_id=#{user.id} then to_id else from_id end) as id from chat_messages where from_id=#{user.id} or to_id=#{user.id}) as r group by id order by created_at desc, id) as t on profiles.id=t.id order by t.created_at desc")
		111	+ jids = profiles.map(&:jid).reverse
		112	+ render :json => jids.to_json
95	end	113	end
96		114
97	#TODO Ideally this is done through roster table on ejabberd.	115	#TODO Ideally this is done through roster table on ejabberd.
	@@ -108,4 +126,14 @@ class ChatController < PublicController		@@ -108,4 +126,14 @@ class ChatController < PublicController
108	end	126	end
109	end	127	end
110		128
		129	+ def can_send_message
		130	+ return render_json({:status => 1, :message => 'Missing parameters!'}) if params[:from].nil? \|\| params[:to].nil? \|\| params[:message].nil?
		131	+ return render_json({:status => 2, :message => 'You can not send message as another user!'}) if params[:from] != user.jid
		132	+ # TODO Maybe register the jid in a table someday to avoid this below
		133	+ return render_json({:status => 3, :messsage => 'You can not send messages to strangers!'}) if user.friends.where(:identifier => params[:to].split('@').first).blank?
		134	+ end
		135	+
		136	+ def render_json(result)
		137	+ render :text => result.to_json
		138	+ end
111	end	139	end