Merge commit 'refs/merge-requests/213' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb

Merge commit 'refs/merge-requests/213' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
Daniela Feitosa
2 parents 5fb09b51 85b0bd4d
Showing 38 changed files with 650 additions and 68 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/cms_helper.rb
app/models/comment.rb
app/views/cms/view.rhtml
app/views/content_viewer/_article_toolbar.rhtml
app/views/content_viewer/_comment.rhtml
app/views/content_viewer/_comment_form.rhtml
app/views/content_viewer/edit_comment.html.erb
app/views/content_viewer/view_page.rhtml
app/views/profile/_comment.rhtml
config/routes.rb
lib/noosfero/plugin.rb
plugins/tolerance_time/controllers/tolerance_time_plugin_myprofile_controller.rb
plugins/tolerance_time/db/migrate/20120719090320_create_tolerance_time_plugin_tolerances.rb
plugins/tolerance_time/db/migrate/20120719095004_create_tolerance_time_plugin_publications.rb
plugins/tolerance_time/lib/ext/article.rb
plugins/tolerance_time/lib/ext/comment.rb
plugins/tolerance_time/lib/tolerance_time_plugin.rb
@@ -114,7 +114,9 @@ class ApplicationController &lt; ActionController::Base
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
     plugins.each do |plugin|
-      plugin.send(self.class.name.underscore + '_filters').each do |plugin_filter|
+      filters = plugin.send(self.class.name.underscore + '_filters')
+      filters = [filters] if !filters.kind_of?(Array)
+      filters.each do |plugin_filter|
         self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] || {}))
         self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
       end
@@ -2,6 +2,8 @@ class ContentViewerController &lt; ApplicationController
  
   needs_profile
  
+  before_filter :comment_author, :only => :edit_comment
+
   helper ProfileHelper
   helper TagsHelper
  
@@ -121,6 +123,22 @@ class ContentViewerController &lt; ApplicationController
     end
   end
  
+  def edit_comment
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    @form_div = 'opened'
+    @comment = Comment.find(params[:id])
+    if request.post?
+      begin
+        @comment.update_attributes(params[:comment])
+        session[:notice] = _('Comment updated.')
+        redirect_to :action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path
+      rescue
+        session[:notice] = _('Comment could not be updated.')
+      end
+    end
+  end
+
   protected
  
   def add_comment
@@ -198,4 +216,9 @@ class ContentViewerController &lt; ApplicationController
     end
   end
  
+  def comment_author
+    comment = Comment.find(params[:id])
+    render_access_denied if comment.author.blank? || comment.author != user
+  end
+
 end
@@ -1336,6 +1336,19 @@ module ApplicationHelper
     end
   end
  
+  def expirable_link_to(expired, content, url, options = {})
+    if expired
+      options[:class] = (options[:class] || '') + ' disabled'
+      content_tag('a', '&nbsp;'+content_tag('span', content), options)
+    else
+      link_to content, url, options
+    end
+  end
+
+  def remove_content_button(action)
+    @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
+  end
+
   def template_options(klass, field_name)
     return '' if klass.templates.count == 0
     return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
@@ -1401,4 +1414,19 @@ module ApplicationHelper
     result
   end
  
+  def expirable_content_reference(content, action, text, url, options = {})
+    reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
+    options[:title] = reason
+    expirable_link_to reason.present?, text, url, options
+  end
+
+  def expirable_button(content, action, text, url, options = {})
+    options[:class] = "button with-text icon-#{action.to_s}"
+    expirable_content_reference content, action, text, url, options
+  end
+
+  def expirable_comment_link(content, action, text, url, options = {})
+    options[:class] = "comment-footer comment-footer-link comment-footer-hide"
+    expirable_content_reference content, action, text, url, options
+  end
 end
@@ -42,13 +42,25 @@ module CmsHelper
  
   def display_spread_button(profile, article)
     if profile.person?
-      button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
+      expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
     elsif profile.community? && environment.portal_community
-      button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
+      expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
     end
   end
  
   def display_delete_button(article)
-    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+  end
+
+  def expirable_button(content, action, title, url, options = {})
+    reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
+    if reason.present?
+      options[:class] = (options[:class] || '') + ' disabled'
+      options[:disabled] = 'disabled'
+      options.delete(:confirm)
+      options.delete(:method)
+      title = reason
+    end
+    button_without_text action.to_sym, title, url, options
   end
 end
@@ -28,6 +28,8 @@ class Comment &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
  
+  delegate :environment, :to => :source
+
   def action_tracker_target
     self.article.profile
   end
@@ -49,13 +49,13 @@
         <%= article.class.short_description %>
       </td>
       <td class="article-controls">
-        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
+        <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
-        <%= display_spread_button(profile, article) unless article.folder? %>
-        <% if !environment.enabled?('cant_change_homepage') %>
-          <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+        <%= display_spread_button(profile, article) unless article.folder? || remove_content_button(:spread)%>
+        <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+          <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
         <% end %>
-        <%= display_delete_button(article) %>
+        <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
     </tr>
   <% end %>
 <div<%= user && " class='logged-in'" %>>
   <div id="article-actions">
  
-    <% if @page.allow_edit?(user) %>
-      <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
-          profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
-          :class => 'button with-text icon-edit' %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+      <% content = content_tag('span', label_for_edit_article(@page)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
+      <%= expirable_button @page, :edit, content, url %>
     <% end %>
  
-    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) %>
-      <%= link_to content_tag( 'span', _('Delete') ),
-        profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}),
-        :method => :post,
-        :class => 'button with-text icon-delete',
-        :confirm => delete_article_message(@page) %>
+    <% if @page != profile.home_page && !@page.has_posts?  && @page.allow_delete?(user) && !remove_content_button(:delete)%>
+      <% content = content_tag( 'span', _('Delete') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
+      <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
+      <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
  
-    <% if !@page.folder? && @page.allow_spread?(user) %>
+    <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
+      <% content = content_tag( 'span', _('Spread this') ) %>
+      <% url = nil %>
       <% if profile.kind_of?(Person) %>
-        <%= link_to content_tag( 'span', _('Spread this') ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
-            :class => 'button with-text icon-spread' %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
       <% elsif profile.kind_of?(Community) && environment.portal_community %>
-        <%= link_to content_tag( 'span', _('Spread this') ),
-            profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
-            :class => 'button with-text icon-spread' %>
+        <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
       <% end %>
+      <%= expirable_button @page, :spread, content, url if url %>
     <% end %>
  
     <% if !@page.gallery? && @page.allow_create?(user) %>
-      <%= link_to _('Add translation'),
-          profile.admin_url.merge(:controller => 'cms', :action => 'new',
-                                  :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
-                                  :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
-          :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
+      <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
+        <% content = _('Add translation') %>
+        <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
+        <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
+        <%= expirable_button @page, :locale, content, url %>
+      <% end %>
+
       <%= colorbox_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)))) %>
     <% end %>
  
@@ -40,8 +41,11 @@
       <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
     <% end %>
  
-    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) %>
-      <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
+    <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
+      <% content = content_tag( 'span', _('Suggest an article') ) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
+      <% options = {:id => 'suggest-article-link'} %>
+      <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
  
     <%= report_abuse(profile, :link, @page) %>
@@ -75,6 +75,10 @@
           :class => 'comment-footer comment-footer-link comment-footer-hide',
           :id => 'comment-reply-to-' + comment.id.to_s
         %>
+        <% if comment.author && comment.author == user %>
+          &nbsp;
+          <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
+        <% end %>
       <% end %>
     </div>
  
@@ -39,7 +39,7 @@ function submit_comment_form(button) {
                d.find('input[name=comment[title]], textarea').val('');
                d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
              }">
-  <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
+  <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') if display_link %>
 </h4>
  
 <% unless pass_without_comment_captcha? %>
@@ -59,7 +59,7 @@ function submit_comment_form(button) {
   </script>
 <% end %>
  
-<% form_tag( url_for(@page.view_url.merge({:only_path => true})), { :class => 'comment_form' } ) do %>
+<% form_tag( url, { :class => 'comment_form' } ) do %>
   <%= hidden_field_tag(:confirm, 'false') %>
  
   <%= required_fields_message %>
@@ -84,7 +84,11 @@ function submit_comment_form(button) {
  
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
-    <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+    <% if cancel_triggers_hide %>
+      <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+    <% else %>
+      <%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
+    <% end %>
   <% end %>
 <% end %>
  
@@ -0,0 +1,3 @@
+<h1><%= _('Edit comment') %></h1>
+
+<%= render :partial => 'comment_form', :locals => {:url => {:action => 'edit_comment', :profile => profile.identifier}, :display_link => false, :cancel_triggers_hide => false} %>
@@ -98,7 +98,7 @@
   </ul>
  
   <% if @page.accept_comments? %>
-    <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
+    <div id="page-comment-form"><%= render :partial => 'comment_form', :locals => {:url => url_for(@page.view_url.merge({:only_path => true})), :display_link => true, :cancel_triggers_hide => true}%></div>
   <% end %>
 </div><!-- end class="comments" -->
  
@@ -62,6 +62,10 @@
       </script>
     <% end %>
     <%= report_abuse(comment.author, :comment_link, comment) if comment.author %>
+    <% if comment.author && comment.author == user %>
+      <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
+      <%= content_tag('span', ' | ', :class => 'comment-footer comment-footer-hide') %>
+    <% end %>
     <%= link_to_function _('Reply'),
         "var f = add_comment_reply_form(this, %s); f.find('input[name=comment[title]], textarea').val(''); return false" % comment.id,
         :class => 'comment-footer comment-footer-link comment-footer-hide',
@@ -121,9 +121,12 @@ ActionController::Routing::Routes.draw do |map|
   # cache stuff - hack
   map.cache 'public/:action/:id', :controller => 'public'
  
+  map.connect ':profile/edit_comment/:id/*page', :controller => 'content_viewer', :action => 'edit_comment', :profile => /#{Noosfero.identifier_format}/
+
   # match requests for profiles that don't have a custom domain
   map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
  
+
   # match requests for content in domains hosted for profiles
   map.connect '*page', :controller => 'content_viewer', :action => 'view_page'
  
@@ -211,28 +211,6 @@ class Noosfero::Plugin
     nil
   end
  
-  # This is a generic hotspot for all controllers on Noosfero.
-  # If any plugin wants to define filters to run on any controller, the name of
-  # the hotspot must be in the following form: <underscored_controller_name>_filters.
-  # Example: for ProfileController the hotspot is profile_controller_filters
-  #
-  # -> Adds a filter to a controller
-  # returns = { :type => type,
-  #             :method_name => method_name,
-  #             :options => {:opt1 => opt1, :opt2 => opt2},
-  #             :block => Proc or lambda block}
-  #   type = 'before_filter' or 'after_filter'
-  #   method_name = The name of the filter
-  #   option = Filter options, like :only or :except
-  #   block = Block that the filter will call
-  def method_missing(method, *args, &block)
-    if method.to_s =~ /^(.+)_controller_filters$/
-      []
-    else
-      super
-    end
-  end
-
   # This method will be called just before a comment is saved to the database.
   #
   # It can modify the comment in several ways. In special, a plugin can call
@@ -333,4 +311,40 @@ class Noosfero::Plugin
     nil
   end
  
+  def method_missing(method, *args, &block)
+    # This is a generic hotspot for all controllers on Noosfero.
+    # If any plugin wants to define filters to run on any controller, the name of
+    # the hotspot must be in the following form: <underscored_controller_name>_filters.
+    # Example: for ProfileController the hotspot is profile_controller_filters
+    #
+    # -> Adds a filter to a controller
+    # returns = { :type => type,
+    #             :method_name => method_name,
+    #             :options => {:opt1 => opt1, :opt2 => opt2},
+    #             :block => Proc or lambda block}
+    #   type = 'before_filter' or 'after_filter'
+    #   method_name = The name of the filter
+    #   option = Filter options, like :only or :except
+    #   block = Block that the filter will call
+    if method.to_s =~ /^(.+)_controller_filters$/
+      []
+    # -> Removes the action button from the content
+    # returns = boolean
+    elsif method.to_s =~ /^content_remove_(#{content_actions.join('|')})$/
+      nil
+    # -> Expire the action button from the content
+    # returns = string with reason of expiration
+    elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
+      nil
+    else
+      super
+    end
+  end
+
+  private
+
+  def content_actions
+    %w[edit delete spread locale suggest home]
+  end
+
 end
@@ -0,0 +1,37 @@
+class ToleranceTimePluginMyprofileController < MyProfileController
+  def index
+    @tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id) || ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+    convert_values
+    if request.post?
+      begin
+        convert_params
+        @tolerance.update_attributes!(params[:tolerance])
+        convert_values
+        session[:notice] = _('Tolerance updated')
+      rescue
+        session[:notice] = _('Tolerance could not be updated')
+      end
+    end
+  end
+
+  private
+
+  def convert_params
+    params[:tolerance][:content_tolerance] = params[:tolerance][:content_tolerance].to_i * params[:content_tolerance_unit].to_i if !params[:tolerance][:content_tolerance].blank?
+    params[:tolerance][:comment_tolerance] = params[:tolerance][:comment_tolerance].to_i * params[:comment_tolerance_unit].to_i if !params[:tolerance][:comment_tolerance].blank?
+  end
+
+  def convert_values
+    @content_default_unit = select_unit(@tolerance.content_tolerance)
+    @comment_default_unit = select_unit(@tolerance.comment_tolerance)
+    @tolerance.content_tolerance /= @content_default_unit if !@tolerance.content_tolerance.nil?
+    @tolerance.comment_tolerance /= @comment_default_unit if !@tolerance.comment_tolerance.nil?
+  end
+
+  def select_unit(value)
+    return 1 if value.nil? || value == 0
+    return 3600 if value % 3600 == 0
+    return 60 if value % 60 == 0
+    return 1
+  end
+end
@@ -0,0 +1,13 @@
+class CreateToleranceTimePluginTolerances < ActiveRecord::Migration
+  def self.up
+    create_table :tolerance_time_plugin_tolerances do |t|
+      t.references  :profile
+      t.integer     :content_tolerance
+      t.integer     :comment_tolerance
+    end
+  end
+
+  def self.down
+    drop_table :tolerance_time_plugin_tolerances
+  end
+end
@@ -0,0 +1,12 @@
+class CreateToleranceTimePluginPublications < ActiveRecord::Migration
+  def self.up
+    create_table :tolerance_time_plugin_publications do |t|
+      t.references :target, :polymorphic => true
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :tolerance_time_plugin_publications
+  end
+end
@@ -0,0 +1,23 @@
+require_dependency 'article'
+
+class Article
+  after_create do |article|
+    ToleranceTimePlugin::Publication.create!(:target => article) if article.published
+  end
+
+  before_save do |article|
+    if article.published_changed?
+      if article.published
+        ToleranceTimePlugin::Publication.create!(:target => article)
+      else
+        publication = ToleranceTimePlugin::Publication.find_by_target(article)
+        publication.destroy if publication.present?
+      end
+    end
+  end
+
+  before_destroy do |article|
+    publication = ToleranceTimePlugin::Publication.find_by_target(article)
+    publication.destroy if publication.present?
+  end
+end
@@ -0,0 +1,13 @@
+require_dependency 'comment'
+
+class Comment
+  after_create do |comment|
+    ToleranceTimePlugin::Publication.create!(:target => comment)
+  end
+
+  before_destroy do |comment|
+    publication = ToleranceTimePlugin::Publication.find_by_target(comment)
+    publication.destroy if publication.present?
+  end
+end
+
@@ -0,0 +1,71 @@
+require_dependency 'ext/article'
+require_dependency 'ext/comment'
+
+class ToleranceTimePlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Tolerance Time"
+  end
+
+  def self.plugin_description
+    _("Adds a tolerance time for editing content after its publication")
+  end
+
+  def self.expired?(content)
+    return false if content.kind_of?(Comment) && !content.article.kind_of?(Article)
+
+    expirable = content.kind_of?(Comment) || (!content.folder? && content.published?)
+    publication = ToleranceTimePlugin::Publication.find_by_target(content)
+    publication = ToleranceTimePlugin::Publication.create!(:target => content) if expirable && publication.nil?
+    person_article = content.kind_of?(Article) && content.profile.kind_of?(Person)
+
+    !person_article && expirable && publication.expired?
+  end
+
+  def control_panel_buttons
+    {:title => _('Tolerance Adjustements'), :url => {:controller => 'tolerance_time_plugin_myprofile', :profile => context.profile.identifier}, :icon => 'tolerance-time'  }
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def cms_controller_filters
+    return if !context.environment.plugin_enabled?(ToleranceTimePlugin)
+    block = lambda do
+      content = Article.find(params[:id])
+      if ToleranceTimePlugin.expired?(content)
+        session[:notice] = _('This content can\'t be edited anymore because it expired the tolerance time')
+        redirect_to content.url
+      end
+    end
+
+    { :type => 'before_filter',
+      :method_name => 'expired_content',
+      :options => {:only => 'edit'},
+      :block => block }
+  end
+
+  def content_viewer_controller_filters
+    return if !context.environment.plugin_enabled?(ToleranceTimePlugin)
+    block = lambda do
+      content = Comment.find(params[:id])
+      if ToleranceTimePlugin.expired?(content)
+        session[:notice] = _('This content can\'t be edited anymore because it expired the tolerance time')
+        redirect_to content.article.url
+      end
+    end
+
+    { :type => 'before_filter',
+      :method_name => 'expired_content',
+      :options => {:only => 'edit_comment'},
+      :block => block }
+  end
+
+  def content_expire_edit(content)
+    if ToleranceTimePlugin.expired?(content)
+      _('The tolerance time for editing this content is over.')
+    end
+  end
+
+end
@@ -0,0 +1,27 @@
+class ToleranceTimePlugin::Publication < Noosfero::Plugin::ActiveRecord
+  belongs_to :target, :polymorphic => true
+  validates_presence_of :target_id, :target_type
+  validates_uniqueness_of :target_id, :scope => :target_type
+
+  class << self
+    def find_by_target(target)
+      kind = target.kind_of?(Article) ? 'Article' : 'Comment'
+      find_by_target_id_and_target_type(target.id, kind)
+    end
+  end
+
+  def expired?
+    profile = (target.kind_of?(Article) ? target.profile : target.article.profile)
+    profile_tolerance = ToleranceTimePlugin::Tolerance.find_by_profile_id(profile.id)
+    content_tolerance = profile_tolerance ? profile_tolerance.content_tolerance : nil
+    comment_tolerance = profile_tolerance ? profile_tolerance.comment_tolerance : nil
+    if target.kind_of?(Article)
+      tolerance_time = content_tolerance || 1.0/0
+    elsif target.kind_of?(Comment)
+      tolerance_time = comment_tolerance || 1.0/0
+    else
+      tolerance_time = 1.0/0
+    end
+    created_at.to_i+tolerance_time < Time.now.to_i
+  end
+end
@@ -0,0 +1,7 @@
+class ToleranceTimePlugin::Tolerance < Noosfero::Plugin::ActiveRecord
+  belongs_to :profile
+  validates_presence_of :profile_id
+  validates_uniqueness_of :profile_id
+  validates_numericality_of :content_tolerance, :only_integer => true, :allow_nil => true
+  validates_numericality_of :comment_tolerance, :only_integer => true, :allow_nil => true
+end
@@ -0,0 +1,4 @@
+.controller-profile_editor a.control-panel-tolerance-time,
+.controller-profile_editor .msie6 a.control-panel-tolerance-time {
+  background-image: url(/plugins/tolerance_time/icons/tolerance-time.png)
+}
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+  should 'create a publication after publishing the article' do
+    article = fast_create(Article, :published => false, :profile_id => fast_create(Profile).id)
+    assert_nil ToleranceTimePlugin::Publication.find_by_target(article)
+
+    article.published = true
+    article.save!
+    assert_not_nil ToleranceTimePlugin::Publication.find_by_target(article)
+  end
+
+  should 'destroy publication if the article is destroyed' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article.destroy
+    assert_raise ActiveRecord::RecordNotFound do
+      article_publication.reload
+    end
+  end
+
+  should 'destroy publication if the article is changed to not published' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article.published = false
+    article.save!
+    assert_raise ActiveRecord::RecordNotFound do
+      article_publication.reload
+    end
+  end
+end
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class CommentTest < ActiveSupport::TestCase
+  should 'create a publication after posting a comment' do
+    article = fast_create(Article, :profile_id => fast_create(Person).id)
+    comment = Comment.new(:author_id => fast_create(Person).id, :body => 'Hello There!', :source_id => article.id)
+    assert_difference ToleranceTimePlugin::Publication, :count do
+      comment.save!
+    end
+    assert_not_nil ToleranceTimePlugin::Publication.find_by_target(comment)
+  end
+
+  should 'destroy publication if the comment is destroyed' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :source_id => article.id)
+    comment_publication = ToleranceTimePlugin::Publication.create!(:target => comment)
+    comment.destroy
+    assert_raise ActiveRecord::RecordNotFound do
+      comment_publication.reload
+    end
+  end
+end
+
@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class ToleranceTimePlugin::PublicationTest < ActiveSupport::TestCase
+  should 'validate presence of target' do
+    publication = ToleranceTimePlugin::Publication.new
+    publication.valid?
+    assert publication.errors.invalid?(:target_id)
+    assert publication.errors.invalid?(:target_type)
+
+    publication.target = fast_create(Article)
+    publication.valid?
+    assert !publication.errors.invalid?(:target_id)
+    assert !publication.errors.invalid?(:target_type)
+  end
+
+  should 'validate uniqueness of target' do
+    target = fast_create(Article)
+    p1 = ToleranceTimePlugin::Publication.create!(:target => target)
+    p2 = ToleranceTimePlugin::Publication.new(:target => target)
+    p2.valid?
+
+    assert p2.errors.invalid?(:target_id)
+  end
+
+  should 'be able to find publication by target' do
+    article = fast_create(Article)
+    publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    assert_equal publication, ToleranceTimePlugin::Publication.find_by_target(article)
+  end
+
+  should 'avaliate if the publication is expired' do
+    profile = fast_create(Profile)
+    author = fast_create(Person)
+    a1 = fast_create(Article, :profile_id => profile.id)
+    a2 = fast_create(Article, :profile_id => profile.id)
+    c1 = fast_create(Comment, :source_id => a1.id)
+    c2 = fast_create(Comment, :source_id => a2.id)
+    ToleranceTimePlugin::Tolerance.create!(:profile => profile, :content_tolerance => 10.minutes, :comment_tolerance => 5.minutes)
+    expired_article = ToleranceTimePlugin::Publication.create!(:target => a1)
+    expired_article.created_at = 15.minutes.ago
+    expired_article.save!
+    on_time_article = ToleranceTimePlugin::Publication.create!(:target => a2)
+    on_time_article.created_at = 5.minutes.ago
+    on_time_article.save!
+    expired_comment = ToleranceTimePlugin::Publication.create!(:target => c1)
+    expired_comment.created_at = 8.minutes.ago
+    expired_comment.save!
+    on_time_comment = ToleranceTimePlugin::Publication.create!(:target => c2)
+    on_time_comment.created_at = 2.minutes.ago
+    on_time_comment.save!
+
+    assert expired_article.expired?
+    assert !on_time_article.expired?
+    assert expired_comment.expired?
+    assert !on_time_comment.expired?
+  end
+
+  should 'consider tolerance infinity if not defined' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article_publication.created_at = 1000.years.ago
+    article_publication.save!
+    ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+
+    assert !article_publication.expired?
+  end
+
+  should 'not crash if profile has no tolerance yet defined' do
+    profile = fast_create(Profile)
+    article = fast_create(Article, :profile_id => profile.id)
+    article_publication = ToleranceTimePlugin::Publication.create!(:target => article)
+    article_publication.created_at = 1000.years.ago
+    article_publication.save!
+
+    assert !article_publication.expired?
+  end
+end
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class ToleranceTimePlugin::ToleranceTest < ActiveSupport::TestCase
+  should 'validate presence of profile' do
+    tolerance = ToleranceTimePlugin::Tolerance.new
+    tolerance.valid?
+    assert tolerance.errors.invalid?(:profile_id)
+
+    tolerance.profile = fast_create(Profile)
+    tolerance.valid?
+    assert !tolerance.errors.invalid?(:profile_id)
+  end
+
+  should 'validate uniqueness of profile' do
+    profile = fast_create(Profile)
+    t1 = ToleranceTimePlugin::Tolerance.create!(:profile => profile)
+    t2 = ToleranceTimePlugin::Tolerance.new(:profile => profile)
+    t2.valid?
+
+    assert t2.errors.invalid?(:profile_id)
+  end
+
+  should 'validate integer format for comment and content tolerance' do
+    tolerance = ToleranceTimePlugin::Tolerance.new(:profile => fast_create(Profile))
+    assert tolerance.valid?
+
+    tolerance.comment_tolerance = 'sdfa'
+    tolerance.content_tolerance = 4.5
+    tolerance.valid?
+    assert tolerance.errors.invalid?(:comment_tolerance)
+    assert tolerance.errors.invalid?(:content_tolerance)
+
+    tolerance.comment_tolerance = 3
+    tolerance.content_tolerance = 6
+    assert tolerance.valid?
+  end
+end
@@ -0,0 +1,24 @@
+<h1><%= _('Tolerance Adjustments') %></h1>
+
+<%= error_messages_for :tolerance %>
+
+<% form_for :tolerance, @tolerance do |f| %>
+
+  <% time_units = [[_('Seconds'), 1], [_('Minutes'), 60], [_('Hours'), 3600]]%>
+
+  <% if profile.organization? %>
+    <%= labelled_form_field(_('Content edition tolerance time'),
+      f.text_field(:content_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') +
+      select_tag(:content_tolerance_unit, options_for_select(time_units, @content_default_unit) )) %>
+  <% end %>
+  <%= labelled_form_field(_('Comment edition tolerance time'), 
+    f.text_field(:comment_tolerance, :size => 2, :style => 'font-size: 14px; text-align: right') + 
+    select_tag(:comment_tolerance_unit, options_for_select(time_units, @comment_default_unit) )) %>
+
+  <%= content_tag( 'small', _('Empty means unlimited and zero means right away.') ) %>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'))%>
+    <%= button('back', _('Back'), {:controller => 'profile_editor'})%>
+  <% end %>
+<% end %>
 .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       { background-image: url(ie6/Tango/16x16/actions/filenew.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)             }
@@ -3,7 +3,8 @@
 /******************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-new       { background-image: url(Tango/16x16/actions/filenew.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-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
 .icon-folder    { background-image: url(Tango/16x16/places/folder.png) }
@@ -908,6 +908,16 @@ hr.pre-posts, hr.sep-posts {
 #article-actions a.button:hover {
   color: #555753;
 }
+#content a.disabled,
+#content a.disabled:hover {
+  color: #888;
+  text-decoration: none;
+}
+#content a.button.disabled,
+#content a.button.disabled:hover {
+  background-color: #CCC;
+  border-color: #CCC;
+}
  
 #addThis {
   text-align: right;
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+ <filter id="grayscale">
+  <feColorMatrix type="matrix" values="0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0"/>
+ </filter>
+</svg>
@@ -1503,7 +1503,13 @@ a.button:hover, body.noosfero a.button:hover, input.button:hover, a.button.with-
 body.noosfero a.button.with-text.icon-none, body.noosfero input.button.with-text.icon-none {
   padding-left: 2px;
 }
-a.button.disabled, input.disabled {
+a.disabled{
+  filter: url(filters.svg#grayscale); /* Firefox 3.5+ */
+  filter: gray; /* IE6-9 */
+  -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
+  cursor: default;
+}
+input.disabled {
   opacity: 0.5;
   filter-opacity: 50%;
 }
@@ -442,7 +442,7 @@ module Noosfero::Factory
  
   def defaults_for_comment(params = {})
     name = "comment_#{rand(1000)}"
-    { :title => name, :body => "my own comment", :source_id => 1 }.merge(params)
+    { :title => name, :body => "my own comment", :source_id => 1, :source_type => 'Article' }.merge(params)
   end
  
   ###############################################
@@ -1400,6 +1400,38 @@ end
     end
   end
  
+  should 'not display article actions button if any plugins says so' do
+    class Plugin1 < Noosfero::Plugin
+      def content_remove_edit(content); true; end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def content_remove_edit(content); false; end
+    end
+
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    login_as('testinguser')
+    xhr :get, :view_page, :profile => 'testinguser', :page => [], :toolbar => true
+    assert_no_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/cms/edit/#{profile.home_page.id}" } }
+  end
+
+  should 'expire article actions button if any plugins says so' do
+    class Plugin1 < Noosfero::Plugin
+      def content_expire_edit(content); 'This button is expired.'; end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def content_expire_edit(content); nil; end
+    end
+
+    environment.enable_plugin(Plugin1.name)
+    environment.enable_plugin(Plugin2.name)
+
+    login_as('testinguser')
+    xhr :get, :view_page, :profile => 'testinguser', :page => [], :toolbar => true
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :title => 'This button is expired.', :class => 'button with-text icon-edit disabled' } }
+  end
+
   should 'remove email from article followers when unfollow' do
     profile = create_user('testuser').person
     follower_email = 'john@doe.br'
@@ -5,6 +5,7 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   include CmsHelper
   include BlogHelper
   include ApplicationHelper
+  include ActionView::Helpers::UrlHelper
  
   should 'show default options for article' do
     CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
@@ -47,14 +48,18 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
   end
  
   should 'display spread button when profile is a person' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Person)
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish', :id => article.id)
+    expects(:link_to).with('Spread this', {:action => 'publish', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
  
     result = display_spread_button(profile, article)
   end
  
   should 'display spread button when profile is a community and env has portal_community' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     env = fast_create(Environment)
     env.expects(:portal_community).returns(true)
     profile = fast_create(Community, :environment_id => env.id)
@@ -62,12 +67,14 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
  
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
  
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id)
+    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil)
  
     result = display_spread_button(profile, article)
   end
  
   should 'not display spread button when profile is a community and env has not portal_community' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     env = fast_create(Environment)
     env.expects(:portal_community).returns(nil)
     profile = fast_create(Community, :environment_id => env.id)
@@ -75,31 +82,37 @@ class CmsHelperTest &lt; ActiveSupport::TestCase
  
     article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
  
-    expects(:button_without_text).with(:spread, 'Spread this', :action => 'publish_on_portal_community', :id => article.id).never
+    expects(:link_to).with('Spread this', {:action => 'publish_on_portal_community', :id => article.id}, :class => 'button with-text icon-spread', :title => nil).never
  
     result = display_spread_button(profile, article)
   end
  
   should 'display delete_button to folder' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Profile)
     name = 'My folder'
     folder = fast_create(Folder, :name => name, :profile_id => profile.id)
     confirm_message = "Are you sure that you want to remove the folder \"#{name}\"? Note that all the items inside it will also be removed!"
-    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message)
+    expects(:link_to).with('Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(folder)
   end
  
   should 'display delete_button to article' do
+    @controller = ApplicationController.new
+    @plugins.stubs(:dispatch).returns([])
     profile = fast_create(Profile)
     name = 'My article'
     article = fast_create(TinyMceArticle, :name => name, :profile_id => profile.id)
     confirm_message = "Are you sure that you want to remove the item \"#{name}\"?"
-    expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message)
+    expects(:link_to).with('Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message, :class => 'button with-text icon-delete', :title => nil)
  
     result = display_delete_button(article)
   end
  
+  def link_to(text, *args); puts text; puts args.inspect; text; end
+
 end
  
 module RssFeedHelper
@@ -555,6 +555,14 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal 'bar', c.referrer
   end
  
+  should 'delegate environment to article' do
+    profile = fast_create(Profile, :environment_id => Environment.default)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :source_id => article.id, :source_type => 'Article')
+
+    assert_equal Environment.default, comment.environment
+  end
+
   private
  
   def create_comment(args = {})
...	...	@@ -114,7 +114,9 @@ class ApplicationController < ActionController::Base
114	114	# plugin to the current controller being initialized.
115	115	def init_noosfero_plugins_controller_filters
116	116	plugins.each do \|plugin\|
117		- plugin.send(self.class.name.underscore + '_filters').each do \|plugin_filter\|
	117	+ filters = plugin.send(self.class.name.underscore + '_filters')
	118	+ filters = [filters] if !filters.kind_of?(Array)
	119	+ filters.each do \|plugin_filter\|
118	120	self.class.send(plugin_filter[:type], plugin.class.name.underscore + '_' + plugin_filter[:method_name], (plugin_filter[:options] \|\| {}))
119	121	self.class.send(:define_method, plugin.class.name.underscore + '_' + plugin_filter[:method_name], plugin_filter[:block])
120	122	end
...	...
...	...	@@ -2,6 +2,8 @@ class ContentViewerController < ApplicationController
2	2
3	3	needs_profile
4	4
	5	+ before_filter :comment_author, :only => :edit_comment
	6	+
5	7	helper ProfileHelper
6	8	helper TagsHelper
7	9
...	...	@@ -121,6 +123,22 @@ class ContentViewerController < ApplicationController
121	123	end
122	124	end
123	125
	126	+ def edit_comment
	127	+ path = params[:page].join('/')
	128	+ @page = profile.articles.find_by_path(path)
	129	+ @form_div = 'opened'
	130	+ @comment = Comment.find(params[:id])
	131	+ if request.post?
	132	+ begin
	133	+ @comment.update_attributes(params[:comment])
	134	+ session[:notice] = _('Comment updated.')
	135	+ redirect_to :action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path
	136	+ rescue
	137	+ session[:notice] = _('Comment could not be updated.')
	138	+ end
	139	+ end
	140	+ end
	141	+
124	142	protected
125	143
126	144	def add_comment
...	...	@@ -198,4 +216,9 @@ class ContentViewerController < ApplicationController
198	216	end
199	217	end
200	218
	219	+ def comment_author
	220	+ comment = Comment.find(params[:id])
	221	+ render_access_denied if comment.author.blank? \|\| comment.author != user
	222	+ end
	223	+
201	224	end
...	...
...	...	@@ -1336,6 +1336,19 @@ module ApplicationHelper
1336	1336	end
1337	1337	end
1338	1338
	1339	+ def expirable_link_to(expired, content, url, options = {})
	1340	+ if expired
	1341	+ options[:class] = (options[:class] \|\| '') + ' disabled'
	1342	+ content_tag('a', ' '+content_tag('span', content), options)
	1343	+ else
	1344	+ link_to content, url, options
	1345	+ end
	1346	+ end
	1347	+
	1348	+ def remove_content_button(action)
	1349	+ @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
	1350	+ end
	1351	+
1339	1352	def template_options(klass, field_name)
1340	1353	return '' if klass.templates.count == 0
1341	1354	return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
...	...	@@ -1401,4 +1414,19 @@ module ApplicationHelper
1401	1414	result
1402	1415	end
1403	1416
	1417	+ def expirable_content_reference(content, action, text, url, options = {})
	1418	+ reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
	1419	+ options[:title] = reason
	1420	+ expirable_link_to reason.present?, text, url, options
	1421	+ end
	1422	+
	1423	+ def expirable_button(content, action, text, url, options = {})
	1424	+ options[:class] = "button with-text icon-#{action.to_s}"
	1425	+ expirable_content_reference content, action, text, url, options
	1426	+ end
	1427	+
	1428	+ def expirable_comment_link(content, action, text, url, options = {})
	1429	+ options[:class] = "comment-footer comment-footer-link comment-footer-hide"
	1430	+ expirable_content_reference content, action, text, url, options
	1431	+ end
1404	1432	end
...	...
...	...	@@ -42,13 +42,25 @@ module CmsHelper
42	42
43	43	def display_spread_button(profile, article)
44	44	if profile.person?
45		- button_without_text :spread, _('Spread this'), :action => 'publish', :id => article.id
	45	+ expirable_button article, :spread, _('Spread this'), :action => 'publish', :id => article.id
46	46	elsif profile.community? && environment.portal_community
47		- button_without_text :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
	47	+ expirable_button article, :spread, _('Spread this'), :action => 'publish_on_portal_community', :id => article.id
48	48	end
49	49	end
50	50
51	51	def display_delete_button(article)
52		- button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
	52	+ expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
	53	+ end
	54	+
	55	+ def expirable_button(content, action, title, url, options = {})
	56	+ reason = @plugins.dispatch("content_expire_#{action.to_s}", content).first
	57	+ if reason.present?
	58	+ options[:class] = (options[:class] \|\| '') + ' disabled'
	59	+ options[:disabled] = 'disabled'
	60	+ options.delete(:confirm)
	61	+ options.delete(:method)
	62	+ title = reason
	63	+ end
	64	+ button_without_text action.to_sym, title, url, options
53	65	end
54	66	end
...	...
...	...	@@ -28,6 +28,8 @@ class Comment < ActiveRecord::Base
28	28
29	29	xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
30	30
	31	+ delegate :environment, :to => :source
	32	+
31	33	def action_tracker_target
32	34	self.article.profile
33	35	end
...	...
...	...	@@ -49,13 +49,13 @@
49	49	<%= article.class.short_description %>
50	50	</td>
51	51	<td class="article-controls">
52		- <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
	52	+ <%= expirable_button article, :edit, _('Edit'), {:action => 'edit', :id => article.id} if !remove_content_button(:edit) %>
53	53	<%= button_without_text :eyes, _('Public view'), article.view_url %>
54		- <%= display_spread_button(profile, article) unless article.folder? %>
55		- <% if !environment.enabled?('cant_change_homepage') %>
56		- <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
	54	+ <%= display_spread_button(profile, article) unless article.folder? \|\| remove_content_button(:spread)%>
	55	+ <% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
	56	+ <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
57	57	<% end %>
58		- <%= display_delete_button(article) %>
	58	+ <%= display_delete_button(article) if !remove_content_button(:delete) %>
59	59	</td>
60	60	</tr>
61	61	<% end %>
...	...
1	1	<div<%= user && " class='logged-in'" %>>
2	2	<div id="article-actions">
3	3
4		- <% if @page.allow_edit?(user) %>
5		- <%= link_to content_tag( 'span', label_for_edit_article(@page) ),
6		- profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }),
7		- :class => 'button with-text icon-edit' %>
	4	+
	5	+ <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
	6	+ <% content = content_tag('span', label_for_edit_article(@page)) %>
	7	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id }) %>
	8	+ <%= expirable_button @page, :edit, content, url %>
8	9	<% end %>
9	10
10		- <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) %>
11		- <%= link_to content_tag( 'span', _('Delete') ),
12		- profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}),
13		- :method => :post,
14		- :class => 'button with-text icon-delete',
15		- :confirm => delete_article_message(@page) %>
	11	+ <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
	12	+ <% content = content_tag( 'span', _('Delete') ) %>
	13	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %>
	14	+ <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
	15	+ <%= expirable_button @page, :delete, content, url, options %>
16	16	<% end %>
17	17
18		- <% if !@page.folder? && @page.allow_spread?(user) %>
	18	+ <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
	19	+ <% content = content_tag( 'span', _('Spread this') ) %>
	20	+ <% url = nil %>
19	21	<% if profile.kind_of?(Person) %>
20		- <%= link_to content_tag( 'span', _('Spread this') ),
21		- profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }),
22		- :class => 'button with-text icon-spread' %>
	22	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %>
23	23	<% elsif profile.kind_of?(Community) && environment.portal_community %>
24		- <%= link_to content_tag( 'span', _('Spread this') ),
25		- profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }),
26		- :class => 'button with-text icon-spread' %>
	24	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %>
27	25	<% end %>
	26	+ <%= expirable_button @page, :spread, content, url if url %>
28	27	<% end %>
29	28
30	29	<% if !@page.gallery? && @page.allow_create?(user) %>
31		- <%= link_to _('Add translation'),
32		- profile.admin_url.merge(:controller => 'cms', :action => 'new',
33		- :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)),
34		- :type => @page.type, :article => { :translation_of_id => @page.native_translation.id }),
35		- :class => 'button with-text icon-locale' if @page.translatable? && !@page.native_translation.language.blank? %>
	30	+ <% if @page.translatable? && !@page.native_translation.language.blank? && !remove_content_button(:locale) %>
	31	+ <% content = _('Add translation') %>
	32	+ <% parent_id = (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)) %>
	33	+ <% url = profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => parent_id, :type => @page.type, :article => { :translation_of_id => @page.native_translation.id })%>
	34	+ <%= expirable_button @page, :locale, content, url %>
	35	+ <% end %>
	36	+
36	37	<%= colorbox_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)))) %>
37	38	<% end %>
38	39
...	...	@@ -40,8 +41,11 @@
40	41	<%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
41	42	<% end %>
42	43
43		- <% if !@page.allow_create?(user) && profile.community? && (@page.blog? \|\| @page.parent && @page.parent.blog?) %>
44		- <%= link_to content_tag( 'span', _('Suggest an article') ), profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}), :id => 'suggest-article-link', :class => 'button with-text icon-new' %>
	44	+ <% if !@page.allow_create?(user) && profile.community? && (@page.blog? \|\| @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
	45	+ <% content = content_tag( 'span', _('Suggest an article') ) %>
	46	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'suggest_an_article'}) %>
	47	+ <% options = {:id => 'suggest-article-link'} %>
	48	+ <%= expirable_button @page, :suggest, content, url, options %>
45	49	<% end %>
46	50
47	51	<%= report_abuse(profile, :link, @page) %>
...	...
...	...	@@ -75,6 +75,10 @@
75	75	:class => 'comment-footer comment-footer-link comment-footer-hide',
76	76	:id => 'comment-reply-to-' + comment.id.to_s
77	77	%>
	78	+ <% if comment.author && comment.author == user %>
	79	+
	80	+ <%= expirable_comment_link comment, :edit, _('Edit'), {:action => 'edit_comment', :id => comment.id, :profile => profile.identifier} %>
	81	+ <% end %>
78	82	<% end %>
79	83	</div>
80	84
...	...
...	...	@@ -39,7 +39,7 @@ function submit_comment_form(button) {
39	39	d.find('input[name=comment[title]], textarea').val('');
40	40	d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
41	41	}">
42		- <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
	42	+ <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') if display_link %>
43	43	</h4>
44	44
45	45	<% unless pass_without_comment_captcha? %>
...	...	@@ -59,7 +59,7 @@ function submit_comment_form(button) {
59	59	</script>
60	60	<% end %>
61	61
62		-<% form_tag( url_for(@page.view_url.merge({:only_path => true})), { :class => 'comment_form' } ) do %>
	62	+<% form_tag( url, { :class => 'comment_form' } ) do %>
63	63	<%= hidden_field_tag(:confirm, 'false') %>
64	64
65	65	<%= required_fields_message %>
...	...	@@ -84,7 +84,11 @@ function submit_comment_form(button) {
84	84
85	85	<% button_bar do %>
86	86	<%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
87		- <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
	87	+ <% if cancel_triggers_hide %>
	88	+ <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
	89	+ <% else %>
	90	+ <%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
	91	+ <% end %>
88	92	<% end %>
89	93	<% end %>
90	94
...	...
...	...	@@ -0,0 +1,3 @@
	1	+<h1><%= _('Edit comment') %></h1>
	2	+
	3	+<%= render :partial => 'comment_form', :locals => {:url => {:action => 'edit_comment', :profile => profile.identifier}, :display_link => false, :cancel_triggers_hide => false} %>
...	...