Merge branch 'next_colivre' into ActionItem2892

Leandro Nunes dos Santos
2 parents 0d7f7927 4eb56579
Showing 41 changed files with 1657 additions and 113 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/views/cms/view.rhtml
app/views/profile/_more_comments.rhtml
app/views/profile/_more_replies.rhtml
app/views/profile/_profile_activities_list.rhtml
app/views/profile/_profile_comments.rhtml
app/views/profile/_profile_scrap.rhtml
app/views/profile/_profile_scraps.rhtml
plugins/comment_group/controllers/profile/comment_group_plugin_profile_controller.rb
plugins/comment_group/lib/comment_group_plugin.rb
plugins/comment_group/lib/comment_group_plugin/macros/allow_comment.rb
plugins/comment_group/lib/ext/article.rb
plugins/comment_group/public/style.css
plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb
plugins/comment_group/test/functional/comment_group_plugin_public_controller_test.rb
plugins/comment_group/test/functional/content_viewer_controller_test.rb
plugins/comment_group/test/test_helper.rb
plugins/comment_group/test/unit/allow_comment_test.rb
@@ -144,10 +144,15 @@ class CmsController &lt; MyProfileController
  
   post_only :set_home_page
   def set_home_page
-    @article = profile.articles.find(params[:id])
-    profile.home_page = @article
-    profile.save(false)
-    session[:notice] = _('"%s" configured as home page.') % @article.name
+    article = params[:id].nil? ? nil : profile.articles.find(params[:id])
+    profile.update_attribute(:home_page, article)
+
+    if article.nil?
+      session[:notice] = _('Homepage reseted.')
+    else
+      session[:notice] = _('"%s" configured as homepage.') % article.name
+    end
+
     redirect_to (request.referer || profile.url)
   end
  
@@ -206,10 +206,50 @@ class ProfileController &lt; PublicController
   end
  
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
  
+  def more_comments
+    activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
+    comments_count = activity.comments.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
+  def more_replies
+    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    comments_count = activity.replies.count
+    comment_page = (params[:comment_page] || 1).to_i
+    comments_per_page = 5
+    no_more_pages = comments_count <= comment_page * comments_per_page
+
+    render :update do |page|
+      page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
+        :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
+
+      if no_more_pages
+        page.remove 'profile-wall-activities-comments-more-'+params[:activity]
+      else
+        page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
+          :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
+      end
+    end
+  end
+
   def remove_scrap
     begin
       scrap = current_user.person.scraps(params[:scrap_id])
@@ -343,6 +383,7 @@ class ProfileController &lt; PublicController
     end
   end
  
+
   protected
  
   def check_access_to_profile
@@ -393,4 +434,5 @@ class ProfileController &lt; PublicController
   def relations_to_include
     [:image, :domains, :preferred_domain, :environment]
   end
+
 end
@@ -1424,8 +1424,8 @@ module ApplicationHelper
   end
  
   def filter_html(html, source)
-    if @plugins && source.has_macro?
-      html = convert_macro(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
       #TODO This parse should be done through the macro infra, but since there
       #     are old things that do not support it we are keeping this hot spot.
       html = @plugins.pipeline(:parse_content, html, source).first
@@ -2,6 +2,18 @@
   <%= _('Content management') %>
 </h1>
  
+<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
+  <div class="cms-homepage">
+    <%= _('Profile homepage:') %>
+    <% if profile.home_page %>
+      <%= link_to_article(profile.home_page) %>
+      <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+    <% else %>
+      <span class="cms-homepage-default"><%= _('Profile Information') %></span>
+    <% end %>
+  </div>
+<% end %>
+
 <% button_bar(:style => 'margin-bottom: 1em;') do %>
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  
@@ -56,7 +68,11 @@
         <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= 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 %>
+          <% if profile.home_page != article %>
+            <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
+          <% else %>
+            <%= button_without_text(:'home-not', _('Reset homepage'),  { :action => 'set_home_page', :id => nil }, :method => :post) %>
+          <% end %>
         <% end %>
         <%= display_delete_button(article) if !remove_content_button(:delete) %>
       </td>
@@ -0,0 +1,3 @@
+<div class='view-more-comments'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -0,0 +1,3 @@
+<div class='view-more-replies'>
+  <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)) %>
+</div>
@@ -4,7 +4,7 @@
     <% if activity.kind_of?(ActionTracker::Record) %>
       <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
     <% else %>
-      <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
+      <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
     <% end %>
   <% end %>
 <% end %>
 <hr />
  
-<% if activity.comments_count > 2 %>
+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments"  >
+</ul>
+<% if activity.comments_count > 0 %>
+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-    <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
+     <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
   </div>
+</div>
 <% end %>
-
-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
-  <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
-</ul>
-
 <%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
@@ -16,13 +16,7 @@
     </div>
   </div>
  
-  <% if scrap.replies.count > 2 %>
-    <div class='view-all-comments icon-chat'>
-      <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
-    </div>
-  <% end %>
-
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
-NÃO DEVE APARECER
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <div class='profile-wall-actions'>
+    <% if logged_in? && current_person.follows?(scrap.sender) %>
+      <span class='profile-activity-send-reply'>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
+      </span>
+    <% end %>
+    <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
+    </div>
+  </div>
+
+
+  <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
+  </ul>
+
+  <% if scrap.replies.count > 0 %>
+    <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
+      <div class='view-all-comments icon-chat'>
+        <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
+      </div>
+    </div>
+  <% end %>
+  <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
+  <hr />
+</li>
 class CommentGroupPluginProfileController < ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
  
   def view_comments
-    article_id = params[:article_id]
-    group_id = params[:group_id]
+    @article_id = params[:article_id]
+    @group_id = params[:group_id]
  
-    article = profile.articles.find(article_id)
-    comments = article.group_comments.without_spam.in_group(group_id)
-    render :update do |page|
-      page.replace_html "comments_list_group_#{group_id}", :partial => 'comment/comment.rhtml', :collection => comments
-      page.replace_html "comment-count-#{group_id}", comments.count
-    end
+    article = profile.articles.find(@article_id)
+    @group_comment_page = (params[:group_comment_page] || 1).to_i
+
+    @comments = article.comments.without_spam.in_group(@group_id)
+    @comments_count = @comments.count
+    @comments = @comments.without_reply.paginate(:per_page => per_page, :page => @group_comment_page )
+
+    @no_more_pages = @comments_count <= @group_comment_page * per_page
+  end
+
+  def per_page
+    3
   end
  
 end
@@ -24,6 +24,11 @@ class CommentGroupPlugin &lt; Noosfero::Plugin
     'comment_group_macro.js'
   end
  
+  def stylesheet?
+    true
+  end
+
+
 end
  
 require_dependency 'comment_group_plugin/macros/allow_comment'
@@ -11,7 +11,6 @@ class CommentGroupPlugin::AllowComment &lt; Noosfero::Plugin::Macro
       :css_files => 'comment_group.css' }
   end
  
-  #FIXME Make this test
   def parse(params, inner_html, source)
     group_id = params[:group_id].to_i
     article = source
@@ -2,13 +2,10 @@ require_dependency &#39;article&#39;
  
 class Article
  
-  #FIXME make this test
   has_many :group_comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc', :conditions => [ 'group_id IS NOT NULL']
  
-  #FIXME make this test
   validate :not_empty_group_comments_removed
  
-  #FIXME make this test
   def not_empty_group_comments_removed
     if body
       groups_with_comments = group_comments.collect {|comment| comment.group_id}.uniq
@@ -0,0 +1,7 @@
+div.article-comments-list-more{
+  width: 100%;
+  height: 30px;
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 5px;
+}
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/profile/comment_group_plugin_profile_controller'
  
 # Re-raise errors caught by the controller.
@@ -21,18 +21,52 @@ class CommentGroupPluginProfileControllerTest &lt; ActionController::TestCase
   should 'be able to show group comments' do
     comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
  
   should 'do not show global comments' do
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
-    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'global comment', :body => 'global', :group_id => nil)
+    fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
     xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
-    assert_template 'comment/_comment.rhtml'
+    assert_template 'comment_group_plugin_profile/view_comments.rjs'
     assert_match /comments_list_group_0/, @response.body
     assert_match /\"comment-count-0\", \"1\"/, @response.body
   end
  
+  should 'show first page comments only' do
+    comment1 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'secondpage', :group_id => 0)
+    comment2 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 1', :group_id => 0)
+    comment3 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 2', :group_id => 0)
+    comment4 = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'firstpage 3', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /firstpage 1/, @response.body
+    assert_match /firstpage 2/, @response.body
+    assert_match /firstpage 3/, @response.body
+    assert_no_match /secondpage/, @response.body
+  end
+
+  should 'show link to display more comments' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'secondpage', :body => 'secondpage', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_match /group_comment_page=2/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have more pages' do
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    comment = fast_create(Comment, :source_id => article, :author_id => profile, :title => 'a comment', :body => 'lalala', :group_id => 0)
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
+  should 'do not show link to display more comments if do not have any comments' do
+    xhr :get, :view_comments, :profile => @profile.identifier, :article_id => article.id, :group_id => 0
+    assert_no_match /group_comment_page/, @response.body
+  end
+
 end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/../../controllers/public/comment_group_plugin_public_controller'
  
 # Re-raise errors caught by the controller.
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContentViewerController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class ContentViewerControllerTest < ActionController::TestCase
+
+  def setup
+    @profile = fast_create(Community)
+    @page = fast_create(Article, :profile_id => @profile.id, :body => "<div class=\"macro\" data-macro-group_id=\"1\" data-macro='comment_group_plugin/allow_comment' ></div>")
+    @environment = Environment.default
+    @environment.enable_plugin(CommentGroupPlugin)
+  end
+
+  attr_reader :page
+
+  should 'parse article body and render comment group view' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => page.id)
+    get :view_page, @page.url
+    assert_tag 'div', :attributes => {:class => 'comment_group_1'}
+    assert_tag 'div', :attributes => {:id => 'comments_group_count_1'}
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AllowCommentTest < ActiveSupport::TestCase
+
+  def setup
+    @macro = CommentGroupPlugin::AllowComment.new
+  end
+
+  attr_reader :macro
+
+  should 'have a configuration' do
+    assert CommentGroupPlugin::AllowComment.configuration
+  end
+
+  should 'parse contents to include comment group view' do
+    profile = fast_create(Community)
+    article = fast_create(Article, :profile_id => profile.id)
+    comment = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    inner_html = 'inner'
+    content = macro.parse({:group_id => comment.group_id}, inner_html, article)
+
+    expects(:render).with({:partial => 'plugins/comment_group/views/comment_group.rhtml', :locals => {:group_id => comment.group_id, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
+    instance_eval(&content)
+  end
+
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ArticleTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'return group comments from article' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    assert_equal [comment1], article.group_comments
+  end
+
+  should 'do not allow a exclusion of a group comment macro if this group has comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=2></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert !article.save
+    assert_equal 'Not empty group comment cannot be removed', article.errors[:base]
+  end
+
+  should 'allow save if comment group macro is not removed for group with comments' do
+    article.update_attribute(:body, "<div class=\"macro\" data-macro-group_id=1></div>")
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    assert article.save
+  end
+
+end
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
  
 class CommentGroupPluginTest < ActiveSupport::TestCase
  
-  include Noosfero::Plugin::HotSpot
-
   def setup
     @environment = Environment.default
+    @plugin = CommentGroupPlugin.new
+  end
+
+  attr_reader :environment, :plugin
+
+  should 'have a name' do
+    assert_not_equal Noosfero::Plugin.plugin_name, CommentGroupPlugin::plugin_name
+  end
+
+  should 'describe yourself' do
+    assert_not_equal Noosfero::Plugin.plugin_description, CommentGroupPlugin::plugin_description
+  end
+
+  should 'have a js file' do
+    assert !plugin.js_files.blank?
   end
  
-  attr_reader :environment
+  should 'have stylesheet' do
+    assert plugin.stylesheet?
+  end
+
+  should 'have extra contents for comment form' do
+    comment = fast_create(Comment, :group_id => 1)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    expects(:hidden_field_tag).with('comment[group_id]', comment.group_id).once
+    instance_eval(&content)
+  end
+
+  should 'do not have extra contents for comments without group' do
+    comment = fast_create(Comment, :group_id => nil)
+    content = plugin.comment_form_extra_contents({:comment => comment})
+    assert_equal nil, instance_eval(&content)
+  end
+
+  should 'call without_group for scope passed as parameter to unavailable_comments' do
+    article = fast_create(Article)
+    article.expects(:without_group).once
+    plugin.unavailable_comments(article)
+  end
  
 #FIXME Obsolete test
 #
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CommentTest < ActiveSupport::TestCase
+
+  def setup
+    profile = fast_create(Community)
+    @article = fast_create(Article, :profile_id => profile.id)
+  end
+
+  attr_reader :article
+
+  should 'return comments that belongs to a specified group' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    comment3 = fast_create(Comment, :group_id => 2, :source_id => article.id)
+    assert_equal [comment1], article.comments.in_group(1)
+  end
+
+  should 'return comments that do not belongs to any group' do
+    comment1 = fast_create(Comment, :group_id => 1, :source_id => article.id)
+    comment2 = fast_create(Comment, :group_id => nil, :source_id => article.id)
+    comment3 = fast_create(Comment, :group_id => 2, :source_id => article.id)
+    assert_equal [comment2], article.comments.without_group
+  end
+
+end
@@ -20,7 +20,13 @@
   <div class="comment-group-loading-<%= group_id %>"/>
  
   <div class="comments_list_toggle_group_<%= group_id %>" style="display:none">
-    <div class="article-comments-list" id="comments_list_group_<%= group_id %>"></div>
-    <div id="page-comment-form-<%= group_id %>" class='post_comment_box closed'><%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :group_id => group_id}%></div>
+    <div class="article-comments-list" id="comments_list_group_<%= group_id %>">
+    </div>
+    <div class ="article-comments-list-more" id="comments_list_group_<%= group_id %>_more">
+    </div>
+    <div id="page-comment-form-<%= group_id %>" class='post_comment_box closed'>
+      <%= render :partial => 'comment/comment_form', :locals => {:comment => Comment.new, :display_link => true, :cancel_triggers_hide => true, :group_id => group_id}%>
+    </div>
+
   </div>
 </div>
@@ -0,0 +1,12 @@
+if @group_comment_page == 1
+  page.replace_html "comments_list_group_#{@group_id}", :partial => 'comment/comment.rhtml', :collection => @comments
+else
+  page.insert_html :bottom, "comments_list_group_#{@group_id}", :partial => 'comment/comment.rhtml', :collection => @comments
+end
+page.replace_html "comment-count-#{@group_id}", @comments_count
+
+if @no_more_pages
+  page.replace_html "comments_list_group_#{@group_id}_more", ""
+else
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :loaded => visual_effect(:highlight, "comments_list_group_#{@group_id}"), :method => :post, :complete => "loadCompleted(#{@group_id})")
+end
@@ -7,7 +7,7 @@ class CommunityTrackPlugin::Step &lt; Folder
   acts_as_list  :scope => :parent
  
   def belong_to_track
-    errors.add(:parent, "Step not allowed at this parent.") if !parent.kind_of?(CommunityTrackPlugin::Track)
+    errors.add(:parent, _("Step not allowed at this parent.")) unless parent.kind_of?(CommunityTrackPlugin::Track)
   end
  
   validate :belong_to_track
@@ -49,8 +49,8 @@ class CommunityTrackPlugin::Track &lt; Folder
     "community-track-plugin-track"
   end
  
-  #FIXME make this test
   def first_paragraph
+    return '' if body.blank?
     paragraphs = Hpricot(body).search('p')
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
@@ -193,3 +193,9 @@
 .community-track textarea {
   width: 100%;
 }
+
+.formfield input#datepicker-from-date,
+.formfield input#datepicker-to-date {
+  width: 115px;
+  background: url(/plugins/community_track/icons/calendar.png) right center no-repeat;
+}
@@ -110,4 +110,18 @@ class TrackTest &lt; ActiveSupport::TestCase
     assert_equal [hidden_step], @track.hidden_steps
   end
  
+   should 'get first paragraph' do
+    @track.body = '<p>First</p><p>Second</p>'
+    assert_equal '<p>First</p>', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body was not given' do
+    assert_equal '', @track.first_paragraph
+  end
+
+  should 'provide first_paragraph even if body is nil' do
+    @track.body = nil
+    assert_equal '', @track.first_paragraph
+  end
+
 end
@@ -4,8 +4,14 @@
  
 <div>
   <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
-  <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
-  <%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %>
+  <%= labelled_form_field(_('Period'), (
+    date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date,
+                     '%Y-%m-%d',
+                     { :change_month => true, :change_year => true,
+                       :date_format => 'yy-mm-dd' },
+                     { :size => 14 })
+  )) %>
+
 </div>
  
 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
@@ -0,0 +1,1112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   overflow="visible"
+   enable-background="new 0 0 128 129.396"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="go-home-not.svg"
+   version="1.0"
+   inkscape:export-filename="/home/85902810515/projetos/noosfero/public/designs/icons/tango/mod/16x16/actions/go-home-not.png"
+   inkscape:export-xdpi="30.01"
+   inkscape:export-ydpi="30.01"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   style="display:inline;overflow:visible"><metadata
+   id="metadata367"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>home</rdf:li><rdf:li>return</rdf:li><rdf:li>go</rdf:li><rdf:li>default</rdf:li><rdf:li>user</rdf:li><rdf:li>directory</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Tuomas Kuosmanen</dc:title></cc:Agent></dc:contributor></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+   id="defs365"><linearGradient
+     id="linearGradient4711"><stop
+       style="stop-color:#f87171;stop-opacity:1;"
+       offset="0"
+       id="stop4713" /><stop
+       style="stop-color:#fb1f22;stop-opacity:1;"
+       offset="1"
+       id="stop4715" /></linearGradient><linearGradient
+     id="linearGradient4700"><stop
+       style="stop-color:#b20000;stop-opacity:1;"
+       offset="0"
+       id="stop4702" /><stop
+       style="stop-color:#db0000;stop-opacity:1;"
+       offset="1"
+       id="stop4704" /></linearGradient><linearGradient
+     id="linearGradient4694"
+     osb:paint="solid"><stop
+       style="stop-color:#2042e2;stop-opacity:1;"
+       offset="0"
+       id="stop4696" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 24 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="48 : 24 : 1"
+     inkscape:persp3d-origin="24 : 16 : 1"
+     id="perspective92" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5031"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient5060"><stop
+       style="stop-color:black;stop-opacity:1;"
+       offset="0"
+       id="stop5062" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5064" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5060"
+     id="radialGradient5029"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+     cx="605.71429"
+     cy="486.64789"
+     fx="605.71429"
+     fy="486.64789"
+     r="117.14286" /><linearGradient
+     id="linearGradient5048"><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="0"
+       id="stop5050" /><stop
+       id="stop5056"
+       offset="0.5"
+       style="stop-color:black;stop-opacity:1;" /><stop
+       style="stop-color:black;stop-opacity:0;"
+       offset="1"
+       id="stop5052" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient5048"
+     id="linearGradient5027"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+     x1="302.85715"
+     y1="366.64789"
+     x2="302.85715"
+     y2="609.50507" /><linearGradient
+     id="linearGradient2406"><stop
+       style="stop-color:#7c7e79;stop-opacity:1;"
+       offset="0"
+       id="stop2408" /><stop
+       id="stop2414"
+       offset="0.1724138"
+       style="stop-color:#848681;stop-opacity:1;" /><stop
+       style="stop-color:#898c86;stop-opacity:1;"
+       offset="1"
+       id="stop2410" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2390"><stop
+       style="stop-color:#919191;stop-opacity:1;"
+       offset="0"
+       id="stop2392" /><stop
+       style="stop-color:#919191;stop-opacity:0;"
+       offset="1"
+       id="stop2394" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2378"><stop
+       style="stop-color:#575757;stop-opacity:1;"
+       offset="0"
+       id="stop2380" /><stop
+       style="stop-color:#575757;stop-opacity:0;"
+       offset="1"
+       id="stop2382" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2368"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2370" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2372" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2349"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2351" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2353" /></linearGradient><linearGradient
+     id="linearGradient2341"><stop
+       id="stop2343"
+       offset="0"
+       style="stop-color:#000000;stop-opacity:1;" /><stop
+       id="stop2345"
+       offset="1"
+       style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+     id="linearGradient2329"><stop
+       style="stop-color:#000000;stop-opacity:0.18556701;"
+       offset="0"
+       id="stop2331" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop2333" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2319"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop2321" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop2323" /></linearGradient><linearGradient
+     id="linearGradient2307"><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="0"
+       id="stop2309" /><stop
+       style="stop-color:#998800;stop-opacity:1;"
+       offset="1"
+       id="stop2311" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2299"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2301" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2303" /></linearGradient><linearGradient
+     id="XMLID_2_"
+     gradientUnits="userSpaceOnUse"
+     x1="80.223602"
+     y1="117.5205"
+     x2="48.046001"
+     y2="59.7995"
+     gradientTransform="matrix(0.314683,0,0,0.314683,4.128264,3.742874)">
+				<stop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="stop17" />
+				<stop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="stop19" />
+				<midPointStop
+   offset="0"
+   style="stop-color:#CCCCCC"
+   id="midPointStop48" />
+				<midPointStop
+   offset="0.5"
+   style="stop-color:#CCCCCC"
+   id="midPointStop50" />
+				<midPointStop
+   offset="0.9831"
+   style="stop-color:#FFFFFF"
+   id="midPointStop52" />
+			</linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#XMLID_2_"
+     id="linearGradient1514"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.336922,0,0,0.166888,17.98288,15.46151)"
+     x1="52.006104"
+     y1="166.1331"
+     x2="14.049017"
+     y2="-42.218513" /><linearGradient
+     id="XMLID_39_"
+     gradientUnits="userSpaceOnUse"
+     x1="64.387703"
+     y1="65.124001"
+     x2="64.387703"
+     y2="35.569"
+     gradientTransform="matrix(0.354101,0,0,0.354101,1.638679,-0.08364921)">
+						<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop336" />
+						<stop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="stop338" />
+						<stop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="stop340" />
+						<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop335" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop337" />
+						<midPointStop
+   offset="0.8539"
+   style="stop-color:#FF6200"
+   id="midPointStop339" />
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#FF6200"
+   id="midPointStop341" />
+						<midPointStop
+   offset="1"
+   style="stop-color:#F25D00"
+   id="midPointStop343" />
+					</linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2299"
+     id="radialGradient2305"
+     cx="7.5326638"
+     cy="24.202574"
+     fx="7.5326638"
+     fy="24.202574"
+     r="8.2452126"
+     gradientTransform="matrix(4.100086,0,0,4.201322,-25.41506,-78.53967)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2307"
+     id="radialGradient2313"
+     cx="19.985598"
+     cy="36.77816"
+     fx="19.985598"
+     fy="36.77816"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,-3.428678,0.565787)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2319"
+     id="radialGradient2325"
+     cx="20.443665"
+     cy="37.425831"
+     fx="20.443665"
+     fy="37.425831"
+     r="1.0821035"
+     gradientTransform="matrix(1.125263,0,0,0.982744,-3.428678,0.731106)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2329"
+     id="linearGradient2335"
+     x1="17.602522"
+     y1="26.057423"
+     x2="17.682528"
+     y2="32.654099"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.898789,0,0,1.071914,0.478025,-2.080838)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2341"
+     id="radialGradient2339"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.100086,0,0,-4.201322,-5.198109,105.3535)"
+     cx="11.68129"
+     cy="19.554111"
+     fx="11.68129"
+     fy="19.554111"
+     r="8.2452126" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2349"
+     id="radialGradient2355"
+     cx="24.023088"
+     cy="40.56913"
+     fx="24.023088"
+     fy="40.56913"
+     r="16.28684"
+     gradientTransform="matrix(1,0,0,0.43125,0,23.07369)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2368"
+     id="radialGradient2374"
+     cx="29.913452"
+     cy="30.442923"
+     fx="29.913452"
+     fy="30.442923"
+     r="4.001883"
+     gradientTransform="matrix(3.751495,0,0,3.147818,-82.00907,-65.70704)"
+     gradientUnits="userSpaceOnUse" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2378"
+     id="radialGradient2384"
+     cx="24.195112"
+     cy="10.577631"
+     fx="24.195112"
+     fy="10.577631"
+     r="15.242914"
+     gradientTransform="matrix(1.125263,-3.585417e-8,4.269819e-8,1.340059,-3.006704,1.355395)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2390"
+     id="linearGradient2396"
+     x1="30.603519"
+     y1="37.337803"
+     x2="30.603519"
+     y2="36.112415"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.263867,0,0,0.859794,-6.499556,8.390924)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2406"
+     id="linearGradient2412"
+     x1="17.850183"
+     y1="28.939463"
+     x2="19.040216"
+     y2="41.03223"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.888785,0,0,1.08932,2.41099,-1.524336)" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647"
+     id="radialGradient2239"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,-16.86529,-25.11111)" /><linearGradient
+     id="linearGradient9647"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256"
+     id="linearGradient2262"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0,-2)" /><linearGradient
+     id="linearGradient2256"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,-5.6354248,-11.964506)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3047"
+     xlink:href="#linearGradient9647"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(11.229865,11.146604)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3049"
+     xlink:href="#linearGradient2256"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient21650"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient21644"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient4987"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient4981"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient2057"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient11780"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient2254"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient2239-7"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)" /><linearGradient
+     id="linearGradient9647-3"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient2262-5"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)" /><linearGradient
+     id="linearGradient2256-0"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8" /></linearGradient><radialGradient
+     r="15.75"
+     fy="36.75"
+     fx="25.125"
+     cy="36.75"
+     cx="25.125"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3090"
+     xlink:href="#linearGradient21644"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient3205"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient3207"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient3209"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient3211"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient3213"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient3215"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644"
+     id="radialGradient3218"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981"
+     id="linearGradient3221"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780"
+     id="linearGradient3224"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248"
+     id="radialGradient3227"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3"
+     id="radialGradient3230"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0"
+     id="linearGradient3232"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3"
+     id="radialGradient3218-2"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient21644-3"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646-9" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648-9" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1"
+     id="linearGradient3221-9"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     id="linearGradient4981-1"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983-4" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985-7" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3"
+     id="linearGradient3224-7"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     id="linearGradient11780-3"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782-9" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784-6" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9"
+     id="radialGradient3227-6"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248-9"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250-3" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252-5" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3-4"
+     id="radialGradient3230-9"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     id="linearGradient9647-3-4"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3-2" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2-0" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0-0"
+     id="linearGradient3232-1"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><linearGradient
+     id="linearGradient2256-0-0"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2-7" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8-0" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3276"
+     xlink:href="#linearGradient9647-3-4"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3278"
+     xlink:href="#linearGradient2256-0-0"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3-0"
+     id="radialGradient3218-2-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.173803,0,0,0.3571428,17.76075,50.050612)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     id="linearGradient21644-3-0"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop21646-9-1" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop21648-9-8" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1-6"
+     id="linearGradient3221-9-6"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><linearGradient
+     id="linearGradient4981-1-6"><stop
+       style="stop-color:#cc0000;stop-opacity:1;"
+       offset="0"
+       id="stop4983-4-0" /><stop
+       style="stop-color:#b30000;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop4985-7-7" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3-5"
+     id="linearGradient3224-7-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(23.026616,19.550612)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     id="linearGradient11780-3-5"><stop
+       style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+       offset="0.0000000"
+       id="stop11782-9-4" /><stop
+       style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+       offset="1.0000000"
+       id="stop11784-6-8" /></linearGradient><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9-9"
+     id="radialGradient3227-6-4"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(4.154957,0,0,3.198723,-29.818914,-1.9585976)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     id="linearGradient2248-9-9"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop2250-3-5" /><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="1"
+       id="stop2252-5-3" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3276-7"
+     xlink:href="#linearGradient9647-3-4-6"
+     inkscape:collect="always" /><linearGradient
+     id="linearGradient9647-3-4-6"><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="0"
+       id="stop9649-3-2-7" /><stop
+       style="stop-color:#dbdbdb;stop-opacity:1;"
+       offset="1"
+       id="stop9651-2-0-1" /></linearGradient><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3278-2"
+     xlink:href="#linearGradient2256-0-0-1"
+     inkscape:collect="always" /><linearGradient
+     id="linearGradient2256-0-0-1"><stop
+       style="stop-color:#ff0202;stop-opacity:1;"
+       offset="0"
+       id="stop2258-2-7-8" /><stop
+       style="stop-color:#ff9b9b;stop-opacity:1;"
+       offset="1"
+       id="stop2260-8-0-4" /></linearGradient><radialGradient
+     r="12.30225"
+     fy="33.30225"
+     fx="24.30225"
+     cy="33.30225"
+     cx="24.30225"
+     gradientTransform="matrix(1.693981,0,0,1.693981,6.1613255,-3.5604976)"
+     gradientUnits="userSpaceOnUse"
+     id="radialGradient3812"
+     xlink:href="#linearGradient9647-3-4-6"
+     inkscape:collect="always" /><linearGradient
+     y2="35.05225"
+     x2="24.30225"
+     y1="15.80225"
+     x1="21.75"
+     gradientTransform="translate(23.026616,19.550612)"
+     gradientUnits="userSpaceOnUse"
+     id="linearGradient3814"
+     xlink:href="#linearGradient2256-0-0-1"
+     inkscape:collect="always" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient9647-3-4-6"
+     id="radialGradient3886"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.85754753,0,0,0.85754753,16.064712,11.20392)"
+     cx="24.30225"
+     cy="33.30225"
+     fx="24.30225"
+     fy="33.30225"
+     r="12.30225" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2256-0-0-1"
+     id="linearGradient3888"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="21.75"
+     y1="15.80225"
+     x2="24.30225"
+     y2="35.05225" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient2248-9-9"
+     id="radialGradient3891"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(2.1094827,0,0,1.5765366,-2.293898,12.776643)"
+     cx="16.75"
+     cy="10.666344"
+     fx="16.75"
+     fy="10.666344"
+     r="21.25" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient11780-3-5"
+     id="linearGradient3894"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="15.737001"
+     y1="12.5036"
+     x2="53.570126"
+     y2="47.374317" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4981-1-6"
+     id="linearGradient3897"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.50623208,0,0,0.50623208,24.602463,22.903505)"
+     x1="23.995985"
+     y1="20.105337"
+     x2="41.047836"
+     y2="37.959785" /><radialGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient21644-3-0"
+     id="radialGradient3900"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.75877044,0,0,0.21650012,17.801926,37.031146)"
+     cx="25.125"
+     cy="36.75"
+     fx="25.125"
+     fy="36.75"
+     r="15.75" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4700"
+     id="linearGradient4706"
+     x1="42"
+     y1="40.46875"
+     x2="30.3125"
+     y2="29.09375"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4711"
+     id="linearGradient4717"
+     x1="29.3125"
+     y1="28.25"
+     x2="44.125"
+     y2="42.5625"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:cy="18.229536"
+   inkscape:cx="35.718843"
+   inkscape:zoom="8"
+   inkscape:window-height="827"
+   inkscape:window-width="1440"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="0.21568627"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:showpageshadow="false"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:current-layer="layer3"
+   fill="#555753"
+   showgrid="false"
+   stroke="#a40000"
+   showguides="true"
+   inkscape:guide-bbox="true"
+   inkscape:window-maximized="1" />
+	
+<g
+   inkscape:groupmode="layer"
+   id="layer1"
+   inkscape:label="Home"
+   style="display:inline"
+   sodipodi:insensitive="true"><g
+     style="display:inline;overflow:visible"
+     id="g3710"><g
+       transform="matrix(0.02158196,0,0,0.01859457,43.12251,41.63767)"
+       id="g5022"
+       style="display:inline"><rect
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="rect4173"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" /><path
+         inkscape:connector-curvature="0"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+         id="path5058"
+         sodipodi:nodetypes="cccc" /><path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5018"
+         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /></g><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc"
+       id="rect1512"
+       d="m 21.619576,8.1833733 5.957459,0 c 0.839732,0 13.886475,15.4353277 13.886475,16.3406587 l -0.443521,18.496745 c 0,0.905333 -0.67603,1.634177 -1.515762,1.634177 l -31.4572774,0 c -0.8397329,0 -1.5157625,-0.728844 -1.5157625,-1.634177 l 0.056478,-18.496745 c 0,-0.905331 14.1921789,-16.3406587 15.0319109,-16.3406587 z"
+       style="color:#000000;fill:url(#linearGradient1514);fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       d="m 46.963575,45.735573 -45.3248988,0 0,-45.32489746 45.3248988,0 0,45.32489746 z"
+       id="path5"
+       style="fill:none" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       clip-rule="evenodd"
+       d="m 23,29 -0.04574,15.090942 -11.842791,0 L 11,29 23,29 z"
+       id="path2327"
+       style="fill:url(#linearGradient2335);fill-opacity:1;fill-rule:evenodd" /><path
+       inkscape:connector-curvature="0"
+       style="opacity:0.3125;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 21.780459,9.405584 5.559097,0 c 0.783582,0 13.000869,14.399588 13.000869,15.244172 l -0.347158,18.212311 c 0,0.459259 -0.143737,0.653465 -0.512375,0.653465 l -31.3872026,0.01428 c -0.3686377,0 -0.5839636,-0.07992 -0.5839636,-0.45355 L 7.7250676,24.649756 c 0,-0.844584 13.2718124,-15.244172 14.0553914,-15.244172 z"
+       id="path2357"
+       sodipodi:nodetypes="ccccccccc" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       style="opacity:0.2;fill:url(#radialGradient2384);fill-opacity:1;fill-rule:evenodd"
+       id="path23"
+       d="M 7.2075295,27.943053 7.1532728,30.538247 25.521437,17.358993 40.807832,28.513421 40.879142,28.201707 24.508686,12.297576 7.2075295,27.943053 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       style="fill:url(#linearGradient2412);fill-opacity:1;fill-rule:evenodd"
+       id="path188"
+       d="m 22,30 0,14.090942 -9.811029,0 L 12,30 22,30 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       clip-rule="evenodd"
+       d="m 19.576856,36.44767 c 0.67279,0 1.216616,0.474605 1.216616,1.058507 0,0.589811 -0.543826,1.068355 -1.216616,1.068355 -0.672272,0 -1.218686,-0.478544 -1.218686,-1.068355 5.15e-4,-0.583902 0.546414,-1.058507 1.218686,-1.058507 z"
+       id="path2315"
+       style="opacity:0.40909089;fill:url(#radialGradient2325);fill-opacity:1;fill-rule:evenodd" /><path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient2313);fill-opacity:1;fill-rule:evenodd"
+       id="path217"
+       d="m 19.462314,35.932229 c 0.672789,0 1.216615,0.474605 1.216615,1.058507 0,0.589809 -0.543826,1.068353 -1.216615,1.068353 -0.672273,0 -1.218687,-0.478544 -1.218687,-1.068353 5.15e-4,-0.583902 0.546414,-1.058507 1.218687,-1.058507 z"
+       clip-rule="evenodd" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#XMLID_39_)"
+       id="path342"
+       d="m 24.447748,11.559337 18.92706,17.169868 0.494679,0.391991 0.403676,-0.171385 -0.37287,-0.761673 L 43.622679,27.964702 24.447748,12.392396 5.0582327,28.135731 4.8206309,28.279851 4.603921,28.986637 5.0373408,29.115885 5.4218948,28.807462 24.447748,11.559337 z" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc"
+       d="M 24.330168,2.2713382 2.4484294,20.372675 1.8237005,27.538603 3.8236367,29.602926 c 0,0 20.4073813,-17.157285 20.6240933,-17.327963 L 44.08027,29.818223 45.978694,27.494226 44.362903,20.382852 24.44773,2.1668788 24.330168,2.2713382 z"
+       id="path362"
+       style="fill:#ef2929;stroke:#a40000" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path1536"
+       d="M 2.8413446,20.613129 2.5497894,27.236494 24.369219,8.980075 24.298891,3.0867443 2.8413446,20.613129 z"
+       style="opacity:0.40909089;color:#000000;fill:url(#radialGradient2305);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       style="opacity:0.13636367;color:#000000;fill:url(#radialGradient2339);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 24.483763,8.7509884 24.583223,2.9098867 43.912186,20.56184 45.403998,27.062652 24.483763,8.7509884 z"
+       id="path2337"
+       sodipodi:nodetypes="ccccc" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc"
+       id="rect2361"
+       d="m 27.102228,27.719824 9.039995,0 c 0.770595,0 1.390967,0.62037 1.390967,1.390967 l -0.008,9.079221 c 0,0.770596 -0.596322,1.265969 -1.366918,1.265969 l -9.056083,0 c -0.770597,0 -1.390967,-0.620373 -1.390967,-1.390969 l 0,-8.954221 c 0,-0.770597 0.62037,-1.390967 1.390967,-1.390967 z"
+       style="opacity:0.31818183;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><rect
+       ry="0.38128215"
+       rx="0.38128215"
+       y="28.514256"
+       x="26.507767"
+       height="9.9624557"
+       width="10.001333"
+       id="rect3263"
+       style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#757575;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /><path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="rect2363"
+       d="m 27.107118,34.408261 c 3.617983,0.331177 5.527724,-1.445704 8.868152,-1.55274 L 36,29.00603 27.088388,29 l 0.01873,5.408261 z"
+       style="opacity:0.39772728;color:#000000;fill:url(#radialGradient2374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999958;marker:none;visibility:visible;display:inline;overflow:visible" /></g></g><g
+   inkscape:groupmode="layer"
+   id="layer3"
+   inkscape:label="Cancel"
+   style="display:inline"
+   sodipodi:insensitive="true"><path
+     inkscape:connector-curvature="0"
+     id="path21642-1"
+     d="m 47.662816,44.987526 c -0.120652,1.646851 -3.213412,2.606775 -5.88153,3.03684 -4.362088,0.658404 -9.413,0.503003 -13.246573,-0.867841 -2.049624,-0.673315 -3.29125,-2.200566 -1.810314,-3.341428 2.178762,-1.659613 6.251742,-2.183438 9.862965,-2.236334 3.69133,-0.006 7.82464,0.471868 10.226986,2.081485 0.520681,0.38489 0.853108,0.849828 0.848466,1.327278 z"
+     style="opacity:0.63068183;color:#000000;fill:url(#radialGradient3900);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /><rect
+     style="fill:url(#linearGradient4706);fill-opacity:1;fill-rule:nonzero;stroke:#850000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect4692"
+     width="21.625"
+     height="21.9375"
+     x="25.9375"
+     y="24.0625"
+     rx="0.38128215"
+     ry="0.38128215" /><rect
+     style="fill:none;stroke:url(#linearGradient4717);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;overflow:visible"
+     id="rect4709"
+     width="20.875"
+     height="21"
+     x="26.3125"
+     y="24.5625"
+     rx="0.38128215"
+     ry="0.38128215" /><path
+     style="fill:#cc2e2e;fill-opacity:0.89138579;stroke:none;display:inline;overflow:visible"
+     d="m 26.4375,24.8125 20.625,0.125 L 47,39.4375 C 41.4375,36.625 39.859375,37.3125 37.195313,37.765625 35.025662,38.134656 32.65625,40.125 26.5,39.625 z"
+     id="rect4720"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccscc" /><path
+     inkscape:connector-curvature="0"
+     id="path2787-5"
+     d="m 33.090545,29.231406 c -0.720061,0.72006 -1.440121,1.44012 -2.160181,2.160181 1.271499,1.271499 2.542997,2.542997 3.814496,3.814497 -1.271499,1.271499 -2.542997,2.542997 -3.814496,3.814496 0.72006,0.720061 1.44012,1.440121 2.160181,2.160182 1.271499,-1.271499 2.542997,-2.542999 3.814496,-3.814498 1.271499,1.271499 2.542998,2.542999 3.814497,3.814498 0.72006,-0.720061 1.440121,-1.440121 2.160181,-2.160182 -1.271499,-1.271499 -2.542998,-2.542997 -3.814497,-3.814496 1.271499,-1.2715 2.542998,-2.542998 3.814497,-3.814497 -0.72006,-0.720061 -1.440121,-1.440121 -2.160181,-2.160181 -1.271499,1.271499 -2.542998,2.542998 -3.814497,3.814497 -1.271499,-1.271499 -2.542997,-2.542998 -3.814496,-3.814497 z"
+     style="fill:url(#radialGradient3886);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3888);stroke-width:0.50623184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;overflow:visible" /></g></svg>
 \ No newline at end of file
 /******************SMALL ICONS********************/
 .icon-edit      { background-image: url(Tango/16x16/apps/text-editor.png) }
-.icon-home      { background-image: url(Tango/16x16/actions/go-home.png) }
+.icon-home      { background-image: url(Tango/16x16/actions/go-home.png)          }
+.icon-home-not  { background-image: url(mod/16x16/actions/go-home-not.png)          }
 .icon-new,
 .icon-suggest   { background-image: url(Tango/16x16/actions/filenew.png) }
 .icon-close     { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
@@ -853,6 +853,12 @@ Array.min = function(array) {
   return Math.min.apply(Math, array);
 };
  
+function hideAndGetUrl(link) {
+  link.hide();
+  url = jQuery(link).attr('href');
+  jQuery.get(url);
+}
+
 jQuery(function($){
   $('.submit-with-keypress').live('keydown', function(e) {
      field = this;
@@ -875,12 +881,21 @@ jQuery(function($){
      }
    });
  
-  $('.view-all-comments').live('click', function(e) {
-     var link = this;
-     $(link).parent().find('.profile-wall-activities-comments').show();
-     $(link).hide();
+  $('#content').delegate( '.view-all-comments a', 'click', function(e) {
+     hideAndGetUrl(this);
      return false;
+   });
+
+  $('#content').delegate('.view-more-replies a', 'click', function(e) {
+    hideAndGetUrl(this);
+    return false;
   });
+
+  $('#content').delegate('.view-more-comments a', 'click', function(e) {
+    hideAndGetUrl(this);
+    return false;
+  });
+
   $('.focus-on-comment').live('click', function(e) {
      var link = this;
      $(link).parents('.profile-activity-item').find('textarea').focus();
@@ -3137,7 +3137,7 @@ table.cms-articles a.icon {
   text-overflow: ellipsis;
 }
  
-table.cms-articles a.icon, table.cms-articles a.icon-parent-folder {
+table.cms-articles a.icon, table.cms-articles a.icon-parent-folder, .cms-homepage a.icon {
   padding: 0px 0px 3px 20px;
   background-repeat: no-repeat;
 }
@@ -3156,6 +3156,14 @@ table.cms-articles .icon:hover {
   border-right: 1px solid #ccc;
 }
  
+.cms-homepage a.icon {
+  border: none;
+}
+
+.cms-homepage a:hover {
+  background-color: transparent;
+}
+
 .select-article-type {
   padding: 5px 20px;
   width: 455px;
@@ -5705,6 +5713,10 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   padding-left: 20px;
 }
  
+.view-more-comments, .view-more-replies {
+  text-align: center;
+}
+
 /* Profile activity relative dimensions */
  
 #leave_scrap {
@@ -109,6 +109,18 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'a', :content => 'Use as homepage', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/set_home_page/#{folder.id}" }
   end
  
+  should 'display the profile homepage if can change homepage' do
+    env = Environment.default; env.disable('cant_change_homepage')
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :content => /Profile homepage/, :attributes => { :class => "cms-homepage"}
+  end
+
+  should 'not display the profile homepage if cannot change homepage' do
+    env = Environment.default; env.enable('cant_change_homepage')
+    get :index, :profile => profile.identifier
+    assert_no_tag :tag => 'div', :content => /Profile homepage/, :attributes => { :class => "cms-homepage"}
+  end
+
   should 'be able to set home page' do
     a = profile.articles.build(:name => 'my new home page')
     a.save!
@@ -119,6 +131,7 @@ class CmsControllerTest &lt; ActionController::TestCase
  
     profile.reload
     assert_equal a, profile.home_page
+    assert_match /configured/, session[:notice]
   end
  
   should 'be able to set home page even when profile description is invalid' do
@@ -154,6 +167,37 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_redirected_to profile.url
   end
  
+  should 'be able to reset home page' do
+    a = profile.articles.build(:name => 'my new home page')
+    a.save!
+
+    profile.home_page = a
+    profile.save!
+
+    post :set_home_page, :profile => profile.identifier, :id => nil
+
+    profile.reload
+    assert_equal nil, profile.home_page
+    assert_match /reseted/, session[:notice]
+  end
+
+  should 'display default home page' do
+    profile.home_page = nil
+    profile.save!
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :attributes => { :class => "cms-homepage" }, :descendant => { :tag => "span", :content => /Profile Information/ }
+  end
+
+  should 'display article as home page' do
+    a = profile.articles.build(:name => 'my new home page')
+    a.save!
+    profile.home_page = a
+    profile.save!
+    Article.stubs(:short_description).returns('short description')
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :attributes => { :class => "cms-homepage" }, :descendant => { :tag => "a", :content => /my new home page/ }
+  end
+
   should 'set last_changed_by when creating article' do
     login_as(profile.identifier)
  
@@ -734,7 +734,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'see the activities_items paginated' do
-    p1= Person.first
+    p1 = create_user('some').person
     ActionTracker::Record.destroy_all
     40.times{Scrap.create!(defaults_for_scrap(:sender => p1, :receiver => p1))}
     login_as(p1.identifier)
@@ -1170,6 +1170,58 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
  
+  should "not index display activities comments" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments'}, :children => {:count => 0 } 
+  end
+
+  should "view more comments paginated" do
+    login_as(profile.identifier)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An Article about Free Software')
+    ActionTracker::Record.destroy_all
+    activity = ActionTracker::Record.create!(:user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})
+    20.times {comment = fast_create(Comment, :source_id => article, :title => 'a comment', :body => 'lalala', :created_at => Time.now)}
+    article.reload
+    assert_equal 20, article.comments.count
+    get :more_comments, :activity => activity.id, :comment_page => 2
+    assert_response :success
+    assert_template '_comment'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 comments per page
+    end
+  end
+
+  should "not index display scraps replies" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    get :index, :profile => profile.identifier
+    assert_tag 'ul', :attributes => {:class => 'profile-wall-activities-comments scrap-replies'}, :children => {:count => 0 } 
+  end
+
+  should "view more replies paginated" do
+    login_as(profile.identifier)
+    Scrap.destroy_all
+    scrap = fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id)
+    20.times {fast_create(Scrap, :sender_id => profile.id, :receiver_id => profile.id, :scrap_id => scrap.id)}
+    profile.reload
+    assert_equal 20, scrap.replies.count
+    get :more_replies, :activity => scrap.id, :comment_page => 2
+    assert_response :success
+    assert_template '_profile_scrap'
+    assert_select_rjs :insert_html do
+      assert_select 'li', 5 # 5 replies per page
+    end
+  end
+
   should 'render empty response for not logged in users in check_membership' do
     get :check_membership
     assert_equal '', @response.body
@@ -1331,30 +1383,6 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_equal "Comment successfully added.", assigns(:message)
   end
  
-  should 'display comment in wall if user was removed' do
-    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
-    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
-    to_be_removed = create_user('removed_user').person
-    comment = Comment.create!(:author => to_be_removed, :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
-    to_be_removed.destroy
-
-    login_as(profile.identifier)
-    get :index, :profile => profile.identifier
-
-    assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
-  end
-
-  should 'display comment in wall from non logged users' do
-    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
-    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
-    comment = Comment.create!(:name => 'outside user', :email => 'outside@localhost.localdomain', :title => 'Test Comment', :body => 'My author does not exist =(', :source_id => article.id, :source_type => 'Article')
-
-    login_as(profile.identifier)
-    get :index, :profile => profile.identifier
-
-    assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
-  end
-
   should 'add locale on mailing' do
     community = fast_create(Community)
     create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
@@ -814,6 +814,32 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_no_match /Test1/, parsed_html
   end
  
+  should 'not convert macro if source is nil' do
+    profile = create_user('testuser').person
+    article = fast_create(Article,  :profile_id => profile.id)
+    class Plugin1 < Noosfero::Plugin; end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+
+    expects(:convert_macro).never
+    filter_html(article.body, nil)
+  end
+
+  should 'not convert macro if there is no macro plugin active' do
+    profile = create_user('testuser').person
+    article = fast_create(Article,  :profile_id => profile.id)
+    class Plugin1 < Noosfero::Plugin; end
+
+    environment = Environment.default
+    environment.enable_plugin(Plugin1)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
+
+    expects(:convert_macro).never
+    filter_html(article.body, article)
+  end
+
   protected
   include NoosferoTestHelper
  
@@ -285,22 +285,6 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal [c1,c3], c.reload.children
   end
  
-  should "return activities comments as a thread" do
-    person = fast_create(Person)
-    a = TextileArticle.create!(:profile => person, :name => 'My article', :body => 'Article body')
-    c0 = Comment.create!(:source => a, :body => 'My comment', :author => person)
-    c1 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
-    c2 = Comment.create!(:reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
-    c3 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
-    c4 = Comment.create!(:source => a, :body => 'My comment', :author => person)
-    result = a.activity.comments_as_thread
-    assert_equal c0, result[0]
-    assert_equal [c1, c3], result[0].replies
-    assert_equal [c2], result[0].replies[0].replies
-    assert_equal c4, result[1]
-    assert result[1].replies.empty?
-  end
-
   should 'provide author url for authenticated user' do
     author = Person.new
     author.expects(:url).returns('http://blabla.net/author')
@@ -3,22 +3,13 @@
 Rails.configuration.to_prepare do
   ActionTracker::Record.module_eval do
  
-    has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :finder_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC', :counter_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments}'
+    has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy,
+      :finder_sql => 'SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC',
+      :counter_sql => 'SELECT COUNT(*) FROM comments WHERE #{conditions_for_comments}'
  
     def conditions_for_comments
       type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
-      "source_type = '#{type}' AND source_id = '#{id}'"
-    end
-
-    def comments_as_thread
-      result = {}
-      root = []
-      self.comments.each do |c|
-        c.replies = []
-        result[c.id] ||= c
-        c.reply_of_id.nil? ? root << c : result[c.reply_of_id].replies << c
-      end
-      root
+      "source_type = '#{type}' AND source_id = '#{id}' AND reply_of_id IS NULL"
     end
  
   end
...	...	@@ -144,10 +144,15 @@ class CmsController < MyProfileController
144	144
145	145	post_only :set_home_page
146	146	def set_home_page
147		- @article = profile.articles.find(params[:id])
148		- profile.home_page = @article
149		- profile.save(false)
150		- session[:notice] = _('"%s" configured as home page.') % @article.name
	147	+ article = params[:id].nil? ? nil : profile.articles.find(params[:id])
	148	+ profile.update_attribute(:home_page, article)
	149	+
	150	+ if article.nil?
	151	+ session[:notice] = _('Homepage reseted.')
	152	+ else
	153	+ session[:notice] = _('"%s" configured as homepage.') % article.name
	154	+ end
	155	+
151	156	redirect_to (request.referer \|\| profile.url)
152	157	end
153	158
...	...
...	...	@@ -206,10 +206,50 @@ class ProfileController < PublicController
206	206	end
207	207
208	208	def view_more_network_activities
209		- @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
	209	+ @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
210	210	render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
211	211	end
212	212
	213	+ def more_comments
	214	+ activity = ActionTracker::Record.find(:first, :conditions => {:id => params[:activity], :user_id => @profile})
	215	+ comments_count = activity.comments.count
	216	+ comment_page = (params[:comment_page] \|\| 1).to_i
	217	+ comments_per_page = 5
	218	+ no_more_pages = comments_count <= comment_page * comments_per_page
	219	+
	220	+ render :update do \|page\|
	221	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
	222	+ :partial => 'comment', :collection => activity.comments.paginate(:per_page => comments_per_page, :page => comment_page)
	223	+
	224	+ if no_more_pages
	225	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
	226	+ else
	227	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
	228	+ :partial => 'more_comments', :locals => {:activity => activity, :comment_page => comment_page}
	229	+ end
	230	+ end
	231	+ end
	232	+
	233	+ def more_replies
	234	+ activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
	235	+ comments_count = activity.replies.count
	236	+ comment_page = (params[:comment_page] \|\| 1).to_i
	237	+ comments_per_page = 5
	238	+ no_more_pages = comments_count <= comment_page * comments_per_page
	239	+
	240	+ render :update do \|page\|
	241	+ page.insert_html :bottom, 'profile-wall-activities-comments-'+params[:activity],
	242	+ :partial => 'profile_scrap', :collection => activity.replies.paginate(:per_page => comments_per_page, :page => comment_page), :as => :scrap
	243	+
	244	+ if no_more_pages
	245	+ page.remove 'profile-wall-activities-comments-more-'+params[:activity]
	246	+ else
	247	+ page.replace_html 'profile-wall-activities-comments-more-'+params[:activity],
	248	+ :partial => 'more_replies', :locals => {:activity => activity, :comment_page => comment_page}
	249	+ end
	250	+ end
	251	+ end
	252	+
213	253	def remove_scrap
214	254	begin
215	255	scrap = current_user.person.scraps(params[:scrap_id])
...	...	@@ -343,6 +383,7 @@ class ProfileController < PublicController
343	383	end
344	384	end
345	385
	386	+
346	387	protected
347	388
348	389	def check_access_to_profile
...	...	@@ -393,4 +434,5 @@ class ProfileController < PublicController
393	434	def relations_to_include
394	435	[:image, :domains, :preferred_domain, :environment]
395	436	end
	437	+
396	438	end
...	...
...	...	@@ -1424,8 +1424,8 @@ module ApplicationHelper
1424	1424	end
1425	1425
1426	1426	def filter_html(html, source)
1427		- if @plugins && source.has_macro?
1428		- html = convert_macro(html, source)
	1427	+ if @plugins && source && source.has_macro?
	1428	+ html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1429	1429	#TODO This parse should be done through the macro infra, but since there
1430	1430	# are old things that do not support it we are keeping this hot spot.
1431	1431	html = @plugins.pipeline(:parse_content, html, source).first
...	...
...	...	@@ -2,6 +2,18 @@
2	2	<%= _('Content management') %>
3	3	</h1>
4	4
	5	+<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
	6	+ <div class="cms-homepage">
	7	+ <%= _('Profile homepage:') %>
	8	+ <% if profile.home_page %>
	9	+ <%= link_to_article(profile.home_page) %>
	10	+ <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>
	11	+ <% else %>
	12	+ <span class="cms-homepage-default"><%= _('Profile Information') %></span>
	13	+ <% end %>
	14	+ </div>
	15	+<% end %>
	16	+
5	17	<% button_bar(:style => 'margin-bottom: 1em;') do %>
6	18	<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
7	19
...	...	@@ -56,7 +68,11 @@
56	68	<%= button_without_text :eyes, _('Public view'), article.view_url %>
57	69	<%= display_spread_button(profile, article) unless article.folder? \|\| remove_content_button(:spread)%>
58	70	<% if !environment.enabled?('cant_change_homepage') && !remove_content_button(:home) %>
59		- <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
	71	+ <% if profile.home_page != article %>
	72	+ <%= expirable_button article, :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
	73	+ <% else %>
	74	+ <%= button_without_text(:'home-not', _('Reset homepage'), { :action => 'set_home_page', :id => nil }, :method => :post) %>
	75	+ <% end %>
60	76	<% end %>
61	77	<%= display_delete_button(article) if !remove_content_button(:delete) %>
62	78	</td>
...	...
...	...	@@ -0,0 +1,3 @@
	1	+<div class='view-more-comments'>
	2	+ <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (comment_page + 1)) %>
	3	+</div>
...	...
...	...	@@ -0,0 +1,3 @@
	1	+<div class='view-more-replies'>
	2	+ <%= link_to(_('More'), :profile => @profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (comment_page + 1)) %>
	3	+</div>
...	...
...	...	@@ -4,7 +4,7 @@
4	4	<% if activity.kind_of?(ActionTracker::Record) %>
5	5	<%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'wall' } if activity.visible? %>
6	6	<% else %>
7		- <%= render :partial => 'profile_scrap', :locals => {:scrap => activity } %>
	7	+ <%= render :partial => 'profile_scraps', :locals => { :activity => activity, :scrap => activity } %>
8	8	<% end %>
9	9	<% end %>
10	10	<% end %>
...	...
1	1	<hr />
2	2
3		-<% if activity.comments_count > 2 %>
	3	+<ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments" >
	4	+</ul>
	5	+<% if activity.comments_count > 0 %>
	6	+<div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
4	7	<div class='view-all-comments icon-chat'>
5		- <%= link_to(_("View all %s comments") % activity.comments_count, '#') %>
	8	+ <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
6	9	</div>
	10	+</div>
7	11	<% end %>
8		-
9		-<ul class="profile-wall-activities-comments" style="<%= 'display:none;' if (activity.comments_count > 2) %>" >
10		- <%= render :partial => 'comment', :collection => activity.comments_as_thread %>
11		-</ul>
12		-
13	12	<%= render :partial => 'profile_comment_form', :locals => { :activity => activity, :tab_action => tab_action } %>
...	...
...	...	@@ -16,13 +16,7 @@
16	16	</div>
17	17	</div>
18	18
19		- <% if scrap.replies.count > 2 %>
20		- <div class='view-all-comments icon-chat'>
21		- <%= link_to(_("View all %s comments") % scrap.replies.count, '#') %>
22		- </div>
23		- <% end %>
24		-
25		- <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
	19	+ <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
26	20	<% scrap.replies.map do \|reply\| %>
27	21	<%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
28	22	<% end %>
...	...
1		-NÃO DEVE APARECER
	1	+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
	2	+ <div class='profile-activity-image'>
	3	+ <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
	4	+ </div>
	5	+ <div class='profile-activity-description'>
	6	+ <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
	7	+ <p class='profile-activity-text'><%= txt2html scrap.content %></p>
	8	+ <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
	9	+ <div class='profile-wall-actions'>
	10	+ <% if logged_in? && current_person.follows?(scrap.sender) %>
	11	+ <span class='profile-activity-send-reply'>
	12	+ <%= link_to_function s_('profile\|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
	13	+ </span>
	14	+ <% end %>
	15	+ <%= link_to_function(_('Remove'), 'remove_item_wall(this, %s, %s, %s); return false ;' % ["'.profile-activity-item'", url_for(:profile => params[:profile], :action => :remove_scrap, :scrap_id => scrap.id, :view => params[:view]).to_json, _('Are you sure you want to remove this scrap and all its replies?').to_json]) if logged_in? && user.can_control_scrap?(scrap) %>
	16	+ </div>
	17	+ </div>
	18	+
	19	+
	20	+ <ul id="profile-wall-activities-comments-<%= activity.id %>" class="profile-wall-activities-comments scrap-replies" style="width: auto;" >
	21	+ </ul>
	22	+
	23	+ <% if scrap.replies.count > 0 %>
	24	+ <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
	25	+ <div class='view-all-comments icon-chat'>
	26	+ <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
	27	+ </div>
	28	+ </div>
	29	+ <% end %>
	30	+ <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
	31	+ <hr />
	32	+</li>
...	...