Merge branch 'master_colivre' into ActionItem2823_merge

Leandro Nunes dos Santos
2 parents ba4f52d8 06f5295f
Showing 120 changed files with 1333 additions and 482 deletions Show diff stats
COPYRIGHT
HACKING
HACKING.rails235
README
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/my_profile/spam_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/cms_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/article_block.rb
app/models/comment.rb
app/models/spammer_logger.rb
app/models/suggest_article.rb
app/models/task.rb
@@ -4,8 +4,9 @@ Copyright (c) 2007-2009,
   Cáritas Brasileira <http://www.caritasbrasileira.org/>
 Copyright (c) 2007-2009,
   Ynternet.org Foundation <http://www.ynternet.org/>
-Copyright (c) 2008-2009,
+Copyright (c) 2008-2013,
   Colivre <http://www.colivre.coop.br/>
+Copyright (c) the Noosfero contributors. See AUTHORS
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -52,3 +52,12 @@ If you write such script for your own OS, *please* share it with us at the
 development mailing list so that we can include it in the official repository.
 This way other people using the same OS will have to put less effort to develop
 Noosfero.
+
+== Submitting your changes back
+
+For now please read:
+
+- Coding conventions
+  http://noosfero.org/Development/CodingConventions
+- Patch guidelines
+  http://noosfero.org/Development/PatchGuidelines
@@ -1,13 +0,0 @@
-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
-development.
-
-Install dependencies:
-
-gem install rails -v 2.3.5
-gem install i18n
-gem install will_paginate -v 2.3.12
-gem install cucumber
-
-Creating initial environment:
-
-rake db:schema:load
-noosfero - a web-based social platform
+Noosfero - a web-based social platform
 ======================================
-:: About the project
+http://www.noosfero.org/
-Homepage: http://www.noosfero.org/
+Documentation
+-------------
-:: Authors and copyright
+The following documentation is available:
-Authors: see file AUTHORS
-Copyright information: see file COPYRIGHT
-Full license text; see file COPYING
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+INSTALL               install instructions
+INSTALL.awstats       install instructions - access statistics service
+INSTALL.chat          install instructions - chat service
+INSTALL.email         install instructions - email service
+INSTALL.multitenancy  install instructions - multiple sites
+INSTALL.varnish       install instructions - varnish HTTP caching (recommended)
+HACKING               development instruction
+RELEASING             instructions for doing releases
+doc/noosfero/*        user documentation (available through the app itself)
+
+
+Authors and copyright
+---------------------
+
+Authorship and copyright information is available in the files listed below.
+
+File                  Purpose
+~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AUTHORS               list of authors (updated at each release)
+COPYRIGHT             Copyright statement for the project
+COPYING               Full text of the project license
@@ -267,7 +267,10 @@ class CmsController &lt; MyProfileController
     @back_to = params[:back_to] || request.referer || url_for(profile.public_profile_url)
     @task = SuggestArticle.new(params[:task])
     if request.post?
-       @task.target = profile
+      @task.target = profile
+      @task.ip_address = request.remote_ip
+      @task.user_agent = request.user_agent
+      @task.referrer = request.referrer
       if verify_recaptcha(:model => @task, :message => _('Please type the words correctly')) && @task.save
         session[:notice] = _('Thanks for your suggestion. The community administrators were notified.')
         redirect_to @back_to
@@ -4,7 +4,7 @@ class ProfileEditorController &lt; MyProfileController
   protect 'destroy_profile', :profile, :only => [:destroy_profile]
   def index
-    @pending_tasks = Task.to(profile).pending.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
   end
   helper :profile
@@ -14,9 +14,15 @@ class SpamController &lt; MyProfileController
         if params[:remove_comment]
           profile.comments_received.find(params[:remove_comment]).destroy
         end
+        if params[:remove_task]
+          Task.to(profile).find_by_id(params[:remove_task]).destroy
+        end
         if params[:mark_comment_as_ham]
           profile.comments_received.find(params[:mark_comment_as_ham]).ham!
         end
+        if params[:mark_task_as_ham] && (t = Task.to(profile).find_by_id(params[:mark_task_as_ham]))
+          t.ham!
+        end
         if request.xhr?
           json_response(true)
         else
@@ -28,7 +34,8 @@ class SpamController &lt; MyProfileController
       return
     end
-    @spam = profile.comments_received.spam.paginate({:page => params[:page]})
+    @comment_spam = profile.comments_received.spam.paginate({:page => params[:comments_page]})
+    @task_spam = Task.to(profile).spam.paginate({:page => params[:tasks_page]})
   end
   protected
@@ -4,12 +4,12 @@ class TasksController &lt; MyProfileController
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
-    @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
+    @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
   def processed
-    @tasks = Task.to(profile).closed.sort_by(&:created_at)
+    @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
   end
   VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
@@ -57,7 +57,7 @@ class TasksController &lt; MyProfileController
   end
   def list_requested
-    @tasks = Task.find_all_by_requestor_id(profile.id)
+    @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
   end
   def ticket_details
@@ -53,7 +53,9 @@ class ContentViewerController &lt; ApplicationController
     # At this point the page will be showed
     @page.hit
-    unless @page.mime_type == 'text/html' || (@page.image? && params[:view])
+    @page = FilePresenter.for @page
+
+    unless @page.mime_type == 'text/html' || params[:view]
       headers['Content-Type'] = @page.mime_type
       data = @page.data
@@ -558,6 +558,9 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
+    if content = @plugins.dispatch_first(:profile_image_link, profile, size, tag, extra_info)
+      return instance_eval(&content)
+    end
     name = profile.short_name
     if profile.person?
       url = url_for(profile.check_friendship_url)
@@ -574,16 +577,16 @@ module ApplicationHelper
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag('div', content_tag(tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
-        link_to(
-            content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
-            content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
-            extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
-            profile.url,
-            :class => 'profile_link url',
-            :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
-            :title => profile.name ),
-        :class => 'vcard'), :class => 'common-profile-list-block')
+                                   (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
+    link_to(
+      content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
+      content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
+      extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
+      profile.url,
+      :class => 'profile_link url',
+      :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
+      :title => profile.name ),
+      :class => 'vcard'), :class => 'common-profile-list-block')
   end
   def gravatar_url_for(email, options = {})
@@ -1113,15 +1116,34 @@ module ApplicationHelper
     result
   end
-  def manage_enterprises
-    if user && !user.enterprises.empty?
-      enterprises_link = user.enterprises.map do |enterprise|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % enterprise.short_name(25)]), @environment.top_url + "/myprofile/#{enterprise.identifier}", :class => "icon-menu-"+enterprise.class.identification.underscore, :title => [_('Manage %s') % enterprise.short_name])
+  def manage_link(list, kind)
+    if list.present?
+      link_to_all = nil
+      if list.count > 5
+        list = list.first(5)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+      end
+      link = list.map do |element|
+        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
       end
-      render :partial => 'shared/manage_enterprises', :locals => {:enterprises_link => enterprises_link}
+      if link_to_all
+        link << link_to_all
+      end
+      render :partial => "shared/manage_link", :locals => {:link => link, :kind => kind.to_s}
     end
   end
+  def manage_enterprises
+    return if not user
+    manage_link(user.enterprises, :enterprises)
+  end
+
+  def manage_communities
+    return if not user
+    administered_communities = user.communities.more_popular.select {|c| c.admins.include? user}
+    manage_link(administered_communities, :communities)
+  end
+
   def usermenu_logged_in
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
@@ -1133,6 +1155,7 @@ module ApplicationHelper
     render_environment_features(:usermenu) +
     link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
     manage_enterprises.to_s +
+    manage_communities.to_s +
     link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
@@ -42,7 +42,7 @@ module BlogHelper
   def display_post(article, format = 'full')
     no_comments = (format == 'full') ? false : true
-    html = send("display_#{format}_format", article).html_safe
+    html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
     article_title(article, :no_comments => no_comments) + html
   end
@@ -33,7 +33,7 @@ module CmsHelper
       link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
     else
       if article.image?
-         image_tag(icon_for_article(article)) + link_to(article_name, article.url)
+        image_tag(icon_for_article(article)) + link_to(article_name, article.url)
       else
         link_to article_name, article.url, :class => icon_for_article(article)
       end
@@ -17,7 +17,7 @@ module ContentViewerHelper
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', h(title), :class => 'title')
-    if article.belongs_to_blog?
+    if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
@@ -21,6 +21,7 @@ module FolderHelper
   end
   def display_article_in_listing(article, recursive = false, level = 0)
+    article = FilePresenter.for article
     article_link = if article.image?
          link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
        else
@@ -40,12 +41,15 @@ module FolderHelper
   end
   def icon_for_article(article)
-    icon = article.class.icon_name(article)
+    article = FilePresenter.for article
+    icon = article.respond_to?(:icon_name) ?
+             article.icon_name :
+             article.class.icon_name(article)
     if (icon =~ /\//)
       icon
     else
-      klasses = 'icon icon-' + icon
-      if article.kind_of?(UploadedFile)
+      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
         klasses += ' icon-upload-file'
       end
       klasses
@@ -154,8 +154,12 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def css_class_list
+    [self.class.name.underscore.dasherize]
+  end
+
   def css_class_name
-    self.class.name.underscore.dasherize
+    [css_class_list].flatten.compact.join(' ')
   end
   def pending_categorizations
@@ -310,6 +314,10 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
+  
+  def belongs_to_forum?
+    self.parent and self.parent.forum?
+  end
   def info_from_last_update
     last_comment = comments.last
@@ -325,7 +333,7 @@ class Article &lt; ActiveRecord::Base
   end
   def view_url
-    @view_url ||= image? ? url.merge(:view => true) : url
+    @view_url ||= is_a?(UploadedFile) ? url.merge(:view => true) : url
   end
   def comment_url_structure(comment, action = :edit)
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article,
+      (block.article ? article_to_html(FilePresenter.for(block.article),
           :gallery_view => false,
           :inside_block => block,               # For Blogs and folders
           :format => block.visualization_format # For Articles and contents
@@ -16,9 +16,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
-  named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
   named_scope :without_reply, :conditions => ['reply_of_id IS NULL']
-  named_scope :spam, :conditions => ['spam = ?', true]
   # unauthenticated authors:
   validates_presence_of :name, :if => (lambda { |record| !record.email.blank? })
@@ -108,6 +106,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
+  include Spammable
+
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+  end
+
+  def after_ham!
+    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+  end
+
   def verify_and_notify
     check_for_spam
     unless spam?
@@ -115,10 +124,6 @@ class Comment &lt; ActiveRecord::Base
     end
   end
-  def check_for_spam
-    plugins.dispatch(:check_comment_for_spam, self)
-  end
-
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
       if !notification_emails.empty?
@@ -205,37 +210,6 @@ class Comment &lt; ActiveRecord::Base
     @rejected = true
   end
-  def spam?
-    !spam.nil? && spam
-  end
-
-  def ham?
-    !spam.nil? && !spam
-  end
-
-  def spam!
-    self.spam = true
-    self.save!
-    SpammerLogger.log(ip_address, self)
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
-    self
-  end
-
-  def ham!
-    self.spam = false
-    self.save!
-    Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
-    self
-  end
-
-  def marked_as_spam
-    plugins.dispatch(:comment_marked_as_spam, self)
-  end
-
-  def marked_as_ham
-    plugins.dispatch(:comment_marked_as_ham, self)
-  end
-
   def need_moderation?
     article.moderate_comments? && (author.nil? || article.author != author)
   end
@@ -6,6 +6,8 @@ class SpammerLogger &lt; Logger
     if object
       if object.kind_of?(Comment)
         @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+      elsif object.kind_of?(SuggestArticle)
+        @logger << "[#{Time.now.strftime('%F %T %z')}] SuggestArticle-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
         @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
@@ -11,6 +11,17 @@ class SuggestArticle &lt; Task
   settings_items :source, :type => String
   settings_items :source_name, :type => String
   settings_items :highlighted, :type => :boolean, :default => false
+  settings_items :ip_address, :type => String
+  settings_items :user_agent, :type => String
+  settings_items :referrer, :type => String
+
+  after_create :schedule_spam_checking
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
   def sender
     "#{name} (#{email})"
@@ -61,4 +72,12 @@ class SuggestArticle &lt; Task
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
+  def after_spam!
+    SpammerLogger.log(ip_address, self)
+    self.delay.marked_as_spam
+  end
+
+  def after_ham!
+    self.delay.marked_as_ham
+  end
 end
@@ -235,6 +235,8 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  include Spammable
+
   protected
   # This method must be overrided in subclasses, and its implementation must do
@@ -275,6 +277,7 @@ class Task &lt; ActiveRecord::Base
   named_scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions =>  [conditions]} }
   named_scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} }
+
   named_scope :to, lambda { |profile|
     environment_condition = nil
     if profile.person?
@@ -60,12 +60,20 @@ class UploadedFile &lt; Article
   postgresql_attachment_fu
+  # Use this method only to get the generic icon for this kind of content.
+  # If you want the specific icon for a file type or the iconified version
+  # of an image, use FilePresenter.for(uploaded_file).icon_name
   def self.icon_name(article = nil)
-    if article
-      article.image? ? article.public_filename(:icon) : (article.mime_type ? article.mime_type.gsub(/[\/+.]/, '-') : 'upload-file')
-    else
-      'upload-file'
+    unless article.nil?
+      warn = ('='*80) + "\n" +
+             'The method `UploadedFile.icon_name(obj)` is deprecated. ' +
+             'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+             "\n" + ('='*80)
+      raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+      Rails.logger.warn warn if Rails.logger
+      puts warn if ENV['RAILS_ENV'] == 'development'
     end
+    'upload-file'
   end
   def mime_type
@@ -91,40 +99,27 @@ class UploadedFile &lt; Article
   end
   def to_html(options = {})
+    warn = ('='*80) + "\n" +
+           'The method `UploadedFile#to_html()` is deprecated. ' +
+           'You must to encapsulate UploadedFile with `FilePresenter.for()`.' +
+           "\n" + ('='*80)
+    raise NoMethodError, warn if ENV['RAILS_ENV'] == 'test'
+    Rails.logger.warn warn if Rails.logger
+    puts warn if ENV['RAILS_ENV'] == 'development'
     article = self
     if image?
       lambda do
-        if article.gallery? && options[:gallery_view]
-          images = article.parent.images
-          current_index = images.index(article)
-          total_of_images = images.count
-
-          link_to_previous = if current_index >= 1
-            link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'left')
-          else
-            content_tag('span', _('&laquo; Previous'), :class => 'left')
-          end
-
-          link_to_next = if current_index < total_of_images - 1
-            link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'right')
-          else
-            content_tag('span', _('Next &raquo;'), :class => 'right')
-          end
-
-          content_tag(
-            'div',
-            link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
-            :class => 'gallery-navigation'
-          )
-        end.to_s +
-        image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
-
+        image_tag(article.public_filename(:display),
+                  :class => article.css_class_name,
+                  :style => 'max-width: 100%') +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     else
       lambda do
-        content_tag('ul', content_tag('li', link_to(article.name, article.url, :class => article.css_class_name))) +
-          content_tag('p', article.abstract, :class => 'uploaded-file-description')
+        content_tag('div',
+                    link_to(article.name, article.url),
+                    :class => article.css_class_name) +
+        content_tag('div', article.abstract, :class => 'uploaded-file-description')
       end
     end
   end
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,14 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -40,13 +40,16 @@
     </tr>
   <% end %>
-  <% @articles.each do |article| %>
+  <% @articles.each do |article| article = FilePresenter.for article %>
     <tr title="<%= article.title%>" >
-      <td>
+      <td class="article-name">
         <%= link_to_article(article) %>
       </td>
-      <td>
-        <%= article.class.short_description %>
+      <% 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) %>
@@ -0,0 +1,9 @@
+<span class="download-link">
+  <span>Download</span>
+  <strong><%= link_to generic.filename, generic.public_filename %></strong>
+</span>
+
+<div class="uploaded-file-description <%= 'empty' if generic.abstract.blank? %>">
+  <%= generic.abstract %>
+</div>
+
@@ -0,0 +1,36 @@
+<% if image.gallery? && options[:gallery_view] %>
+<%
+  images = image.parent.images
+  current_index = images.index(image.encapsulated_file)
+  total_of_images = images.count
+  link_to_previous = if current_index >= 1
+   link_to(_('&laquo; Previous'), images[current_index - 1].view_url, :class => 'previous')
+  else
+    content_tag('span', _('&laquo; Previous'), :class => 'previous')
+  end
+
+  link_to_next = if current_index < total_of_images - 1
+    link_to(_('Next &raquo;'), images[current_index + 1].view_url, :class => 'next')
+  else
+    content_tag('span', _('Next &raquo;'), :class => 'next')
+  end
+%>
+
+<div class="gallery-navigation">
+  <%= link_to_previous %>
+  <span class="total-of-images">
+    <%= _('image %d of %d') % [current_index + 1, total_of_images] %>
+  </span>
+  <%= link_to_next %>
+</div>
+
+<% end %>
+
+<%# image_tag(article.public_filename(:display), :class => article.css_class_name, :style => 'max-width: 100%') %>
+
+<img src="<%=image.public_filename(:display)%>" class="<%=image.css_class_name%>">
+
+<div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
+  <%= image.abstract %>
+</div>
+
@@ -1,8 +0,0 @@
-<div id='manage-enterprises'>
-  <a href="#" id='manage-enterprises-link' class='simplemenu-trigger' title='<%= _('Manage enterprises') %>'><i class="icon-menu-enterprise"></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My enterprises') %></strong></a>
-  <ul class='simplemenu-submenu'>
-    <% enterprises_link.each do |link| %>
-      <li class='simplemenu-item'><%= link %></li>
-    <% end %>
-  </ul>
-</div>
@@ -0,0 +1,8 @@
+<div id=<%= "manage-#{kind}" %> class="manage-groups">
+  <a href="#" id=<%= "manage-#{kind}-link" %> class="simplemenu-trigger" title="<%= _('Manage %s') % kind %>"><i class=<%= "icon-menu-#{kind.singularize}" %>></i><strong><%= ui_icon('ui-icon-triangle-1-s') + _('My %s') % kind %></strong></a>
+  <ul class="simplemenu-submenu">
+    <% link.each do |link| %>
+      <li class="simplemenu-item"><%= link %></li>
+    <% end %>
+  </ul>
+</div>
@@ -0,0 +1,11 @@
+<%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
+<div id='article'>
+  <div class="comments" id="comments_list">
+    <ul class="article-comments-list">
+      <%= render :partial => 'comment/comment', :collection => @comment_spam %>
+    </ul>
+  </div>
+</div>
+
+<%= pagination_links @comment_spam, :param_name => :comments_page %>
+
@@ -0,0 +1,21 @@
+<% render :layout => 'task', :locals => { :task => task } do %>
+  <% content_for :extra_buttons do %>
+    <%= button_to_function('down', _('Show details'), "toggleDetails(this, '#{_('Hide details')}', '#{_('Show details')}')" ) %>
+  <% end %>
+
+  <% content_for :extra_content do %>
+    <ul class="suggest-article-details" style="display: none">
+      <li><strong><%=_('Sent by')%></strong>: <%=task.name%> </li>
+      <li><strong><%=_('Email')%></strong>: <%=task.email%> </li>
+      <li><strong><%=_('Source')%></strong>: <%=task.source_name%> </li>
+      <li><strong><%=_('Source URL')%></strong>: <%=task.source%> </li>
+      <li><strong><%=_('Folder')%></strong>: <%=(a = Article.find_by_id(task.article_parent_id))?a.name : '<em>' + s_('Folder|none') + '</em>'%> </li>
+      <li><strong><%=_('Lead')%></strong>: <%=task.article_abstract.blank? ? '<em>' + s_('Abstract|empty') + '</em>' : task.article_abstract%> </li>
+      <li><strong><%=_('Body')%></strong>:
+      <div class='suggest-article-body'>
+        <%= task.article_body %>
+      </div>
+      </li>
+    </ul>
+  <% end %>
+<% end %>
@@ -0,0 +1,18 @@
+<div class="task_box" id="task-<%= task.id %>">
+  <%= render :partial => 'tasks/task_icon', :locals => {:task => task} %>
+  <%= render :partial => 'tasks/task_title', :locals => {:task => task} %>
+  <div class="task-information">
+    <%= task_information(task) %>
+  </div>
+
+  <%= yield %> <% # ??? %>
+
+  <% button_bar do %>
+    <%= button_to_function('new', _('Mark as NOT SPAM'), 'removeTaskBox(this, %s, "%s", "")' % [url_for(:mark_task_as_ham => task.id).to_json, "task-#{task.id}"]) %>
+    <%= yield :extra_buttons %>
+    <%= button_to_function('delete', _('Remove'), 'removeTaskBox(this, %s, "%s", %s)' % [url_for(:profile => params[:profile], :remove_task => task.id).to_json, "task-#{task.id}", _('Are you sure you want to remove this article suggestion?').to_json]) %>
+
+  <% end %>
+
+  <%= yield :extra_content %>
+</div>
@@ -0,0 +1,4 @@
+<% @task_spam.each do |t| %>
+  <%= render :partial => partial_for_class(t.class), :locals => { :task => t } %>
+<% end %>
+<%= pagination_links @task_spam, :param_name => :tasks_page %>
+<%= stylesheet('tasks') %>
+
 <h1><%= _('Manage SPAM') %></h1>
+<% no_tabs = @comment_spam.blank? && @task_spam.blank? %>
+
+<%= _('There are no spams to review.') if no_tabs %>
+
 <% button_bar do %>
   <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
 <% end %>
 <%# FIXME should not need to replicate the article structure like this to be able to use the same formatting as the comments listing %>
-<div id='article'>
-  <div class="comments" id="comments_list">
-    <ul class="article-comments-list">
-      <%= render :partial => 'comment/comment', :collection => @spam %>
-    </ul>
-  </div>
-</div>
-<%= pagination_links @spam %>
+<% tabs = [] %>
+<% tabs << {:title => _('Comment Spam'), :id => 'comment-spam',
+  :content => (render :partial => 'comment_spam')} if @comment_spam.present? %>
+<% tabs << {:title => _('Task Spam'), :id => 'task-spam',
+  :content => (render :partial => 'task_spam') } if @task_spam.present? %>
+<%= render_tabs(tabs) %>
-<% button_bar do %>
-  <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+<% unless no_tabs %>
+  <% button_bar do %>
+    <%= button :back, _('Back to control panel'), :controller => :profile_editor %>
+  <% end %>
 <% end %>
+
+<%= javascript_include_tag 'spam' %>
 <div class="task_box" id="task-<%= task.id %>">
-  <div class="task_icon">
-    <%
-        icon_info = task.icon
-        if icon_info[:type] == :profile_image
-          icon = profile_image(icon_info[:profile], :minor)
-        elsif icon_info[:type] == :defined_image
-          icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
-        end
-      %>
-    <%=
-        if icon_info[:url]
-          link_to(icon, icon_info[:url])
-        else
-          icon
-        end
-      %>
-
-  </div>
+  <%= render :partial => 'task_icon', :locals => {:task => task} %>
   <div class="task_decisions">
     <%=
@@ -39,9 +22,7 @@
     %>
   </div><!-- class="task_decisions" -->
-  <strong class="task_title">
-    <%= task.title %>
-  </strong>
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
     <%= task_information(task) %>
@@ -0,0 +1,16 @@
+<%
+  icon_info = task.icon
+  if icon_info[:type] == :profile_image
+    icon = profile_image(icon_info[:profile], :minor)
+  elsif icon_info[:type] == :defined_image
+    icon = "<img src='#{icon_info[:src]}' alt='#{icon_info[:name]}' />"
+  end
+
+  if icon_info[:url]
+    icon = link_to(icon, icon_info[:url])
+  end
+%>
+
+<div class="task_icon">
+  <%= icon %>
+</div>
@@ -0,0 +1,3 @@
+<strong class="task_title">
+  <%= task.title %>
+</strong>
@@ -4,4 +4,5 @@ require &#39;noosfero/plugin/manager&#39;
 require 'noosfero/plugin/active_record'
 require 'noosfero/plugin/mailer_base'
 require 'noosfero/plugin/settings'
+require 'noosfero/plugin/spammable'
 Noosfero::Plugin.init_system if $NOOSFERO_LOAD_PLUGINS
@@ -0,0 +1,13 @@
+class AddSpamToTask < ActiveRecord::Migration
+  def self.up
+    change_table :tasks do |t|
+      t.boolean :spam, :default => false
+    end
+    Task.update_all ["spam = ?", false]
+    add_index :tasks, [:spam]
+  end
+
+  def self.down
+    remove_column :tasks, :spam
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130711213046) do
+ActiveRecord::Schema.define(:version => 20131011164400) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -547,8 +547,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.datetime "created_at"
     t.string   "target_type"
     t.integer  "image_id"
+    t.boolean  "spam",                       :default => false
   end
+  add_index "tasks", ["spam"], :name => "index_tasks_on_spam"
+
   create_table "thumbnails", :force => true do |t|
     t.integer "size"
     t.string  "content_type"
@@ -0,0 +1,107 @@
+# All file presenters must extends `FilePresenter` not only to ensure the
+# same interface, but also to make `FilePresenter.for(file)` to work.
+class FilePresenter
+
+  # Will return a encapsulated `UploadedFile` or the same object if no
+  # one accepts it. That behave allow to give any model to this class,
+  # like a Article and have no trouble with that.
+  def self.for(f)
+    return f if f.is_a? FilePresenter
+    klass = FilePresenter.subclasses.sort_by {|class_name|
+      class_name.constantize.accepts?(f) || 0
+    }.last.constantize
+    klass.accepts?(f) ? klass.new(f) : f
+  end
+
+  def initialize(f)
+    @file = f
+  end
+
+  # Allows to use the original `UploadedFile` reference.
+  def encapsulated_file
+    @file
+  end
+
+  def id
+    @file.id
+  end
+
+  def reload
+    @file.reload
+    self
+  end
+
+  # This method must be overridden in subclasses.
+  #
+  # If the class accepts the file, return a number that represents the
+  # priority the class should be given to handle that file. Higher numbers
+  # mean higher priority.
+  #
+  # If the class does not accept the file, return false.
+  def self.accepts?(f)
+    nil
+  end
+
+  def short_description
+    _("File (%s)") % content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ @file.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    lambda do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+
+  # That makes the presenter to works like any other `UploadedFile` instance.
+  def method_missing(m, *args)
+    @file.send(m, *args)
+  end
+end
+
+# Preload FilePresenters to allow `FilePresenter.for()` to work
+Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -155,6 +155,7 @@ class Noosfero::Plugin
   # Here the developer may specify the events to which the plugins can
   # register and must return true or false. The default value must be false.
+  # Must also explicitly define its returning variables.
   # -> If true, noosfero will include plugin_dir/public/style.css into
   # application
@@ -162,10 +163,6 @@ class Noosfero::Plugin
     false
   end
-  # Here the developer should specify the events to which the plugins can
-  # register to. Must be explicitly defined its returning
-  # variables.
-
   # -> Adds buttons to the control panel
   # returns = { :title => title, :icon => icon, :url => url }
   #   title = name that will be displayed.
@@ -175,6 +172,13 @@ class Noosfero::Plugin
     nil
   end
+  # -> Customize profile block design and behavior
+  # (overwrites profile_image_link function)
+  # returns = lambda block that creates html code.
+  def profile_image_link(profile, size, tag, extra_info)
+    nil
+  end
+
   # -> Adds tabs to the profile
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
@@ -304,45 +308,16 @@ class Noosfero::Plugin
     scope
   end
-  # This method is called by the CommentHandler background job before sending
-  # the notification email. If the comment is marked as spam (i.e. by calling
-  # <tt>comment.spam!</tt>), then the notification email will *not* be sent.
-  #
-  # example:
-  #
-  #   def check_comment_for_spam(comment)
-  #     if anti_spam_service.is_spam?(comment)
-  #       comment.spam!
-  #     end
-  #   end
-  #
-  def check_comment_for_spam(comment)
+  # -> Allows plugins to check weather object is a spam
+  def check_for_spam(object)
   end
-  # This method is called when the user manually marks a comment as SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this comment as a confirmed spam.
-  #
-  # example:
-  #
-  #   def comment_marked_as_spam(comment)
-  #     anti_spam_service.train_with_spam(comment)
-  #   end
-  #
-  def comment_marked_as_spam(comment)
+  # -> Allows plugins to know when an object is marked as a spam
+  def marked_as_spam(object)
   end
-  # This method is called when the user manually marks a comment a NOT SPAM. A
-  # plugin implementing this method should train its spam detection mechanism
-  # by submitting this coimment as a confirmed ham.
-  #
-  # example:
-  #
-  #   def comment_marked_as_ham(comment)
-  #     anti_spam_service.train_with_ham(comment)
-  #   end
-  #
-  def comment_marked_as_ham(comment)
+  # -> Allows plugins to know when an object is marked as a ham
+  def marked_as_ham(object)
   end
   # Adds extra actions for comments
@@ -34,18 +34,20 @@ class Noosfero::Plugin::Manager
   alias :dispatch_scopes :dispatch_without_flatten
   def dispatch_first(event, *args)
-    result = nil
+    default = Noosfero::Plugin.new.send(event, *args)
+    result = default
     each do |plugin|
       result = plugin.send(event, *args)
-      break if result.present?
+      break if result != default
     end
     result
   end
   def fetch_first_plugin(event, *args)
+    default = Noosfero::Plugin.new.send(event, *args)
     result = nil
     each do |plugin|
-      if plugin.send(event, *args)
+      if plugin.send(event, *args) != default
         result = plugin.class
         break
       end
@@ -0,0 +1,13 @@
+Spammable.module_eval do
+  def marked_as_spam
+    plugins.dispatch(:marked_as_spam, self)
+  end
+
+  def marked_as_ham
+    plugins.dispatch(:marked_as_ham, self)
+  end
+
+  def check_for_spam
+    plugins.dispatch(:check_for_spam, self)
+  end
+end
@@ -0,0 +1,47 @@
+module Spammable
+  def self.included(recipient)
+    raise "This model should have a spam attribute!" if !recipient.new.respond_to?('spam=')
+    recipient.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def self.extended (base)
+      if base.respond_to?(:named_scope)
+        base.class_eval do
+          named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
+          named_scope :spam, :conditions => ['spam = ?', true]
+        end
+      end
+    end
+  end
+
+  def spam?
+    !spam.nil? && spam
+  end
+
+  def ham?
+    !spam.nil? && !spam
+  end
+
+  def spam!
+    before_spam!
+    self.spam = true
+    self.save!
+    after_spam!
+    self
+  end
+
+  def ham!
+    before_ham!
+    self.spam = false
+    self.save!
+    after_ham!
+    self
+  end
+
+  def after_spam!; end
+  def before_spam!; end
+
+  def after_ham!; end
+  def before_ham!; end
+end
@@ -5,38 +5,37 @@ class AntiSpamPlugin &lt; Noosfero::Plugin
   end
   def self.plugin_description
-    _("Checks comments against a spam checking service compatible with the Akismet API")
+    _("Tests comments and suggested articles against a spam checking service compatible with the Akismet API")
   end
   def self.host_default_setting
     'api.antispam.typepad.com'
   end
-  def check_comment_for_spam(comment)
-    if rakismet_call(comment, :spam?)
-      comment.spam = true
-      comment.save!
+  def check_for_spam(object)
+    if rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam?
+      object.spam = true
+      object.save!
     end
   end
-  def comment_marked_as_spam(comment)
-    rakismet_call(comment, :spam!)
+  def marked_as_spam(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :spam!
   end
-  def comment_marked_as_ham(comment)
-    rakismet_call(comment, :ham!)
+  def marked_as_ham(object)
+    rakismet_call AntiSpamPlugin::Wrapper.wrap(object), object.environment, :ham!
   end
   protected
-  def rakismet_call(comment, op)
-    settings = Noosfero::Plugin::Settings.new(comment.environment, self.class)
+  def rakismet_call(submission, environment, op)
+    settings = Noosfero::Plugin::Settings.new(environment, self.class)
     Rakismet.host = settings.host
     Rakismet.key = settings.api_key
-    Rakismet.url = comment.environment.top_url
+    Rakismet.url = environment.top_url
-    submission = AntiSpamPlugin::CommentWrapper.new(comment)
     submission.send(op)
   end
-class AntiSpamPlugin::CommentWrapper < Struct.new(:comment)
-
-  delegate :author_name, :author_email, :title, :body, :ip_address, :user_agent, :referrer, :to => :comment
-
-  include Rakismet::Model
-
-  alias :author :author_name
-  alias :user_ip :ip_address
-  alias :content :body
-
+class AntiSpamPlugin::CommentWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :author_name
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :body
+
+  def self.wraps?(object)
+    object.kind_of?(Comment)
+  end
 end
@@ -0,0 +1,10 @@
+class AntiSpamPlugin::SuggestArticleWrapper < AntiSpamPlugin::Wrapper
+  alias_attribute :author, :name
+  alias_attribute :author_email, :email
+  alias_attribute :user_ip, :ip_address
+  alias_attribute :content, :article_body
+
+  def self.wraps?(object)
+    object.kind_of?(SuggestArticle)
+  end
+end
@@ -0,0 +1,18 @@
+class AntiSpamPlugin::Wrapper < SimpleDelegator
+  include Rakismet::Model
+
+  @@wrappers = []
+
+  def self.wrap(object)
+    wrapper = @@wrappers.find { |wrapper| wrapper.wraps?(object) }
+    wrapper ? wrapper.new(object) : object
+  end
+
+  def self.wraps?(object)
+    false
+  end
+
+  def self.inherited(child)
+    @@wrappers << child
+  end
+end
 require 'test_helper'
-class AntiSpamPluginCommentWrapperTest < ActiveSupport::TestCase
+class AntiSpamPlugin::CommentWrapperTest < ActiveSupport::TestCase
   def setup
     @comment = Comment.new(
@@ -15,10 +15,6 @@ class AntiSpamPluginCommentWrapperTest &lt; ActiveSupport::TestCase
     @wrapper = AntiSpamPlugin::CommentWrapper.new(@comment)
   end
-  should 'use Rakismet::Model' do
-    assert_includes @wrapper.class.included_modules, Rakismet::Model
-  end
-
   should 'get contents' do
     assert_equal @comment.body, @wrapper.content
   end
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class AntiSpamPlugin::SuggestArticleWrapperTest < ActiveSupport::TestCase
+
+  def setup
+    @suggest_article = SuggestArticle.new(
+      :article_body => 'comment body',
+      :name => 'author',
+      :email => 'foo@example.com',
+      :ip_address => '1.2.3.4',
+      :user_agent => 'Some Good Browser (I hope)',
+      :referrer => 'http://noosfero.org/'
+    )
+    @wrapper = AntiSpamPlugin::SuggestArticleWrapper.new(@suggest_article)
+  end
+
+  should 'get contents' do
+    assert_equal @suggest_article.article_body, @wrapper.content
+  end
+
+  should 'get author name' do
+    assert_equal @suggest_article.name, @wrapper.author
+  end
+
+  should 'get author email' do
+    assert_equal @suggest_article.email, @wrapper.author_email
+  end
+
+  should 'get IP address' do
+    assert_equal @suggest_article.ip_address, @wrapper.user_ip
+  end
+
+  should 'get User-Agent' do
+    assert_equal @suggest_article.user_agent, @wrapper.user_agent
+  end
+
+  should 'get get Referrer' do
+    assert_equal @suggest_article.referrer, @wrapper.referrer
+  end
+
+end
@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'anti_spam_plugin/wrapper'
+
+class AntiSpamPluginWrapperTest < ActiveSupport::TestCase
+  should 'use Rakismet::Model' do
+    wrapped = AntiSpamPlugin::Wrapper.new(mock)
+    assert_includes wrapped.class.included_modules, Rakismet::Model
+  end
+
+  should 'wrap object according to wraps? method' do
+    class EvenWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 == 0
+      end
+    end
+    class OddWrapper < AntiSpamPlugin::Wrapper
+      def self.wraps?(object)
+        object % 2 != 0
+      end
+    end
+
+    assert AntiSpamPlugin::Wrapper.wrap(5).kind_of?(OddWrapper)
+    assert AntiSpamPlugin::Wrapper.wrap(6).kind_of?(EvenWrapper)
+  end
+end
@@ -2,35 +2,36 @@ require &#39;test_helper&#39;
 class AntiSpamPluginTest < ActiveSupport::TestCase
-  def setup
-    profile = fast_create(Profile)
-    article = fast_create(TextileArticle, :profile_id => profile.id)
-    @comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+  class SpammableContent
+    attr_accessor :spam
+    include Spammable
-    @settings = Noosfero::Plugin::Settings.new(@comment.environment, AntiSpamPlugin)
-    @settings.api_key = 'b8b80ddb8084062d0c9119c945ce3bc3'
-    @settings.save!
+    def save!; end
+    def environment; Environment.default; end
+  end
+  def setup
+    @spammable = SpammableContent.new
     @plugin = AntiSpamPlugin.new
-    @plugin.context = @comment
   end
-  should 'check for spam and mark comment as spam if server says it is spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam?).returns(true)
-    @comment.expects(:save!)
+  attr_accessor :spammable
-    @plugin.check_comment_for_spam(@comment)
-    assert @comment.spam
-  end
+  should 'check for spam and mark as spam if server says it is spam' do
+    spammable.expects(:spam?).returns(true)
+    spammable.expects(:save!)
-  should 'report spam' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:spam!)
-    @plugin.comment_marked_as_spam(@comment)
+    @plugin.check_for_spam(spammable)
+    assert spammable.spam
   end
-  should 'report ham' do
-    AntiSpamPlugin::CommentWrapper.any_instance.expects(:ham!)
-    @plugin.comment_marked_as_ham(@comment)
+  should 'report comment spam' do
+    spammable.expects(:spam!)
+    @plugin.marked_as_spam(spammable)
   end
+  should 'report comment ham' do
+    spammable.expects(:ham!)
+    @plugin.marked_as_ham(spammable)
+  end
 end
@@ -0,0 +1,10 @@
+class FilePresenter::Video < FilePresenter
+  def self.accepts?(f)
+    return nil if !f.respond_to?(:content_type) || f.content_type.nil?
+    ( f.content_type[0..4] == 'video' ) ? 10 : nil
+  end
+
+  def short_description
+    _('Video (%s)') % content_type.split('/')[1].upcase
+  end
+end
@@ -0,0 +1,13 @@
+class Html5VideoPlugin < Noosfero::Plugin
+
+  FilePresenter::Video
+
+  def self.plugin_name
+    "HTML5 Video"
+  end
+
+  def self.plugin_description
+    _("A plugin to enable the video suport, with auto conversion for the web.")
+  end
+
+end
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require 'content_viewer_controller'
+
+class ContentViewerController
+  # Re-raise errors caught by the controller.
+  def rescue_action(e) raise e end
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  all_fixtures
+
+  def setup
+    @controller = ContentViewerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @profile = create_user('testinguser').person
+    @environment = @profile.environment
+  end
+  attr_reader :profile, :environment
+
+  should 'add html5 video tag to the page of file type video' do
+    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'video/ogg'), :profile => profile)
+    get :view_page, file.url.merge(:view=>:true)
+    assert_select '#article video'
+  end
+
+end
@@ -0,0 +1,8 @@
+<video class="video-js vjs-default-skin" controls poster="video.jpg" preload="auto" data-setup="{}">
+  <source type="video/ogg" src="<%= video.public_filename %>"/>
+</video>
+
+<div class="uploaded-file-description <%= 'empty' if video.abstract.blank? %>">
+  <%= video.abstract %>
+</div>
+
@@ -1,52 +0,0 @@
-.msie6 .icon-edit      { background-image: url(ie6/Tango/16x16/apps/text-editor.gif) }
-.msie6 .icon-home      { background-image: url(ie6/Tango/16x16/actions/go-home.gif)          }
-.msie6 .icon-new,
-.msie6 .icon-suggest   { background-image: url(ie6/Tango/16x16/actions/filenew.gif)              }
-.msie6 .icon-close     { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-newfolder { background-image: url(ie6/Tango/16x16/actions/folder-new.gif) }
-.msie6 .icon-save      { background-image: url(ie6/Tango/16x16/actions/filesave.gif)             }
-.msie6 .icon-send      { background-image: url(ie6/Tango/16x16/actions/stock_mail-forward.gif)             }
-.msie6 .icon-cancel    { background-image: url(ie6/Tango/16x16/actions/gtk-cancel.gif)           }
-.msie6 .icon-person    { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)           }
-.msie6 .icon-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-delete    { background-image: url(ie6/Tango/16x16/places/user-trash.gif) }
-.msie6 .icon-back      { background-image: url(ie6/Tango/16x16/actions/back.gif)          }
-.msie6 .icon-next      { background-image: url(ie6/Tango/16x16/actions/go-next.gif)  }
-.msie6 .icon-add       { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-more      { background-image: url(ie6/Tango/16x16/actions/add.gif)              }
-.msie6 .icon-up        { background-image: url(ie6/Tango/16x16/actions/go-up.gif)            }
-.msie6 .icon-down      { background-image: url(ie6/Tango/16x16/actions/go-down.gif)          }
-.msie6 .icon-left      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif)          }
-.msie6 .icon-right     { background-image: url(ie6/Tango/16x16/actions/go-next.gif)         }
-.msie6 .icon-up-disabled        { background-image: url(ie6/Tango/16x16/actions/go-up.gif); opacity: 0.25; filter:alpha(opacity=25); }
-.msie6 .icon-down-disabled      { background-image: url(ie6/Tango/16x16/actions/go-down.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-left-disabled      { background-image: url(ie6/Tango/16x16/actions/go-previous.gif); opacity: 0.25; filter:alpha(opacity=25);          }
-.msie6 .icon-right-disabled     { background-image: url(ie6/Tango/16x16/actions/go-next.gif); opacity: 0.25; filter:alpha(opacity=25);         }
-.msie6 .icon-up-red    { background-image: url(ie6/mod/16x16/actions/go-up-red.gif)        }
-.msie6 .icon-forward   { background-image: url(ie6/Tango/16x16/actions/go-next.gif)       }
-.msie6 .icon-search    { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-ok        { background-image: url(ie6/Tango/16x16/actions/media-playback-start.gif)               }
-.msie6 .icon-login     { background-image: url(ie6/mod/16x16/actions/log-in.gif)              }
-.msie6 .icon-help      { background-image: url(ie6/Tango/16x16/apps/gnome-help.gif)                }
-.msie6 .icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.msie6 .icon-help32on  { background-image: url(ie6/Tango/32x32/apps/gnome-help.gif)    }
-.msie6 .icon-help32off { background-image: url(ie6/mod/32x32/apps/gnome-help-red.gif)   }
-.msie6 .icon-spread    { background-image: url(ie6/mod/16x16/actions/spread.gif) }
-.msie6 .icon-todo            { background-image: url(ie6/Tango/16x16/actions/stock_paste.gif)          }
-.msie6 .icon-eyes            { background-image: url(ie6/Tango/16x16/actions/gtk-print-preview.gif)          }
-.msie6 .icon-menu-home       { background-image: url(ie6/Tango/16x16/actions/go-home.gif)             }
-.msie6 .icon-menu-product    { background-image: url(ie6/Tango/16x16/mimetypes/package.gif)          }
-.msie6 .icon-menu-enterprise { background-image: url(ie6/Tango/16x16/actions/go-home.gif)       }
-.msie6 .icon-menu-community  { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)        }
-.msie6 .icon-menu-ctrl-panel { background-image: url(ie6/Tango/16x16/categories/preferences-desktop.gif)          }
-.msie6 .icon-menu-admin      { background-image: url(ie6/Tango/16x16/categories/preferences-system.gif)          }
-.msie6 .icon-menu-my-groups { background-image: url(ie6/Tango/16x16/apps/system-config-users.gif)    }
-.msie6 .icon-menu-login      { background-image: url(ie6/mod/16x16/actions/log-in.gif)            }
-.msie6 .icon-menu-logout     { background-image: url(ie6/Tango/16x16/actions/exit.gif)             }
-.msie6 .icon-menu-search     { background-image: url(ie6/Tango/16x16/actions/search.gif)           }
-.msie6 .icon-menu-events     { background-image: url(ie6/Tango/16x16/mimetypes/stock_calendar.gif)         }
-.msie6 .icon-menu-articles   { background-image: url(ie6/Tango/16x16/apps/text-editor.gif)             }
-.msie6 .icon-menu-people     { background-image: url(ie6/mod/16x16/apps/user.gif)            }
-.msie6 .icon-menu-mail       { background-image: url(ie6/Tango/16x16/apps/email.gif)             }
-.msie6 .icon-upload-file     { background-image: url(ie6/Tango/16x16/actions/filesave.gif)            }
-.msie6 .icon-slideshow       { background-image: url(ie6/Tango/16x16/mimetypes/x-office-presentation.gif)           }
-@import url(ie6.css);
-
 /******************SMALL ICONS********************/
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
-.icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
+.icon-home      { background-image: url(Tango/16x16/actions/go-home.png) }
 .icon-new,
-.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png)              }
-.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
+.icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png) }
+.icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
 .icon-folder    { background-image: url(Tango/16x16/places/folder.png) }
-.icon-parent-folder    { background-image: url(Tango/16x16/places/folder_home.png) }
+.icon-parent-folder { background-image: url(Tango/16x16/places/folder_home.png) }
 .icon-newblog   { background-image: url(mod/16x16/apps/text-editor.png) }
 .icon-blog      { background-image: url(mod/16x16/apps/text-editor.png) }
-/*.icon-open      { background-image: url(folder-open.gif)         } UNUSED*/
-/*.icon-cms       { background-image: url(abiword_48.png)          } UNUSED*/
-.icon-save      { background-image: url(Tango/16x16/actions/filesave.png)             }
-.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png)             }
-.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png)           }
-.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png)           }
-.icon-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
+/*.icon-open    { background-image: url(folder-open.gif) } UNUSED*/
+/*.icon-cms     { background-image: url(abiword_48.png) } UNUSED*/
+.icon-save      { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-send      { background-image: url(Tango/16x16/actions/stock_mail-forward.png) }
+.icon-cancel    { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-person    { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-product   { background-image: url(Tango/16x16/mimetypes/package.png) }
 .icon-delete    { background-image: url(Tango/16x16/places/user-trash.png) }
-/*.icon-find      { background-image: url(noosfero-find.png)       } UNUSED*/
-.icon-back      { background-image: url(Tango/16x16/actions/back.png)          }
-.icon-next      { background-image: url(Tango/16x16/actions/go-next.png)  }
-.icon-add       { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png)              }
-.icon-more      { background-image: url(Tango/16x16/actions/add.png)              }
-.icon-up        { background-image: url(Tango/16x16/actions/go-up.png)            }
-.icon-down      { background-image: url(Tango/16x16/actions/go-down.png)          }
-.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png)          }
-.icon-right     { background-image: url(Tango/16x16/actions/go-next.png)         }
-.icon-up-disabled        { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
-.icon-down-disabled      { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-left-disabled      { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25);          }
-.icon-right-disabled     { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25);         }
-.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png)        }
-.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png)       }
-.icon-search    { background-image: url(Tango/16x16/actions/search.png)           }
-.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png)               }
-.icon-login     { background-image: url(mod/16x16/actions/log-in.png)              }
-.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png)                }
-.icon-firefox   { background-image: url(firefox-24x24.gif)       }
-.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png)    }
-.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png)   }
+/*.icon-find    { background-image: url(noosfero-find.png) } UNUSED*/
+.icon-back      { background-image: url(Tango/16x16/actions/back.png) }
+.icon-next      { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-add       { background-image: url(Tango/16x16/actions/add.png) }
+.icon-remove    { background-image: url(Tango/16x16/actions/gtk-remove.png) }
+.icon-more      { background-image: url(Tango/16x16/actions/add.png) }
+.icon-up        { background-image: url(Tango/16x16/actions/go-up.png) }
+.icon-down      { background-image: url(Tango/16x16/actions/go-down.png) }
+.icon-left      { background-image: url(Tango/16x16/actions/go-previous.png) }
+.icon-right     { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-up-disabled    { background-image: url(Tango/16x16/actions/go-up.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-down-disabled  { background-image: url(Tango/16x16/actions/go-down.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-left-disabled  { background-image: url(Tango/16x16/actions/go-previous.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-right-disabled { background-image: url(Tango/16x16/actions/go-next.png); opacity: 0.25; filter:alpha(opacity=25); }
+.icon-up-red    { background-image: url(mod/16x16/actions/go-up-red.png) }
+.icon-forward   { background-image: url(Tango/16x16/actions/go-next.png) }
+.icon-search    { background-image: url(Tango/16x16/actions/search.png) }
+.icon-ok        { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-login     { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-help      { background-image: url(Tango/16x16/apps/gnome-help.png) }
+.icon-firefox   { background-image: url(firefox-24x24.gif) }
+.icon-help32on  { background-image: url(Tango/32x32/apps/gnome-help.png) }
+.icon-help32off { background-image: url(mod/32x32/apps/gnome-help-red.png) }
 .icon-spread    { background-image: url(mod/16x16/actions/spread.png) }
-.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png)          }
-.icon-eyes            { background-image: url(Tango/16x16/actions/gtk-print-preview.png)          }
-/*.icon-menu-           { background-image: url(menu-without-ico-HC.gif) }*/
-.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png)             }
-/*.icon-menu-blog       { background-image: url(blog-HC.gif)             } UNUSED*/
-/*.icon-menu-album      { background-image: url(album-HC.gif)            } UNUSED*/
-.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png)          }
-.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png)       }
-.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png)        }
-/*.icon-menu-edit       { background-image: url(edit-HC.gif)             } UNUSED */
-.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png)          }
-.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png)          }
-.icon-menu-my-groups { background-image: url(Tango/16x16/apps/system-config-users.png)    }
-.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png)            }
-.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png)             }
-.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png)           }
-/*.icon-menu-ed-design  { background-image: url(edit-design-HC.gif)      } UNUSED */
-.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-event     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-newevent     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png)         }
-.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png)             }
-/*.icon-menu-comments   { background-image: url(blog-HC.gif)             } UNUSED */
-.icon-menu-people     { background-image: url(mod/16x16/apps/user.png)            }
-.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png)             }
-.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-newupload-file     { background-image: url(Tango/16x16/actions/filesave.png)            }
-.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png)           }
+.icon-todo            { background-image: url(Tango/16x16/actions/stock_paste.png) }
+.icon-eyes            { background-image: url(Tango/16x16/actions/find.png) }
+/*.icon-menu-         { background-image: url(menu-without-ico-HC.gif) }*/
+.icon-menu-home       { background-image: url(Tango/16x16/actions/go-home.png) }
+/*.icon-menu-blog     { background-image: url(blog-HC.gif) } UNUSED*/
+/*.icon-menu-album    { background-image: url(album-HC.gif) } UNUSED*/
+.icon-menu-product    { background-image: url(Tango/16x16/mimetypes/package.png) }
+.icon-menu-enterprise { background-image: url(Tango/16x16/actions/go-home.png) }
+.icon-menu-community  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+/*.icon-menu-edit     { background-image: url(edit-HC.gif) } UNUSED */
+.icon-menu-ctrl-panel { background-image: url(Tango/16x16/categories/preferences-desktop.png) }
+.icon-menu-admin      { background-image: url(Tango/16x16/categories/preferences-system.png) }
+.icon-menu-my-groups  { background-image: url(Tango/16x16/apps/system-config-users.png) }
+.icon-menu-login      { background-image: url(mod/16x16/actions/log-in.png) }
+.icon-menu-logout     { background-image: url(mod/16x16/actions/log-out.png) }
+.icon-menu-search     { background-image: url(Tango/16x16/actions/search.png) }
+/*.icon-menu-ed-design { background-image: url(edit-design-HC.gif) } UNUSED */
+.icon-menu-events     { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-event           { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-newevent        { background-image: url(Tango/16x16/mimetypes/stock_calendar.png) }
+.icon-menu-articles   { background-image: url(Tango/16x16/apps/text-editor.png) }
+/*.icon-menu-comments { background-image: url(blog-HC.gif) } UNUSED */
+.icon-menu-people     { background-image: url(mod/16x16/apps/user.png) }
+.icon-menu-mail       { background-image: url(Tango/16x16/apps/email.png) }
+.icon-upload-file     { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-newupload-file  { background-image: url(Tango/16x16/actions/filesave.png) }
+.icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
 .icon-photos          { background-image: url(Tango/16x16/devices/camera-photo.png) }
-.icon-text-html          { background-image: url(Tango/16x16/mimetypes/text-html.png) }
+.icon-text-html       { background-image: url(Tango/16x16/mimetypes/text-html.png) }
 .icon-text-plain      { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }
-.icon-image-svg-xml      { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
+.icon-image-svg-xml   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-application-octet-stream { background-image: url(Tango/16x16/mimetypes/binary.png) }
-.icon-application-x-gzip { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
-.icon-application-postscript { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
-.icon-application-pdf   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
-.icon-application-ogg   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
-.icon-video-mpeg   { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
-.icon-application-vnd-oasis-opendocument-text  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
+.icon-application-x-gzip       { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-x-gzip.png) }
+.icon-application-postscript   { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-postscript.png) }
+.icon-application-pdf          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-pdf.png) }
+.icon-application-ogg          { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-ogg.png) }
+.icon-video, .icon-video-mpeg  { background-image: url(Tango/16x16/mimetypes/video-x-generic.png) }
+.icon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
 .icon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
-.icon-application-vnd-oasis-opendocument-presentation  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
+.icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
-.icon-media-pause      { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
-.icon-media-play       { background-image: url(Tango/16x16/actions/media-playback-start.png) }
-.icon-media-prev       { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
-.icon-media-next       { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
+.icon-media-pause  { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
+.icon-media-play   { background-image: url(Tango/16x16/actions/media-playback-start.png) }
+.icon-media-prev   { background-image: url(Tango/16x16/actions/media-skip-backward.png) }
+.icon-media-next   { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
 .icon-lock	       { background-image: url(Tango/16x16/actions/lock.png) }
-.icon-chat             { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
-.icon-reply            { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
-.icon-newforum   { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
-.icon-forum      { background-image: url(Tango/16x16/apps/system-users.png) }
-.icon-gallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
+.icon-chat         { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
+.icon-reply        { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
+.icon-newforum     { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
+.icon-forum        { background-image: url(Tango/16x16/apps/system-users.png) }
+.icon-gallery      { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-newgallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
-.icon-locale           { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
-.icon-user-removed           { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
-.icon-user-unknown           { background-image: url(Tango/16x16/status/dialog-error.png) }
-.icon-alert           { background-image: url(Tango/16x16/status/dialog-warning.png) }
+.icon-locale       { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) }
+.icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
+.icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) }
+.icon-alert        { background-image: url(Tango/16x16/status/dialog-warning.png) }
 /******************LARGE ICONS********************/
-.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) }
-.image-gallery-item .gallery   { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
+.image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
+.image-gallery-item .gallery { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
@@ -89,7 +89,7 @@ body, th, td, input {
   color: #555753;
 }
-#controlpanel, #logout, #openchat, #manage-enterprises {
+#controlpanel, #logout, #openchat, .manage-groups {
   margin-left: 25px;
 }
@@ -822,12 +822,6 @@ div#notice {
   margin-bottom: 0px;
 }
-X.sep {
-  background: url(imgs/blog-sep.png) 50% 50% repeat-x;
-  padding: 10px 20px;
-  margin: 10px -19px;
-}
-
 /* ==> search-results.css <== */
@@ -1019,6 +1013,46 @@ hr.pre-posts, hr.sep-posts {
   background: transparent;
 }
+/************* uploaded file *****************/
+
+#article .gallery-navigation {
+  padding: 10px 0;
+}
+
+#article .gallery-navigation .previous {
+  margin-right: 10px;
+}
+
+#article .gallery-navigation .next {
+  margin-left: 10px;
+}
+
+#article .gallery-navigation .total-of-images {
+  font-weight: bold;
+}
+
+#article .uploaded-file-description {
+  background: #f6f6f6;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  padding: 1em;
+}
+#article .uploaded-file-description.empty {
+  display: none;
+}
+
+#article.file-generic .download-link {
+  display: block;
+  margin-bottom: 10px;
+}
+#article.file-generic .download-link span {
+  font-size: 150%;
+  padding-right: 5px;
+}
+#article.file-generic .download-link a {
+  font-size: 180%;
+  text-decoration: none;
+}
 /**************************** Comments *******************************/
@@ -709,7 +709,7 @@ jQuery(function($) {
       document.location.href = this.href;
     })
   }
-  $('#manage-enterprises-link').live('click', function() {
+  $('.manage-groups > a').live('click', function() {
     toggleMenu(this);
     return false;
   });
@@ -0,0 +1,28 @@
+function removeTaskBox(button, url, task_box_id, msg) {
+  var $ = jQuery;
+  if (msg && !confirm(msg)) {
+    return;
+  }
+  button = $(button);
+  button.addClass('task-button-loading');
+  $.post(url, function (data) {
+    if (data.ok) {
+      $('#' + task_box_id).slideUp();
+    } else {
+      button.removeClass('task-button-loading');
+      button.addClass('task-button-failure');
+    }
+  });
+}
+
+function toggleDetails(link, msg_hide, msg_show) {
+  var $ = jQuery;
+  $(link).toggleClass('icon-up icon-down');
+  details = $(link).closest('.task_box').find('.suggest-article-details');
+  if (details.css('display') == 'none') {
+    link.innerHTML = msg_hide;
+  } else {
+    link.innerHTML = msg_show;
+  }
+  details.slideToggle();
+}
@@ -882,6 +882,40 @@ code input {
 .webkit #manage-enterprises .simplemenu-submenu {
   top: 20px;
 }
+#manage-communities {
+  display: inline-block;
+  margin-right: 5px;
+  position: relative;
+}
+#manage-communities .ui-icon {
+  position: absolute;
+  top: 0;
+  right: -20px;
+}
+#manage-communities .simplemenu-submenu {
+  text-align: left;
+  left: -20px;
+  width: 200px;
+}
+#manage-communities .simplemenu-item {
+  padding: 5px 0;
+}
+#manage-communities .simplemenu-item a {
+  background-repeat: no-repeat;
+  padding-left: 20px;
+}
+#manage-communities .simplemenu-item a span {
+  display: none;
+}
+.msie8 #manage-communities-link { /* IE8 hack */
+  border: 0px solid;
+}
+.msie8 #manage-communities .simplemenu-submenu {
+  top: 16px;
+}
+.webkit #manage-communities .simplemenu-submenu {
+  top: 20px;
+}
 #article {
   position: relative;
   text-align: justify;
@@ -1552,6 +1586,7 @@ a.button.disabled, input.disabled {
 .map {
   clear: both;
 }
+
 /***********************************************************
  * style for blocks 
  ***********************************************************/
@@ -3176,6 +3211,14 @@ table.cms-articles .icon:hover {
   background: #eeeeec;
   border: 1px solid #d3d7cf;
 }
+
+.controller-cms .article-mime {
+  max-width: 90px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .controller-cms .article-controls {
   white-space: nowrap;
 }
@@ -3446,26 +3489,7 @@ div#article-parent {
 .article-body-uploaded-file {
   text-align: center;
 }
-/************* uploaded file *****************/
-#article .gallery-navigation {
-  padding: 10px 0;
-}
-#article .gallery-navigation .left {
-  margin-right: 10px;
-}
-#article .gallery-navigation .right {
-  margin-left: 10px;
-}
-#article .gallery-navigation .total-of-images {
-  font-weight: bold;
-}
-#article .uploaded-file-description {
-  background: #f6f6f6;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  padding: 1em;
-}
 /* ==> public/stylesheets/controller_events.css <== */
 #agenda {
   position: relative;
 #!/bin/sh
+set -e
+
 export RAILS_ENV=development
 stop() {
@@ -9,6 +11,7 @@ stop() {
 }
 start() {
+  rake db:abort_if_pending_migrations
   ./script/feed-updater start
   ./script/delayed_job start
   trap stop INT TERM
@@ -940,8 +940,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
@@ -951,8 +951,8 @@ class CmsControllerTest &lt; ActionController::TestCase
                :article => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
     process_delayed_job_queue
-    file = profile.articles.find_by_name('rails.png')
-    assert File.exists?(file.class.icon_name(file))
+    file = FilePresenter.for profile.articles.find_by_name('rails.png')
+    assert File.exists?(file.icon_name)
     file.destroy
   end
	@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the		@@ -52,3 +52,12 @@ If you write such script for your own OS, please share it with us at the
52	development mailing list so that we can include it in the official repository.	52	development mailing list so that we can include it in the official repository.
53	This way other people using the same OS will have to put less effort to develop	53	This way other people using the same OS will have to put less effort to develop
54	Noosfero.	54	Noosfero.
		55	+
		56	+== Submitting your changes back
		57	+
		58	+For now please read:
		59	+
		60	+- Coding conventions
		61	+ http://noosfero.org/Development/CodingConventions
		62	+- Patch guidelines
		63	+ http://noosfero.org/Development/PatchGuidelines
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-This is a draft of how to create a environment to Rails 2.3.5 to Noosfero
2	-development.
3	-
4	-Install dependencies:
5	-
6	-gem install rails -v 2.3.5
7	-gem install i18n
8	-gem install will_paginate -v 2.3.12
9	-gem install cucumber
10	-
11	-Creating initial environment:
12	-
13	-rake db:schema:load
1	-noosfero - a web-based social platform	1	+Noosfero - a web-based social platform
2	======================================	2	======================================
3		3
4	-:: About the project	4	+http://www.noosfero.org/
5		5
6	-Homepage: http://www.noosfero.org/	6	+Documentation
		7	+-------------
7		8
8	-:: Authors and copyright	9	+The following documentation is available:
9		10
10	-Authors: see file AUTHORS
11	-Copyright information: see file COPYRIGHT
12	-Full license text; see file COPYING	11	+File Purpose
		12	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		13	+INSTALL install instructions
		14	+INSTALL.awstats install instructions - access statistics service
		15	+INSTALL.chat install instructions - chat service
		16	+INSTALL.email install instructions - email service
		17	+INSTALL.multitenancy install instructions - multiple sites
		18	+INSTALL.varnish install instructions - varnish HTTP caching (recommended)
		19	+HACKING development instruction
		20	+RELEASING instructions for doing releases
		21	+doc/noosfero/* user documentation (available through the app itself)
		22	+
		23	+
		24	+Authors and copyright
		25	+---------------------
		26	+
		27	+Authorship and copyright information is available in the files listed below.
		28	+
		29	+File Purpose
		30	+~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		31	+AUTHORS list of authors (updated at each release)
		32	+COPYRIGHT Copyright statement for the project
		33	+COPYING Full text of the project license
	@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController		@@ -4,7 +4,7 @@ class ProfileEditorController < MyProfileController
4	protect 'destroy_profile', :profile, :only => [:destroy_profile]	4	protect 'destroy_profile', :profile, :only => [:destroy_profile]
5		5
6	def index	6	def index
7	- @pending_tasks = Task.to(profile).pending.select{\|i\| user.has_permission?(i.permission, profile)}	7	+ @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}
8	end	8	end
9		9
10	helper :profile	10	helper :profile
	@@ -4,12 +4,12 @@ class TasksController < MyProfileController		@@ -4,12 +4,12 @@ class TasksController < MyProfileController
4		4
5	def index	5	def index
6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]	6	@filter = params[:filter_type].blank? ? nil : params[:filter_type]
7	- @tasks = Task.to(profile).pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])	7	+ @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
8	@failed = params ? params[:failed] : {}	8	@failed = params ? params[:failed] : {}
9	end	9	end
10		10
11	def processed	11	def processed
12	- @tasks = Task.to(profile).closed.sort_by(&:created_at)	12	+ @tasks = Task.to(profile).without_spam.closed.sort_by(&:created_at)
13	end	13	end
14		14
15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]	15	VALID_DECISIONS = [ 'finish', 'cancel', 'skip' ]
	@@ -57,7 +57,7 @@ class TasksController < MyProfileController		@@ -57,7 +57,7 @@ class TasksController < MyProfileController
57	end	57	end
58		58
59	def list_requested	59	def list_requested
60	- @tasks = Task.find_all_by_requestor_id(profile.id)	60	+ @tasks = Task.without_spam.find_all_by_requestor_id(profile.id)
61	end	61	end
62		62
63	def ticket_details	63	def ticket_details
	@@ -42,7 +42,7 @@ module BlogHelper		@@ -42,7 +42,7 @@ module BlogHelper
42		42
43	def display_post(article, format = 'full')	43	def display_post(article, format = 'full')
44	no_comments = (format == 'full') ? false : true	44	no_comments = (format == 'full') ? false : true
45	- html = send("display_#{format}_format", article).html_safe	45	+ html = send("display_#{format}_format", FilePresenter.for(article)).html_safe
46		46
47	article_title(article, :no_comments => no_comments) + html	47	article_title(article, :no_comments => no_comments) + html
48	end	48	end
	@@ -33,7 +33,7 @@ module CmsHelper		@@ -33,7 +33,7 @@ module CmsHelper
33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)	33	link_to article_name, {:action => 'view', :id => article.id}, :class => icon_for_article(article)
34	else	34	else
35	if article.image?	35	if article.image?
36	- image_tag(icon_for_article(article)) + link_to(article_name, article.url)	36	+ image_tag(icon_for_article(article)) + link_to(article_name, article.url)
37	else	37	else
38	link_to article_name, article.url, :class => icon_for_article(article)	38	link_to article_name, article.url, :class => icon_for_article(article)
39	end	39	end
	@@ -17,7 +17,7 @@ module ContentViewerHelper		@@ -17,7 +17,7 @@ module ContentViewerHelper
17	title = article.display_title if article.kind_of?(UploadedFile) && article.image?	17	title = article.display_title if article.kind_of?(UploadedFile) && article.image?
18	title = article.title if title.blank?	18	title = article.title if title.blank?
19	title = content_tag('h1', h(title), :class => 'title')	19	title = content_tag('h1', h(title), :class => 'title')
20	- if article.belongs_to_blog?	20	+ if article.belongs_to_blog? \|\| article.belongs_to_forum?
21	unless args[:no_link]	21	unless args[:no_link]
22	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')	22	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
23	end	23	end
	@@ -12,7 +12,7 @@ class ArticleBlock < Block		@@ -12,7 +12,7 @@ class ArticleBlock < Block
12	block = self	12	block = self
13	lambda do	13	lambda do
14	block_title(block.title) +	14	block_title(block.title) +
15	- (block.article ? article_to_html(block.article,	15	+ (block.article ? article_to_html(FilePresenter.for(block.article),
16	:gallery_view => false,	16	:gallery_view => false,
17	:inside_block => block, # For Blogs and folders	17	:inside_block => block, # For Blogs and folders
18	:format => block.visualization_format # For Articles and contents	18	:format => block.visualization_format # For Articles and contents
	@@ -16,9 +16,7 @@ class Comment < ActiveRecord::Base		@@ -16,9 +16,7 @@ class Comment < ActiveRecord::Base
16	has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy	16	has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
17	belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'	17	belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
18		18
19	- named_scope :without_spam, :conditions => ['spam IS NULL OR spam = ?', false]
20	named_scope :without_reply, :conditions => ['reply_of_id IS NULL']	19	named_scope :without_reply, :conditions => ['reply_of_id IS NULL']
21	- named_scope :spam, :conditions => ['spam = ?', true]
22		20
23	# unauthenticated authors:	21	# unauthenticated authors:
24	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })	22	validates_presence_of :name, :if => (lambda { \|record\| !record.email.blank? })
	@@ -108,6 +106,17 @@ class Comment < ActiveRecord::Base		@@ -108,6 +106,17 @@ class Comment < ActiveRecord::Base
108		106
109	include Noosfero::Plugin::HotSpot	107	include Noosfero::Plugin::HotSpot
110		108
		109	+ include Spammable
		110	+
		111	+ def after_spam!
		112	+ SpammerLogger.log(ip_address, self)
		113	+ Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
		114	+ end
		115	+
		116	+ def after_ham!
		117	+ Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
		118	+ end
		119	+
111	def verify_and_notify	120	def verify_and_notify
112	check_for_spam	121	check_for_spam
113	unless spam?	122	unless spam?
	@@ -115,10 +124,6 @@ class Comment < ActiveRecord::Base		@@ -115,10 +124,6 @@ class Comment < ActiveRecord::Base
115	end	124	end
116	end	125	end
117		126
118	- def check_for_spam
119	- plugins.dispatch(:check_comment_for_spam, self)
120	- end
121	-
122	def notify_by_mail	127	def notify_by_mail
123	if source.kind_of?(Article) && article.notify_comments?	128	if source.kind_of?(Article) && article.notify_comments?
124	if !notification_emails.empty?	129	if !notification_emails.empty?
	@@ -205,37 +210,6 @@ class Comment < ActiveRecord::Base		@@ -205,37 +210,6 @@ class Comment < ActiveRecord::Base
205	@rejected = true	210	@rejected = true
206	end	211	end
207		212
208	- def spam?
209	- !spam.nil? && spam
210	- end
211	-
212	- def ham?
213	- !spam.nil? && !spam
214	- end
215	-
216	- def spam!
217	- self.spam = true
218	- self.save!
219	- SpammerLogger.log(ip_address, self)
220	- Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
221	- self
222	- end
223	-
224	- def ham!
225	- self.spam = false
226	- self.save!
227	- Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
228	- self
229	- end
230	-
231	- def marked_as_spam
232	- plugins.dispatch(:comment_marked_as_spam, self)
233	- end
234	-
235	- def marked_as_ham
236	- plugins.dispatch(:comment_marked_as_ham, self)
237	- end
238	-
239	def need_moderation?	213	def need_moderation?
240	article.moderate_comments? && (author.nil? \|\| article.author != author)	214	article.moderate_comments? && (author.nil? \|\| article.author != author)
241	end	215	end