Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes

Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb

Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
Rodrigo Souto
2 parents abdeef43 e48e8f42
Showing 36 changed files with 530 additions and 228 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/article.rb
app/models/blog.rb
app/models/profile.rb
app/views/cms/edit.rhtml
plugins/community_track/controllers/public/community_track_plugin_public_controller.rb
plugins/community_track/lib/community_track_plugin/activation_job.rb
plugins/community_track/lib/community_track_plugin/step.rb
plugins/community_track/lib/community_track_plugin/step_helper.rb
plugins/community_track/lib/community_track_plugin/track.rb
plugins/community_track/lib/community_track_plugin/track_list_block.rb
plugins/community_track/lib/ext/article.rb
plugins/community_track/public/style.css
plugins/community_track/test/functional/community_track_plugin_cms_controller_test.rb
plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
plugins/community_track/test/functional/community_track_plugin_myprofile_controller_test.rb
plugins/community_track/test/functional/community_track_plugin_public_controller_test.rb
plugins/community_track/test/test_helper.rb
plugins/community_track/test/unit/article_test.rb
plugins/community_track/test/unit/community_track_plugin/activation_job_test.rb
@@ -64,6 +64,7 @@ class CmsController &lt; MyProfileController
   end
   def edit
+    @success_back_to = params[:success_back_to]
     @article = profile.articles.find(params[:id])
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
@@ -78,7 +79,7 @@ class CmsController &lt; MyProfileController
       if @article.update_attributes(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
-            redirect_to @article.view_url
+            success_redirect
           else
             redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
           end
@@ -90,6 +91,7 @@ class CmsController &lt; MyProfileController
   def new
     # FIXME this method should share some logic wirh edit !!!
+    @success_back_to = params[:success_back_to]
     # user must choose an article type first
     @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
@@ -134,7 +136,7 @@ class CmsController &lt; MyProfileController
         if continue
           redirect_to :action => 'edit', :id => @article
         else
-          redirect_to @article.view_url
+          success_redirect
         end
         return
       end
@@ -386,4 +388,12 @@ class CmsController &lt; MyProfileController
     true
   end
+  def success_redirect
+    if !@success_back_to.blank?
+      redirect_to @success_back_to
+    else
+      redirect_to @article.view_url
+    end
+  end
+
 end
@@ -448,8 +448,8 @@ class Article &lt; ActiveRecord::Base
   end
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, :conditions => { :type => folder_types}
-  named_scope :no_folders, :conditions => ['type NOT IN (?)', folder_types]
+  named_scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
+  named_scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
   named_scope :galleries, :conditions => { :type => 'Gallery' }
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
@@ -6,7 +6,7 @@ class Blog &lt; Folder
   #FIXME This should be used until there is a migration to fix all blogs that
   # already have folders inside them
   def posts_with_no_folders
-    posts_without_no_folders.no_folders
+    posts_without_no_folders.no_folders(profile)
   end
   alias_method_chain :posts, :no_folders
@@ -761,8 +761,20 @@ private :generate_url, :url_options
     !environment.enabled?('disable_contact_' + self.class.name.downcase)
   end
+  include Noosfero::Plugin::HotSpot
+  
+  def folder_types
+    types = Article.folder_types
+    plugins.dispatch(:content_types).each {|type|
+      if type < Folder
+        types << type.name
+      end
+    }
+    types
+  end
+
   def folders
-    articles.folders
+    articles.folders(self)
   end
   def image_galleries
@@ -9,6 +9,8 @@
   <%= hidden_field_tag('back_to', @back_to) %>
+  <%= hidden_field_tag('success_back_to', @success_back_to) %>
+
   <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
   <% if environment.is_portal_community?(profile) %>
@@ -25,7 +25,7 @@ class CommunityTrackPluginPublicController &lt; PublicController
   end
   def all_tracks
-    @per_page = 5 #FIXME
+    @per_page = 8 #FIXME
     @block = Block.find(params[:id])
     @tracks = @block.tracks(1, @per_page)
     @show_more = @block.has_page?(2, @per_page)
@@ -0,0 +1,12 @@
+class CommunityTrackPlugin::ActivationJob < Struct.new(:step_id)
+
+  def self.find(step_id)
+    Delayed::Job.where(:handler => "--- !ruby/struct:CommunityTrackPlugin::ActivationJob \nstep_id: #{step_id}\n")
+  end
+
+  def perform
+    step = CommunityTrackPlugin::Step.find(step_id)
+    step.toggle_activation
+  end
+
+end
 class CommunityTrackPlugin::Step < Folder
   settings_items :hidden, :type => :boolean, :default => false
+  settings_items :tool_type, :type => String
   alias :tools :children
@@ -17,13 +18,19 @@ class CommunityTrackPlugin::Step &lt; Folder
   after_save :schedule_activation
   before_create do |step|
-    step.published = false
+    step.accept_comments = false
     true
   end
   before_create :set_hidden_position
   before_save :set_hidden_position
+  def initialize(*args)
+    super(*args)
+    self.start_date ||= Date.today
+    self.end_date ||= Date.today + 1.day
+  end
+  
   def set_hidden_position
     if hidden
       decrement_positions_on_lower_items
@@ -48,11 +55,11 @@ class CommunityTrackPlugin::Step &lt; Folder
   end
   def accept_comments?
-    false
+    accept_comments
   end
-  def enabled_tools
-    {TinyMceArticle => {:name => _('Article')}, Forum => {:name => _('Forum')}}
+  def self.enabled_tools
+    [TinyMceArticle, Forum]
   end
   def to_html(options = {})
@@ -75,31 +82,31 @@ class CommunityTrackPlugin::Step &lt; Folder
   end
   def schedule_activation
-    return if !changes['start_date'] && !changes['end_date'] && !changes['published']
-    today = Date.today
-    if today <= end_date || published
-      schedule_date = !published ? start_date : end_date + 1.day
+    return if !changes['start_date'] && !changes['end_date']
+    if Date.today <= end_date || accept_comments
+      schedule_date = !accept_comments ? start_date : end_date + 1.day
       CommunityTrackPlugin::ActivationJob.find(id).destroy_all
       Delayed::Job.enqueue(CommunityTrackPlugin::ActivationJob.new(self.id), 0, schedule_date)
     end
   end
-  def publish
-    self[:published] = active? && !hidden
-    save!
+  def toggle_activation
+    accept_comments = active?
+    # set accept_comments = true on all children
+    self.class.toggle_activation(self, accept_comments)
   end
-  class CommunityTrackPlugin::ActivationJob < Struct.new(:step_id)
-
-    def self.find(step_id)
-      Delayed::Job.where(:handler => "--- !ruby/struct:CommunityTrackPlugin::ActivationJob \nstep_id: #{step_id}\n")
-    end
+  def self.toggle_activation(article, accept_comments)
+    article.update_attribute(:accept_comments, accept_comments)
+    article.children.each {|a| toggle_activation(a, accept_comments)}
+  end
-    def perform
-      step = CommunityTrackPlugin::Step.find(step_id)
-      step.publish
-    end
+  def tool_class
+    tool_type ? tool_type.constantize : nil
+  end
+  def tool
+    tools.find(:first, :conditions => {:type => tool_type })
   end
 end
 module CommunityTrackPlugin::StepHelper
   def self.status_descriptions
-    [_('Finished'), _('In progress'), _('Waiting')]
+    [_('Closed'), _('Join!'), _('Soon')]
   end
   def self.status_classes
@@ -16,9 +16,11 @@ module CommunityTrackPlugin::StepHelper
     CommunityTrackPlugin::StepHelper.status_classes[status_index(step)]
   end
-  def custom_options_for_article(article)
-    #no options for step?
-    nil
+  def link_to_step(step, options={}, name=nil)
+    url = step.tool ? step.tool.view_url : step.view_url
+    link_to url, options do
+      block_given? ? yield : name
+    end
   end
   protected
@@ -3,6 +3,12 @@ class CommunityTrackPlugin::Track &lt; Folder
   settings_items :goals, :type => :string
   settings_items :expected_results, :type => :string
+  validate :validate_categories
+
+  def validate_categories
+    errors.add(:categories, _('should not be blank.')) if categories.empty? && pending_categorizations.blank?
+  end
+
   def self.icon_name(article = nil)
     'community-track'
   end
@@ -57,7 +63,7 @@ class CommunityTrackPlugin::Track &lt; Folder
   def category_name
     category = categories.first
-    category ? category.name : ''
+    category ? category.top_ancestor.name : ''
   end
   def to_html(options = {})
@@ -34,6 +34,10 @@ class CommunityTrackPlugin::TrackListBlock &lt; Block
     settings[:category_ids] = ids.uniq.map{|item| item.to_i unless item.to_i.zero?}.compact
   end
+  def categories
+    Category.find(category_ids)
+  end
+
   def all_tracks
     tracks = owner.articles.where(:type => 'CommunityTrackPlugin::Track')
     if !category_ids.empty?
@@ -61,4 +65,8 @@ class CommunityTrackPlugin::TrackListBlock &lt; Block
     end
   end
+  def self.expire_on
+    { :profile => [:article, :category], :environment => [:article, :category] }
+  end
+
 end
@@ -0,0 +1,12 @@
+require_dependency 'article'
+
+class Article
+
+  before_create do |article|
+    if article.parent.kind_of?(CommunityTrackPlugin::Step)
+      article.accept_comments = article.parent.accept_comments
+    end
+    true
+  end
+
+end
@@ -3,17 +3,17 @@
   background-image: url(/plugins/community_track/icons/community-track.png)
 }
-.step_active, #article .step_active a {
+.step_active, #article .step_active {
   background-color: #CCEBD6;
   color: #338533;
 }
-.step_waiting, #article .step_waiting a {
+.step_waiting, #article .step_waiting {
   background-color: #FFFFD1;
   color: #D17519;
 }
-.step_finished, #article .step_finished a {
+.step_finished, #article .step_finished {
   background-color: #D1FFFF;
   color: #00297A;
 }
@@ -24,6 +24,7 @@
 .step {
   font-weight: bold;
+  margin-bottom: 3px;
 }
 .track_list .item .step {
@@ -73,6 +74,11 @@
 .steps .step {
   margin-top: 3px;
   margin-bottom: 3px;
+  display: block;
+}
+
+.steps a {
+  text-decoration: none;
 }
 .track_list .item_card .track_stats {
@@ -126,13 +132,15 @@
 #track .position {
   font-size: 24px;
   font-weight: bold;
-  float: left;
   margin: 0 10px;
+  display: inline-block;
+  vertical-align: top;
 }
-#track .step .name, #track .step .name a {
+#track .step .name {
   font-weight: bold;
   color: #333;
+  clear: both;
 }
 #track .step .name a:hover {
@@ -142,6 +150,7 @@
 #track .step .date {
   font-size: 12px;
   color: #AAA;
+  float: left;
 }
 #track .step .lead {
@@ -151,7 +160,7 @@
 #track .content {
   margin: 6px 0px;
-  border-bottom: 1px solid #DDDDDD;
+  display: inline-block;
 }
 #track .ui-state-default .content {
@@ -199,3 +208,60 @@
   width: 115px;
   background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;
 }
+
+.step_list .step .tools {
+  margin-top: 5px;
+}
+
+#article .step_list .step .tool_icon, 
+.tool_icon {
+  color: #888;
+  background-color: transparent;
+  border: 0px;
+  background-repeat: no-repeat;
+  line-height: 20px;
+  height: 20px;
+  padding: 3px 2px 3px 22px;
+}
+
+#article .step .tool_link {
+  cursor: pointer;
+}
+
+#article .step_active .tool_link:hover,
+#content .steps .step_active:hover {
+  background-color: #B8D4C1;
+}
+
+#article .step_waiting .tool_link:hover,
+#content .steps .step_waiting:hover {
+  background-color: #E6E6BC;
+}
+
+#article .step_finished .tool_link:hover,
+#content .steps .step_finished:hover {
+  background-color: #BCE6E6;
+}
+
+.step_list .step .step_actions {
+  text-align: right;
+}
+
+#article .step_list .step .step_actions .button {
+  color: #888;
+  background-color: transparent;
+  border: 0px;
+  border-right: 1px solid;
+}
+
+#article .step_list .step .step_actions .button:hover {
+  color: #444;
+}
+
+.step .content {
+  width: 80%;
+}
+
+.step .legend {
+  float: right;
+}
@@ -7,7 +7,7 @@ class CmsControllerTest &lt; ActionController::TestCase
   def setup
     @profile = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
+    @track = create_track('track', @profile)
     @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
     user = create_user('testinguser')
@@ -39,9 +39,4 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal 'changed', @step.name
   end
-  should 'do not be able to edit visibility of step' do
-    get :edit, :id => @step.id, :profile => @profile.identifier
-    assert_no_tag :tag => 'input', :attributes => { :name => 'article[published]' }
-  end
-
 end
@@ -11,11 +11,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   def setup
     @profile = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
-    category = fast_create(Category, :name => "education")
-    @track.add_category(category)
-
-    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    @track = create_track('track', @profile)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today, :tool_type => TinyMceArticle.name)
     user = create_user('testinguser')
     login_as(user.login)
@@ -24,15 +21,15 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'show actions for tracks when user has permission for edit' do
     get :view_page, @track.url
-    assert_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+    assert_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'track actions' } }
   end
-  should 'do not show actions for tracks when user has not permission for edit' do
+  should 'do not show actions for tracks when user has not permission to edit' do
     user = create_user('intruder')
     logout
     login_as(user.login)
     get :view_page, @track.url
-    assert_no_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
+    assert_no_tag :tag => 'div', :attributes => {:id => 'track' }, :descendant => { :tag => 'div', :attributes => { :class => 'track actions' } }
   end
   should 'do not show new button at article toolbar for tracks' do
@@ -45,7 +42,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display steps for tracks' do
     get :view_page, @track.url
-    assert_tag :tag => 'ul', :attributes => { :id => 'sortable' }, :descendant => {:tag => 'li', :attributes => { :class => 'step' } }
+    assert_tag :tag => 'ul', :attributes => { :id => 'sortable' }, :descendant => {:tag => 'li', :attributes => { :class => 'step step_active' } }
   end
   should 'display hidden field with step id' do
@@ -59,22 +56,28 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
   should 'show tools for a step' do
-    Article.create!(:profile => @profile, :name => 'article', :parent => @step)
+    TinyMceArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } }
   end
-  should 'show actions for steps when user has permission for edit' do
+  should 'show actions for steps when user has permission to edit' do
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => {:id => 'step' }, :descendant => { :tag => 'div', :attributes => { :class => 'actions' } }
   end
-  should 'show actions for enabled tools in step' do
+  should 'show action for tiny mce article tool in step' do
     get :view_page, @step.url
-    assert_tag 'div', :attributes => {:class => 'actions' }, :descendant => { :tag => 'a', :attributes => { :class => 'button with-text icon-new icon-newforum' } }
     assert_tag 'div', :attributes => {:class => 'actions' }, :descendant => { :tag => 'a', :attributes => { :class => 'button with-text icon-new icon-newtext-html' } }
   end
+  should 'show action for forum tool in step' do
+    @step.tool_type = Forum.name
+    @step.save!
+    get :view_page, @step.url
+    assert_tag 'div', :attributes => {:class => 'actions' }, :descendant => { :tag => 'a', :attributes => { :class => 'button with-text icon-new icon-newforum' } }
+  end
+
   should 'do not show actions for steps when user has not permission for edit' do
     user = create_user('intruder')
     logout
@@ -104,7 +107,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
     @profile.boxes << box
     get :view_page, @step.url
-    assert_tag :tag => 'div', :attributes => { :class => 'item category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'div', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
+    assert_tag :tag => 'div', :attributes => { :class => "item category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'steps' }, :descendant => { :tag => 'span', :attributes => { :class => "step #{@block.status_class(@step)}" } } }
   end
   should 'render tracks in track card list block' do
@@ -112,8 +115,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
     @profile.boxes << box
     get :view_page, @step.url
-    assert_tag :tag => 'div', :attributes => { :class => 'item_card category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
-    assert_tag :tag => 'div', :attributes => { :class => 'item_card category_education' }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
+    assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_content' } }
+    assert_tag :tag => 'div', :attributes => { :class => "item_card category_#{@track.category_name}" }, :descendant => { :tag => 'div', :attributes => { :class => 'track_stats' } }
   end
   should 'render link to display more tracks in track list block' do
@@ -121,9 +124,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
     @profile.boxes << box
-    (@block.limit+1).times do |i|
-      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @profile)
-    end
+    (@block.limit+1).times { |i| create_track("track#{i}", @profile) }
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :id => "track_list_more_#{@block.id}" }, :descendant => { :tag => 'div', :attributes => { :class => 'more' } }
@@ -136,9 +137,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     @block.more_another_page = true
     @block.save!
-    (@block.limit+1).times do |i|
-      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @profile)
-    end
+    (@block.limit+1).times { |i| create_track("track#{i}", @profile) }
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :id => "track_list_more_#{@block.id}" }, :descendant => { :tag => 'div', :attributes => { :class => 'view_all' } }
@@ -12,7 +12,7 @@ class CommunityTrackPluginMyprofileControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     @profile = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)
+    @track = create_track('track', @profile)
     @user = create_user('testinguser')
     login_as(@user.login)
@@ -8,7 +8,7 @@ class CommunityTrackPluginPublicControllerTest &lt; ActionController::TestCase
   def setup
     @community = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @community)
+    @track = create_track('track', @community)
     box = fast_create(Box, :owner_id => @community.id, :owner_type => 'Community')
     @card_block = CommunityTrackPlugin::TrackCardListBlock.create!(:box => box)
@@ -26,17 +26,13 @@ class CommunityTrackPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'display tracks with page size' do
-    20.times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    20.times { |i| create_track("track#{i}", @community) }
     xhr :get, :view_tracks, :id => @block.id, :page => 1, :per_page => 10
     assert_equal 10, @response.body.scan(/item/).size
   end
   should 'default page size is the block limit' do
-    20.times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    20.times { |i| create_track("track#{i}", @community) }
     xhr :get, :view_tracks, :id => @block.id, :page => 1
     assert_equal @block.limit, @response.body.scan(/item/).size
   end
@@ -47,9 +43,7 @@ class CommunityTrackPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'show more link in all tracks if there is no more tracks to show' do
-    10.times do |i|
-      CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    10.times { |i| create_track("track#{i}", @community) }
     get :all_tracks, :id => @block.id
     assert assigns['show_more']
     assert_match /track_list_more_#{@block.id}/, @response.body
 require File.dirname(__FILE__) + '/../../../test/test_helper'
+
+def create_track(name, profile)
+  track = CommunityTrackPlugin::Track.new(:abstract => 'abstract', :body => 'body', :name => name, :profile => profile)
+  track.add_category(fast_create(Category))
+  track.save!
+  track
+end
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+  
+  def setup
+    @profile = fast_create(Community)
+    @track = create_track('track', @profile)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+  end
+
+  should 'inherit accept_comments from parent if it is a step' do
+    @step.accept_comments = true
+    @step.save!
+    article = Article.create!(:parent => @step, :profile => @profile, :accept_comments => false, :name => "article")
+    assert article.accept_comments
+  end
+
+  should 'do nothing if parent is not a step' do
+    folder = fast_create(Folder, :profile_id => @profile.id)
+    article = Article.create!(:parent => folder, :profile => @profile, :accept_comments => false, :name => "article")
+    assert !article.accept_comments
+  end
+
+end
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class ActivationJobTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @track = create_track('track', @profile)
+    @step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    Delayed::Job.destroy_all
+  end
+
+  should 'return delayed job created with a specific step_id' do
+    step_id = 0
+    CommunityTrackPlugin::ActivationJob.new(step_id)
+    assert CommunityTrackPlugin::ActivationJob.find(step_id)
+  end
+
+  should 'change accept_comments to true on perform delayed job in a active step' do
+    @step.start_date = Date.today
+    @step.end_date = Date.today + 2.days
+    @step.accept_comments = false
+    @step.save!
+    CommunityTrackPlugin::ActivationJob.new(@step.id).perform
+    @step.reload
+    assert @step.accept_comments
+  end
+
+end
@@ -6,6 +6,8 @@ class StepHelperTest &lt; ActiveSupport::TestCase
   def setup
     @step = CommunityTrackPlugin::Step.new
+    @profile = fast_create(Community)
+    @step.stubs(:profile).returns(@profile)
     @step.stubs(:active?).returns(false)
     @step.stubs(:finished?).returns(false)
     @step.stubs(:waiting?).returns(false)
@@ -28,11 +30,31 @@ class StepHelperTest &lt; ActiveSupport::TestCase
   should 'return a description for status' do
     @step.stubs(:waiting?).returns(true)
-    assert_equal _('Waiting'), status_description(@step)
+    assert_equal _('Soon'), status_description(@step)
   end
-  should 'return nil at custom_options_for_article' do
-    assert !custom_options_for_article(fast_create(Article))
+  should 'return link to step if there is no tool in a step' do
+    expects(:link_to).with(@step.view_url, {}).once
+    link = link_to_step(@step) do
+      "content"
+    end
+  end
+
+  should 'return link to step tool if there is a tool' do
+    tool = fast_create(Article, :profile_id => @profile.id)
+    @step.stubs(:tool).returns(tool)
+    expects(:link_to).with(tool.view_url, {}).once
+    link = link_to_step(@step) do
+      "content"
+    end
+  end
+
+  should 'return link with name if no block is given' do
+    def link_to(url, options)
+      yield
+    end
+    link = link_to_step(@step, {}, 'link name')
+    assert_equal 'link name', link
   end
 end
@@ -4,7 +4,11 @@ class StepTest &lt; ActiveSupport::TestCase
   def setup
     @profile = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create(:profile_id => @profile.id, :name => 'track')
+    @track = CommunityTrackPlugin::Track.new(:profile_id => @profile.id, :name => 'track')
+    @category = fast_create(Category)
+    @track.add_category(@category)
+    @track.save!
+
     @step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
     Delayed::Job.destroy_all
   end
@@ -17,10 +21,10 @@ class StepTest &lt; ActiveSupport::TestCase
     assert CommunityTrackPlugin::Step.short_description
   end
-  should 'set published to false on create' do
+  should 'set accept_comments to false on create' do
     today = Date.today
     step = CommunityTrackPlugin::Step.create(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :start_date => today, :end_date => today, :published => true)
-    assert !step.published
+    assert !step.accept_comments
   end
   should 'do not allow step creation with a parent that is not a track' do
@@ -93,6 +97,7 @@ class StepTest &lt; ActiveSupport::TestCase
   should 'create delayed job' do
     @step.start_date = Date.today
     @step.end_date = Date.today
+    @step.accept_comments = false
     @step.schedule_activation
     assert_equal 1, Delayed::Job.count
     assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
@@ -102,6 +107,7 @@ class StepTest &lt; ActiveSupport::TestCase
     @step.start_date = Date.today
     @step.end_date = Date.today
     @step.schedule_activation
+    assert_equal 1, Delayed::Job.count
     @step.schedule_activation
     assert_equal 1, Delayed::Job.count
   end
@@ -116,50 +122,21 @@ class StepTest &lt; ActiveSupport::TestCase
   should 'create delayed job even if start date has passed' do
     @step.start_date = Date.today - 2.days
     @step.end_date = Date.today
+    @step.accept_comments = false
     @step.schedule_activation
     assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
   end
-  should 'do not create delayed job if end date has passed and step is not published' do
-    @step.start_date = Date.today - 5.days
-    @step.end_date = Date.today - 2.days
-    @step.published = false
-    @step.schedule_activation
-    assert_equal 0, Delayed::Job.count
-  end
-
-  should 'create delayed job if end date has passed and step is published' do
+  should 'create delayed job if end date has passed' do
     @step.start_date = Date.today - 5.days
     @step.end_date = Date.today - 2.days
-    @step.published = true
     @step.schedule_activation
     assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at.to_date
   end
-  should 'change publish to true on perform delayed job in a active step' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today + 2.days
-    @step.published = false
-    @step.save!
-    CommunityTrackPlugin::ActivationJob.new(@step.id).perform
-    @step.reload
-    assert @step.published
-  end
-
-  should 'reschedule delayed job after change publish to true' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today + 2.days
-    @step.published = false
-    @step.save!
-    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
-    process_delayed_job_queue
-    assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at.to_date
-  end
-
-  should 'do not schedule delayed job if save but do not modify date fields and published status' do
+  should 'do not schedule delayed job if save but do not modify date fields' do
     @step.start_date = Date.today
     @step.end_date = Date.today
-    @step.published = false
     @step.save!
     assert_equal 1, Delayed::Job.count
     Delayed::Job.destroy_all
@@ -177,38 +154,38 @@ class StepTest &lt; ActiveSupport::TestCase
     assert_equal 2, step2.position
   end
-  should 'publish step if it is active' do
+  should 'accept comments if step is active' do
     @step.start_date = Date.today
     @step.save!
-    assert !@step.published
-    @step.publish
+    assert !@step.accept_comments
+    @step.toggle_activation
     @step.reload
-    assert @step.published
+    assert @step.accept_comments
   end
-  should 'do not publish step if it is not active' do
+  should 'do not accept comments if step is not active' do
     @step.start_date = Date.today + 2.days
     @step.end_date = Date.today + 3.days
     @step.save!
     assert !@step.published
-    @step.publish
+    @step.toggle_activation
     @step.reload
     assert !@step.published
   end
-  should 'unpublish step if it is not active anymore' do
+  should 'do not accept comments if step is not active anymore' do
     @step.start_date = Date.today
     @step.save!
-    @step.publish
+    @step.toggle_activation
     @step.reload
-    assert @step.published
+    assert @step.accept_comments
     @step.start_date = Date.today - 2.days
     @step.end_date = Date.today - 1.day
     @step.save!
-    @step.publish
+    @step.toggle_activation
     @step.reload
-    assert !@step.published
+    assert !@step.accept_comments
   end
   should 'set position to zero if step is hidden' do
@@ -252,14 +229,60 @@ class StepTest &lt; ActiveSupport::TestCase
     @step.hidden = true
     @step.save!
     assert !@step.published
-    @step.publish
+    @step.toggle_activation
     @step.reload
     assert !@step.published
   end
   should 'return enabled tools for a step' do
-    assert_includes @step.enabled_tools, TinyMceArticle
-    assert_includes @step.enabled_tools, Forum
+    assert_includes CommunityTrackPlugin::Step.enabled_tools, TinyMceArticle
+    assert_includes CommunityTrackPlugin::Step.enabled_tools, Forum
+  end
+
+  should 'return class for selected tool' do
+    @step.tool_type = 'Forum'
+    assert_equal Forum, @step.tool_class
+  end
+
+  should 'return tool for selected type' do
+    @step.tool_type = 'Forum'
+    @step.save!
+    article = fast_create(Article, :parent_id => @step.id)
+    forum = fast_create(Forum, :parent_id => @step.id)
+    assert_equal forum, @step.tool
+  end
+
+  should 'not return tool with different type' do
+    @step.tool_type = 'Forum'
+    @step.save!
+    article = fast_create(Article, :parent_id => @step.id)
+    assert_not_equal article, @step.tool
+  end
+
+  should 'initialize start date and end date with default values' do
+    step = CommunityTrackPlugin::Step.new
+    assert step.start_date
+    assert step.end_date
+  end
+
+  should 'enable comments on children when step is activated' do
+    @step.start_date = Date.today
+    @step.save!
+    assert !@step.accept_comments
+    article = fast_create(Article, :parent_id => @step.id, :profile_id => @step.profile.id, :accept_comments => false)
+    assert !article.accept_comments
+    @step.toggle_activation
+    assert article.reload.accept_comments
+  end
+
+  should 'enable comments on children when step is active' do
+    @step.start_date = Date.today
+    @step.start_date = Date.today
+    @step.save!
+    assert !@step.accept_comments
+    @step.toggle_activation
+    article = Article.create!(:parent => @step, :profile => @step.profile, :accept_comments => false, :name => "article")
+    assert article.reload.accept_comments
   end
 end
@@ -3,13 +3,14 @@ require File.dirname(__FILE__) + &#39;/../../test_helper&#39;
 class TrackListBlockTest < ActiveSupport::TestCase
   def setup
-    @community = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @community)
-
-    box = fast_create(Box, :owner_id => @community.id, :owner_type => @community.class.name)
+    @profile = fast_create(Community)
+    @track = create_track('track', profile)
+    box = fast_create(Box, :owner_id => @profile.id, :owner_type => @profile.class.name)
     @block = CommunityTrackPlugin::TrackListBlock.create!(:box => box)
   end
+  attr_reader :profile
+
   should 'describe yourself' do
     assert CommunityTrackPlugin::TrackListBlock.description
   end
@@ -23,38 +24,30 @@ class TrackListBlockTest &lt; ActiveSupport::TestCase
   end
   should 'list articles only of track type' do
-    article = fast_create(Article, :profile_id => @community.id)
-    assert_includes @community.articles, article
+    article = fast_create(Article, :profile_id => profile.id)
+    assert_includes profile.articles, article
     assert_equal [@track], @block.tracks
   end
   should 'list of articles be limited by block configuration' do
-    (@block.limit + 1).times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    (@block.limit + 1).times { |i| create_track("track#{i}", profile) }
     assert_equal @block.limit, @block.tracks.count
   end
   should 'return more link if has more tracks to show' do
-    @block.limit.times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    @block.limit.times { |i| create_track("track#{i}", profile) }
     assert @block.footer
   end
   should 'do not return more link if there is no more tracks to show' do
-    (@block.limit-1).times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    (@block.limit-1).times { |i| create_track("track#{i}", profile) }
     assert !@block.footer
   end
   should 'count all tracks' do
     @block.owner.articles.destroy_all
     tracks_to_insert = @block.limit + 1
-    tracks_to_insert.times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    tracks_to_insert.times { |i| create_track("track#{i}", profile) }
     article = fast_create(Article, :profile_id => @block.owner.id)
     @block.reload
     assert_includes @block.owner.articles, article
@@ -63,9 +56,7 @@ class TrackListBlockTest &lt; ActiveSupport::TestCase
   should 'have a second page if there is more tracks than limit' do
     @block.owner.articles.destroy_all
-    (@block.limit+1).times do |i|
-      track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => "track#{i}", :profile => @community)
-    end
+    (@block.limit+1).times { |i| create_track("track#{i}", profile) }
     assert @block.has_page?(2)
     assert !@block.has_page?(3)
   end
@@ -74,9 +65,9 @@ class TrackListBlockTest &lt; ActiveSupport::TestCase
     @block.owner.articles.destroy_all
     category = fast_create(Category)
     category2 = fast_create(Category)
-    track1 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track1', :profile => @community)
-    track2 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track2', :profile => @community)
-    track3 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track3', :profile => @community)
+    track1 = create_track("track1", profile)
+    track2 = create_track("track2", profile)
+    track3 = create_track("track3", profile)
     track1.add_category(category)
     @block.category_ids = [category.id]
     assert_equal [track1], @block.all_tracks
@@ -85,8 +76,8 @@ class TrackListBlockTest &lt; ActiveSupport::TestCase
   should 'return all tracks if block does not filter by category' do
     @block.owner.articles.destroy_all
     category = fast_create(Category)
-    track1 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track1', :profile => @community)
-    track2 = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track2', :profile => @community)
+    track1 = create_track("track1", profile)
+    track2 = create_track("track2", profile)
     track1.add_category(category)
     assert_includes @block.all_tracks, track1
     assert_includes @block.all_tracks, track2
@@ -102,4 +93,22 @@ class TrackListBlockTest &lt; ActiveSupport::TestCase
     assert_equal [1, 2], @block.category_ids
   end
+  should 'define expiration condition' do
+    condition = CommunityTrackPlugin::TrackListBlock.expire_on
+    assert !condition[:profile].empty?
+    assert !condition[:environment].empty?
+  end
+
+  should 'return track list block categories' do
+    category1 = fast_create(Category)
+    category2 = fast_create(Category)
+    @block.category_ids = [category1.id, category2.id]
+    assert_equivalent [category1, category2], @block.categories
+  end
+
+  should 'return nothing if track list block has no categories' do
+    @block.category_ids = []
+    assert_equivalent [], @block.categories
+  end
+
 end
@@ -3,10 +3,10 @@ require File.dirname(__FILE__) + &#39;/../../test_helper&#39;
 class TrackTest < ActiveSupport::TestCase
   def setup
-    profile = fast_create(Community)
-    @track = CommunityTrackPlugin::Track.create!(:profile => profile, :name => 'track')
-    @step = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => 'step', :profile => profile)
-    @tool = fast_create(Article, :parent_id => @step.id, :profile_id => profile.id)
+    @profile = fast_create(Community)
+    @track = create_track('track', @profile)
+    @step = CommunityTrackPlugin::Step.create!(:parent => @track, :start_date => Date.today, :end_date => Date.today, :name => 'step', :profile => @profile)
+    @tool = fast_create(Article, :parent_id => @step.id, :profile_id => @profile.id)
   end
   should 'describe yourself' do
@@ -39,10 +39,13 @@ class TrackTest &lt; ActiveSupport::TestCase
     assert_equal [@step], @track.steps_unsorted
   end
-  should 'return category name' do
-    category = fast_create(Category, :name => 'category')
-    @track.add_category(category, true)
-    assert_equal 'category', @track.category_name
+  should 'return name of the top category' do
+    top = fast_create(Category, :name => 'top category')
+    category1 = fast_create(Category, :name => 'category1', :parent_id => top.id )
+    category2 = fast_create(Category, :name => 'category2', :parent_id => category1.id )
+    @track.categories.delete_all
+    @track.add_category(category2, true)
+    assert_equal 'top category', @track.category_name
   end
   should 'return empty for category name if it has no category' do
@@ -52,6 +55,7 @@ class TrackTest &lt; ActiveSupport::TestCase
   should 'return category name of first category' do
     category = fast_create(Category, :name => 'category')
+    @track.categories.delete_all
     @track.add_category(category, true)
     category2 = fast_create(Category, :name => 'category2')
     @track.add_category(category2, true)
@@ -124,4 +128,15 @@ class TrackTest &lt; ActiveSupport::TestCase
     assert_equal '', @track.first_paragraph
   end
+  should 'not be able to create a track without category' do
+    track = CommunityTrackPlugin::Track.create(:profile => @profile, :name => 'track')
+    assert track.errors.invalid?(:categories)
+  end
+
+  should 'not be able to save a track without category' do
+    @track.categories.delete_all
+    @track.save
+    assert @track.errors.invalid?(:categories)
+  end
+
 end
 <% extend CommunityTrackPlugin::TrackHelper %>
+<% extend CommunityTrackPlugin::StepHelper %>
 <div class="item <%= category_class(track) %>">
   <div class="track_content">
     <div class="lead">
@@ -10,10 +11,14 @@
     <div class="steps">
       <h3><%= _("Steps") %></h3>
       <% track.steps.each do |step| %>
-        <div class="step <%= block.status_class(step) %>">
-          <div class="position"><%= step.position %></div>
-          <%= link_to step.name, step.url %>
-        </div>
+        <% link_to_step(step) do %>
+          <span class="step <%= block.status_class(step) %>">
+            <span class="position"><%= step.position %></span>
+            <span class="legend"><%= status_description(step) %></span>
+            <span class="tool_icon button with-text icon-new icon-new<%= step.tool_class.icon_name if step.tool_class %>"></span>
+            <span class="name"><%= step.name %></span>
+          </span>
+        <% end %>
       <% end %>
     </div>
   </div>
@@ -17,10 +17,12 @@
   </div>
   <div class="track_stats">
     <div class="comments">
-      <%= "#{track_card.comments_count} comments" %>
+      <span class="counter"><%= "#{track_card.comments_count}" %></span>
+      <span class="label"><%= _('comments') %></span>
     </div>
     <div class="hits">
-      <%= "#{track_card.hits} hits" %>
+      <span class="counter"><%= "#{track_card.hits}" %></span>
+      <span class="label"><%= _('acessos') %></span>
     </div>
   </div>
   </a>
@@ -12,6 +12,8 @@
                      { :size => 14 })
   )) %>
+  <%= labelled_form_field(_('Tool type'), select(:article, :tool_type, CommunityTrackPlugin::Step.enabled_tools.map {|t| [t.short_description, t.name]} )) %>
+  <%= hidden_field_tag('success_back_to', url_for(@article.parent.view_url)) %>
 </div>
 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
@@ -10,10 +10,6 @@
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
   <div>
-    <% f.fields_for :image_builder, @article.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @article.image, i) %>
-    <% end %>
-
     <%= labelled_form_field(_('Goals:'), text_area(:article, :goals, :rows => 3, :cols => 64)) %>
     <%= labelled_form_field(_('Expected Results:'), text_area(:article, :expected_results, :rows => 3, :cols => 64)) %>
   </div>
@@ -0,0 +1,41 @@
+<li class="step <%= status_class(step_item) %>">
+  <%= hidden_field_tag "step_ids[]", step_item.id %>
+  <div class="tool_link" onclick="l=jQuery('#step_link_<%= step_item.id%>'); if(l.length) window.location = l.first().attr('href');">
+    <div class="position"><%= step_item.hidden ? '' : step_item.position %></div>
+    <div class="content">
+      <div class="date">
+        <%= show_period(step_item.start_date, step_item.end_date) %>
+      </div>
+      <div class="legend">
+        <%= status_description(step_item) %>
+      </div>
+      <div class="name"><span class="tool_icon button with-text icon-new icon-new<%= step_item.tool_class.icon_name if step_item.tool_class %>"></span>  <%= step_item.name %></div>
+      <div class="lead"><%= step_item.body %></div>
+      <div class="tools">
+        <% if step_item.tool %>
+          <%= _('Tool: ') %>
+
+          <% link_to_step(step_item, {:id => "step_link_#{step_item.id}"}) do %>
+            <%= step_item.tool.name %>
+          <% end %>
+
+        <% elsif step_item.allow_create?(user) && step_item.tool_class %>
+          <a id="step_link_<%= step_item.id %>" href="<%= url_for({:controller => 'cms', :action => 'new', :type => step_item.tool_class, :parent_id => step_item, :success_back_to => url_for(step_item.parent.view_url)}) %>" class="button icon-new with-text icon-new<%= step_item.tool_class.icon_name %>"><%= _('Create %s' % step_item.tool_class.short_description) %></a>
+        <% else %>
+          <% link_to_step(step_item, {:id => "step_link_#{step_item.id}"}, '') %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="step_actions">
+    <% if step_item.allow_edit?(user) && !remove_content_button(:edit) %>
+      <%= button('eyes', _('View'), step_item.url) %>
+      <% content = content_tag('span', label_for_edit_article(step_item)) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => step_item.id, :success_back_to => url_for(step_item.parent.view_url) }) %>
+      <%= expirable_button step_item, :edit, content, url %>
+    <% end %>
+    <% if step_item.accept_uploads? && step_item.allow_create?(user) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => step_item)) unless remove_content_button(:upload)%>
+    <% end %>
+  </div>
+</li>
@@ -9,23 +9,20 @@
   <div>
     <%= step.body %>
   </div>
-  <h3><%= _("Tools") %></h3>
-  <% if step.allow_create?(user) %>
+  <% if step.allow_create?(user) && !step.tool && step.tool_class %>
+    <h3><%= _("Tool") %></h3>
     <div class="actions">
-      <% step.enabled_tools.each do |klass, attrs| %>
-        <% content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => klass.name, :parent_id => @page}), :class => "button with-text icon-new icon-new#{klass.icon_name}") do %>
-            <%= _("New #{attrs[:name]}") %>
-        <% end %>
-      <% end %>
+      <a href="<%= url_for({:controller => 'cms', :action => 'new', :type => step.tool_type.constantize, :parent_id => @page}) %>" class="button with-text icon-new icon-new<%= step.tool_class.icon_name %>"><%= _('Create %s' % step.tool_class.short_description) %></a>
     </div>
   <% end %>
-  <div class="tools">
-    <% step.tools.each do |tool| %>
+  <% if step.tool %>
+    <h3><%= _("Tool") %></h3>
+    <div class="tools">
       <div class="item">
         <div class="name">
-          <%= link_to tool.name, tool.url, :class=>"button with-text icon-new icon-new#{tool.class.icon_name}" %>
+          <%= link_to(step.tool.name, step.tool.view_url, :class=>"button with-text icon-new icon-new#{step.tool.class.icon_name}") %>
+          </div>
         </div>
-      </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </div>
@@ -9,7 +9,7 @@
   <h3><%= _("Steps") %></h3>
   <% if track.allow_create?(user) %>
-    <div class="actions">
+    <div class="track actions">
         <% content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "CommunityTrackPlugin::Step", :parent_id => track.id}), :class => 'button with-text icon-add') do %>
           <strong><%= _("New %s") % CommunityTrackPlugin::Step.short_description %></strong>
         <% end %>
@@ -28,40 +28,15 @@
     <% end %>
     <ul id="sortable" class="step_list">
-    <% track.steps.each do |step| %>
-      <li class="step">
-        <%= hidden_field_tag "step_ids[]", step.id %>
-        <div class="position"><%= step.position %></div>
-        <div class="content">
-          <div class="date">
-            <%= show_period(step.start_date, step.end_date) %>
-          </div>
-          <div class="name"><%= link_to step.name, step.url %></div>
-          <div class="lead"><%= step.body %></div>
-        </div>
-      </li>
-    <% end %>
+      <%= render :partial => 'step_item', :collection => track.steps %>
     </ul>
-  <% if track.allow_create?(user) && !track.hidden_steps.empty? %>
-    <div id="hidden_steps">
-      <h3><%= _('Hidden Steps') %></h3>
-      <ul class="step_list">
-      <% track.hidden_steps.each do |step| %>
-        <li class="step">
-          <%= hidden_field_tag "step_ids[]", step.id %>
-          <div class="position"></div>
-          <div class="content">
-            <div class="date">
-              <%= show_period(step.start_date, step.end_date) %>
-            </div>
-            <div class="name"><%= link_to step.name, step.url %></div>
-            <div class="lead"><%= step.body %></div>
-          </div>
-        </li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+    <% if track.allow_create?(user) && !track.hidden_steps.empty? %>
+      <div id="hidden_steps">
+        <h3><%= _('Hidden Steps') %></h3>
+        <ul class="step_list">
+          <%= render :partial => 'step_item', :collection => track.hidden_steps %>
+        </ul>
+      </div>
+    <% end %>
 </div>
 <% end %>
-</div>
@@ -18,7 +18,7 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   end
   def content_types
-    [WorkAssignmentPlugin::WorkAssignment] if context.profile.organization?
+    [WorkAssignmentPlugin::WorkAssignment] if context.respond_to?(:profile) && context.profile.organization?
   end
   def stylesheet?
@@ -1708,6 +1708,17 @@ class CmsControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'go back to specified url when saving with success' do
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }, :success_back_to => '/'
+    assert_redirected_to '/'
+  end
+
+  should 'redirect back to specified url when edit with success' do
+    article = @profile.articles.create!(:name => 'myarticle')
+    post :edit, :profile => 'testinguser', :id => article.id, :success_back_to => '/'
+    assert_redirected_to '/'
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -1405,30 +1405,32 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'return only folders' do
     not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
     folders = [Folder, Blog, Gallery, Forum]
+    profile = fast_create(Profile)
     not_folders.each do |klass|
       item = fast_create(klass)
-      assert_not_includes Article.folders, item
+      assert_not_includes Article.folders(profile), item
     end
     folders.each do |klass|
       item = fast_create(klass)
-      assert_includes Article.folders, item
+      assert_includes Article.folders(profile), item
     end
   end
   should 'return no folders' do
     not_folders = [RssFeed, TinyMceArticle, Event, TextileArticle]
     folders = [Folder, Blog, Gallery, Forum]
+    profile = fast_create(Profile)
     not_folders.each do |klass|
       item = fast_create(klass)
-      assert_includes Article.no_folders, item
+      assert_includes Article.no_folders(profile), item
     end
     folders.each do |klass|
       item = fast_create(klass)
-      assert_not_includes Article.no_folders, item
+      assert_not_includes Article.no_folders(profile), item
     end
   end
@@ -198,7 +198,8 @@ class BlogTest &lt; ActiveSupport::TestCase
   #FIXME This should be used until there is a migration to fix all blogs that
   # already have folders inside them
   should 'not list folders in posts' do
-    blog = fast_create(Blog)
+    p = create_user('testuser').person
+    blog =  Blog.create!(:profile => p, :name => 'Blog test')
     folder = fast_create(Folder, :parent_id => blog.id)
     article = fast_create(TextileArticle, :parent_id => blog.id)
@@ -212,7 +213,8 @@ class BlogTest &lt; ActiveSupport::TestCase
   end
   should 'know when blog has or when has no posts' do
-    blog = fast_create(Blog)
+    p = create_user('testuser').person
+    blog =  Blog.create!(:profile => p, :name => 'Blog test')
     assert blog.empty?
     fast_create(TextileArticle, :parent_id => blog.id)
     assert ! blog.empty?
@@ -1934,4 +1934,20 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes Profile.public, p4
   end
+  should 'folder_types search for folders in the plugins' do
+    class Folder1 < Folder
+    end
+
+    class Plugin1 < Noosfero::Plugin
+      def content_types
+        [Folder1]
+      end
+    end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    plugins = Noosfero::Plugin::Manager.new(environment, self)
+    p = fast_create(Profile)
+    assert p.folder_types.include?('ProfileTest::Folder1')
+  end
 end
	@@ -6,7 +6,7 @@ class Blog < Folder		@@ -6,7 +6,7 @@ class Blog < Folder
6	#FIXME This should be used until there is a migration to fix all blogs that	6	#FIXME This should be used until there is a migration to fix all blogs that
7	# already have folders inside them	7	# already have folders inside them
8	def posts_with_no_folders	8	def posts_with_no_folders
9	- posts_without_no_folders.no_folders	9	+ posts_without_no_folders.no_folders(profile)
10	end	10	end
11	alias_method_chain :posts, :no_folders	11	alias_method_chain :posts, :no_folders
12		12
	@@ -761,8 +761,20 @@ private :generate_url, :url_options		@@ -761,8 +761,20 @@ private :generate_url, :url_options
761	!environment.enabled?('disable_contact_' + self.class.name.downcase)	761	!environment.enabled?('disable_contact_' + self.class.name.downcase)
762	end	762	end
763		763
		764	+ include Noosfero::Plugin::HotSpot
		765	+
		766	+ def folder_types
		767	+ types = Article.folder_types
		768	+ plugins.dispatch(:content_types).each {\|type\|
		769	+ if type < Folder
		770	+ types << type.name
		771	+ end
		772	+ }
		773	+ types
		774	+ end
		775	+
764	def folders	776	def folders
765	- articles.folders	777	+ articles.folders(self)
766	end	778	end
767		779
768	def image_galleries	780	def image_galleries
	@@ -9,6 +9,8 @@		@@ -9,6 +9,8 @@
9		9
10	<%= hidden_field_tag('back_to', @back_to) %>	10	<%= hidden_field_tag('back_to', @back_to) %>
11		11
		12	+ <%= hidden_field_tag('success_back_to', @success_back_to) %>
		13	+
12	<%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>	14	<%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
13		15
14	<% if environment.is_portal_community?(profile) %>	16	<% if environment.is_portal_community?(profile) %>
	@@ -25,7 +25,7 @@ class CommunityTrackPluginPublicController < PublicController		@@ -25,7 +25,7 @@ class CommunityTrackPluginPublicController < PublicController
25	end	25	end
26		26
27	def all_tracks	27	def all_tracks
28	- @per_page = 5 #FIXME	28	+ @per_page = 8 #FIXME
29	@block = Block.find(params[:id])	29	@block = Block.find(params[:id])
30	@tracks = @block.tracks(1, @per_page)	30	@tracks = @block.tracks(1, @per_page)
31	@show_more = @block.has_page?(2, @per_page)	31	@show_more = @block.has_page?(2, @per_page)
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class CommunityTrackPlugin::ActivationJob < Struct.new(:step_id)
	2	+
	3	+ def self.find(step_id)
	4	+ Delayed::Job.where(:handler => "--- !ruby/struct:CommunityTrackPlugin::ActivationJob \nstep_id: #{step_id}\n")
	5	+ end
	6	+
	7	+ def perform
	8	+ step = CommunityTrackPlugin::Step.find(step_id)
	9	+ step.toggle_activation
	10	+ end
	11	+
	12	+end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+require_dependency 'article'
	2	+
	3	+class Article
	4	+
	5	+ before_create do \|article\|
	6	+ if article.parent.kind_of?(CommunityTrackPlugin::Step)
	7	+ article.accept_comments = article.parent.accept_comments
	8	+ end
	9	+ true
	10	+ end
	11	+
	12	+end
	@@ -3,17 +3,17 @@		@@ -3,17 +3,17 @@
3	background-image: url(/plugins/community_track/icons/community-track.png)	3	background-image: url(/plugins/community_track/icons/community-track.png)
4	}	4	}
5		5
6	-.step_active, #article .step_active a {	6	+.step_active, #article .step_active {
7	background-color: #CCEBD6;	7	background-color: #CCEBD6;
8	color: #338533;	8	color: #338533;
9	}	9	}
10		10
11	-.step_waiting, #article .step_waiting a {	11	+.step_waiting, #article .step_waiting {
12	background-color: #FFFFD1;	12	background-color: #FFFFD1;
13	color: #D17519;	13	color: #D17519;
14	}	14	}
15		15
16	-.step_finished, #article .step_finished a {	16	+.step_finished, #article .step_finished {
17	background-color: #D1FFFF;	17	background-color: #D1FFFF;
18	color: #00297A;	18	color: #00297A;
19	}	19	}
	@@ -24,6 +24,7 @@		@@ -24,6 +24,7 @@
24		24
25	.step {	25	.step {
26	font-weight: bold;	26	font-weight: bold;
		27	+ margin-bottom: 3px;
27	}	28	}
28		29
29	.track_list .item .step {	30	.track_list .item .step {
	@@ -73,6 +74,11 @@		@@ -73,6 +74,11 @@
73	.steps .step {	74	.steps .step {
74	margin-top: 3px;	75	margin-top: 3px;
75	margin-bottom: 3px;	76	margin-bottom: 3px;
		77	+ display: block;
		78	+}
		79	+
		80	+.steps a {
		81	+ text-decoration: none;
76	}	82	}
77		83
78	.track_list .item_card .track_stats {	84	.track_list .item_card .track_stats {
	@@ -126,13 +132,15 @@		@@ -126,13 +132,15 @@
126	#track .position {	132	#track .position {
127	font-size: 24px;	133	font-size: 24px;
128	font-weight: bold;	134	font-weight: bold;
129	- float: left;
130	margin: 0 10px;	135	margin: 0 10px;
		136	+ display: inline-block;
		137	+ vertical-align: top;
131	}	138	}
132		139
133	-#track .step .name, #track .step .name a {	140	+#track .step .name {
134	font-weight: bold;	141	font-weight: bold;
135	color: #333;	142	color: #333;
		143	+ clear: both;
136	}	144	}
137		145
138	#track .step .name a:hover {	146	#track .step .name a:hover {
	@@ -142,6 +150,7 @@		@@ -142,6 +150,7 @@
142	#track .step .date {	150	#track .step .date {
143	font-size: 12px;	151	font-size: 12px;
144	color: #AAA;	152	color: #AAA;
		153	+ float: left;
145	}	154	}
146		155
147	#track .step .lead {	156	#track .step .lead {
	@@ -151,7 +160,7 @@		@@ -151,7 +160,7 @@
151		160
152	#track .content {	161	#track .content {
153	margin: 6px 0px;	162	margin: 6px 0px;
154	- border-bottom: 1px solid #DDDDDD;	163	+ display: inline-block;
155	}	164	}
156		165
157	#track .ui-state-default .content {	166	#track .ui-state-default .content {
	@@ -199,3 +208,60 @@		@@ -199,3 +208,60 @@
199	width: 115px;	208	width: 115px;
200	background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;	209	background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;
201	}	210	}
		211	+
		212	+.step_list .step .tools {
		213	+ margin-top: 5px;
		214	+}
		215	+
		216	+#article .step_list .step .tool_icon,
		217	+.tool_icon {
		218	+ color: #888;
		219	+ background-color: transparent;
		220	+ border: 0px;
		221	+ background-repeat: no-repeat;
		222	+ line-height: 20px;
		223	+ height: 20px;
		224	+ padding: 3px 2px 3px 22px;
		225	+}
		226	+
		227	+#article .step .tool_link {
		228	+ cursor: pointer;
		229	+}
		230	+
		231	+#article .step_active .tool_link:hover,
		232	+#content .steps .step_active:hover {
		233	+ background-color: #B8D4C1;
		234	+}
		235	+
		236	+#article .step_waiting .tool_link:hover,
		237	+#content .steps .step_waiting:hover {
		238	+ background-color: #E6E6BC;
		239	+}
		240	+
		241	+#article .step_finished .tool_link:hover,
		242	+#content .steps .step_finished:hover {
		243	+ background-color: #BCE6E6;
		244	+}
		245	+
		246	+.step_list .step .step_actions {
		247	+ text-align: right;
		248	+}
		249	+
		250	+#article .step_list .step .step_actions .button {
		251	+ color: #888;
		252	+ background-color: transparent;
		253	+ border: 0px;
		254	+ border-right: 1px solid;
		255	+}
		256	+
		257	+#article .step_list .step .step_actions .button:hover {
		258	+ color: #444;
		259	+}
		260	+
		261	+.step .content {
		262	+ width: 80%;
		263	+}
		264	+
		265	+.step .legend {
		266	+ float: right;
		267	+}
	@@ -12,7 +12,7 @@ class CommunityTrackPluginMyprofileControllerTest < ActionController::TestCase		@@ -12,7 +12,7 @@ class CommunityTrackPluginMyprofileControllerTest < ActionController::TestCase
12	@response = ActionController::TestResponse.new	12	@response = ActionController::TestResponse.new
13		13
14	@profile = fast_create(Community)	14	@profile = fast_create(Community)
15	- @track = CommunityTrackPlugin::Track.create!(:abstract => 'abstract', :body => 'body', :name => 'track', :profile => @profile)	15	+ @track = create_track('track', @profile)
16		16
17	@user = create_user('testinguser')	17	@user = create_user('testinguser')
18	login_as(@user.login)	18	login_as(@user.login)
1	require File.dirname(__FILE__) + '/../../../test/test_helper'	1	require File.dirname(__FILE__) + '/../../../test/test_helper'
		2	+
		3	+def create_track(name, profile)
		4	+ track = CommunityTrackPlugin::Track.new(:abstract => 'abstract', :body => 'body', :name => name, :profile => profile)
		5	+ track.add_category(fast_create(Category))
		6	+ track.save!
		7	+ track
		8	+end
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class ArticleTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @profile = fast_create(Community)
	7	+ @track = create_track('track', @profile)
	8	+ @step = CommunityTrackPlugin::Step.create!(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
	9	+ end
	10	+
	11	+ should 'inherit accept_comments from parent if it is a step' do
	12	+ @step.accept_comments = true
	13	+ @step.save!
	14	+ article = Article.create!(:parent => @step, :profile => @profile, :accept_comments => false, :name => "article")
	15	+ assert article.accept_comments
	16	+ end
	17	+
	18	+ should 'do nothing if parent is not a step' do
	19	+ folder = fast_create(Folder, :profile_id => @profile.id)
	20	+ article = Article.create!(:parent => folder, :profile => @profile, :accept_comments => false, :name => "article")
	21	+ assert !article.accept_comments
	22	+ end
	23	+
	24	+end