Merge branch 'stoa' of gitlab.com:colivre/noosfero into stoa

Rodrigo Souto
2 parents 21b5bb7f 06611e5d
Showing 25 changed files with 260 additions and 120 deletions Show diff stats
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/helpers/application_helper.rb
app/mailers/user_mailer.rb
app/models/article.rb
app/models/person.rb
app/models/profile_suggestion.rb
app/views/content_viewer/_article_toolbar.html.erb
app/views/content_viewer/view_page.html.erb
app/views/friends/_profile_list.html.erb
app/views/friends/index.html.erb
app/views/friends/suggest.html.erb
app/views/memberships/suggest.html.erb
app/views/shared/_profile_list.html.erb
app/views/shared/_profile_suggestions_list.html.erb
app/views/user_mailer/profiles_suggestions_email.html.erb
lib/noosfero/plugin.rb
plugins/social_share_privacy/lib/ext/environment.rb
plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
plugins/social_share_privacy/public/style.css
@@ -3,7 +3,7 @@ class FriendsController &lt; MyProfileController
   protect 'manage_friends', :profile
  
   def index
-    @suggestions = profile.suggested_people.limit(per_page/2)
+    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
     if is_cache_expired?(profile.manage_friends_cache_key(params))
       @friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
     end
@@ -18,17 +18,16 @@ class FriendsController &lt; MyProfileController
   end
  
   def suggest
-    @suggestions = profile.suggested_people.paginate(:per_page => per_page, :page => params[:npage])
+    @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
   end
  
   def remove_suggestion
     @person = profile.suggested_people.find_by_identifier(params[:id])
     redirect_to :action => 'suggest' unless @person
     if @person && request.post?
-      suggestion = profile.profile_suggestions.find_by_suggestion_id @person.id
-      suggestion.disable
-      session[:notice] = _('Suggestion removed')
-      redirect_to :action => 'suggest'
+      profile.remove_suggestion(@person)
+      @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
+      render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions }
     end
   end
  
@@ -40,17 +40,23 @@ class MembershipsController &lt; MyProfileController
   end
  
   def suggest
-    @suggestions = profile.suggested_communities.paginate(:per_page => 8, :page => params[:npage])
+    @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
   end
  
   def remove_suggestion
     @community = profile.suggested_communities.find_by_identifier(params[:id])
     redirect_to :action => 'suggest' unless @community
     if @community && request.post?
-      suggestion = profile.profile_suggestions.find_by_suggestion_id @community.id
-      suggestion.disable
-      redirect_to :action => 'suggest'
+      profile.remove_suggestion(@community)
+      @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
+      render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions }
     end
   end
  
+  protected
+
+  def per_page
+    10
+  end
+
 end
@@ -1419,4 +1419,9 @@ module ApplicationHelper
     text_field_tag name, default, options.merge({:id => 'search-input', 'data-asset' => asset})
   end
  
+  def profile_suggestion_categories(suggestion)
+    suggestion.categories.map do |cat|
+      content_tag(:p, content_tag(:span, "#{suggestion.category_label(cat[0])}: #{cat[1]}", :class => suggestion.category_icon(cat[0])))
+    end.join
+  end
 end
@@ -54,7 +54,7 @@ class UserMailer &lt; ActionMailer::Base
       content_type: 'text/html',
       to: user.email,
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
-      subject: _("[%s] We have suggestions for your network") % user.environment.name
+      subject: _("[%s] What about grow up your network?") % user.environment.name
     )
   end
  
@@ -507,7 +507,10 @@ class Article &lt; ActiveRecord::Base
   end
  
   alias :allow_delete?  :allow_post_content?
-  alias :allow_spread?  :allow_post_content?
+
+  def allow_spread?(user = nil)
+    user && public?
+  end
  
   def allow_create?(user)
     allow_post_content?(user) || allow_publish_content?(user)
@@ -66,7 +66,7 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
-  has_many :profile_suggestions, :foreign_key => :person_id, :dependent => :destroy
+  has_many :profile_suggestions, :foreign_key => :person_id, :order => 'id ASC', :dependent => :destroy
   has_many :suggested_people, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
   has_many :suggested_communities, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
  
@@ -498,6 +498,11 @@ class Person &lt; Profile
     person.notifier.reschedule_next_notification_mail
   end
  
+  def remove_suggestion(profile)
+    suggestion = profile_suggestions.find_by_suggestion_id profile.id
+    suggestion.disable if suggestion
+  end
+
   protected
  
   def followed_by?(profile)
@@ -2,7 +2,7 @@ class ProfileSuggestion &lt; ActiveRecord::Base
   belongs_to :person
   belongs_to :suggestion, :class_name => 'Profile', :foreign_key => :suggestion_id
  
-  attr_accessible :person, :suggestion, :suggestion_type, :categories, :similarity, :enabled
+  attr_accessible :person, :suggestion, :suggestion_type, :categories, :enabled
  
   before_create do |profile_suggestion|
     profile_suggestion.suggestion_type = self.suggestion.class.to_s
@@ -18,11 +18,15 @@ class ProfileSuggestion &lt; ActiveRecord::Base
   end
  
   validates_uniqueness_of :suggestion_id, :scope => [ :person_id ]
+  scope :of_person, :conditions => { :suggestion_type => 'Person' }
+  scope :of_community, :conditions => { :suggestion_type => 'Community' }
+  scope :enabled, :conditions => { :enabled => true }
  
+  # {:category_type => ['category-icon', 'category-label']}
   CATEGORIES = {
-    :common_friends => _('Friends in common'),
-    :common_communities => _('Communities in common'),
-    :common_tags => _('Tags in common')
+    :common_friends => ['menu-people', _('Friends in common')],
+    :common_communities => ['menu-community',_('Communities in common')],
+    :common_tags => ['edit', _('Tags in common')]
   }
  
   CATEGORIES.keys.each do |category|
@@ -30,6 +34,14 @@ class ProfileSuggestion &lt; ActiveRecord::Base
     attr_accessible category.to_sym
   end
  
+  def category_icon(category)
+    'icon-' + ProfileSuggestion::CATEGORIES[category][0]
+  end
+
+  def category_label(category)
+    ProfileSuggestion::CATEGORIES[category][1]
+  end
+
   RULES = %w[
     people_with_common_friends
     people_with_common_communities
@@ -15,7 +15,7 @@
       <%= expirable_button @page, :delete, content, url, options %>
     <% end %>
  
-    <% if !@page.folder? && @page.public? && !remove_content_button(:spread) %>
+    <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
       <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
     <% end %>
@@ -42,7 +42,6 @@
  
 <%= render :partial => 'shared/disabled_enterprise' %>
  
-<%= @plugins.dispatch(:social_buttons_javascript, @page).collect { |content| instance_exec(&content) }.join("") %>
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -71,6 +70,8 @@
  
 <%= display_source_info(@page) %>
  
+<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %>
+
 <%= @plugins.dispatch(:article_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
  
 <div class="comments" id="comments_list">
@@ -0,0 +1,16 @@
+<ul class="profile-list">
+  <% profiles.each do |profile| %>
+    <li>
+    <%= link_to_profile profile_image(profile) + '<br/>' + profile.short_name,
+                        profile.identifier, :class => 'profile-link' %>
+    <div class="controll">
+      <%= button_without_text :remove, content_tag('span',_('remove')),
+          { :action => 'remove', :id => profile.id },
+            :title => _('remove') %>
+      <%= button_without_text 'menu-mail', content_tag('span',_('contact')),
+            profile.url.merge(:controller => 'contact', :action => 'new', :profile => profile.identifier),
+            :title => _('contact') %>
+    </div><!-- end class="controll" -->
+    </li>
+  <% end %>
+</ul>
@@ -20,22 +20,18 @@
     <% end %>
   <% end %>
  
-  <%= render :partial => 'shared/profile_list', :locals => { :profiles => @friends, :collection => :friends } %>
-  <div id='pagination-friends'>
-    <%= pagination_links @friends, :param_name => 'npage' %>
-  </div>
+  <%= render :partial => 'profile_list', :locals => { :profiles => @friends } %>
  
+  <br style="clear:both" />
+  <%= pagination_links @friends, :param_name => 'npage' %>
 <% end %>
  
 <% unless @suggestions.empty? %>
   <br style="clear:both" />
   <h2><%= _("Friends suggestions") %></h2>
-
-  <%= render :partial => 'shared/profile_list', :locals => { :profiles => @suggestions, :collection => :friends_suggestions } %>
-
-  <% button_bar do %>
-    <%= link_to _('See more suggestions...'), :action => 'suggest' %>
-  <% end %>
+  <div class="profiles-suggestions">
+    <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions } %>
+  </div>
 <% end %>
  
 </div><!-- end id="manage_friends" -->
-<div class='profiles-suggestions'>
-  <h1><%= _("Friends suggestions for %s") % profile.name %></h1>
+<h1><%= _("Friends suggestions for %s") % profile.name %></h1>
  
-  <% button_bar do %>
-    <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
-  <% end %>
+<% button_bar do %>
+  <%= button(:back, _('Go to friends list'), :controller => 'friends') %>
+<% end %>
  
-  <% if @suggestions.empty? %>
-    <p>
-      <em>
-        <%= _('You have no suggestions yet.') %>
-        <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
-      </em>
-    </p>
-  <% else %>
-    <%= render :partial => 'shared/profile_list', :locals => { :profiles => @suggestions, :collection => :friends_suggestions } %>
-
-    <%= pagination_links @suggestions, :param_name => 'npage' %>
-  <% end %>
-  <br style="clear:both" />
+<div class="profiles-suggestions">
+  <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions } %>
 </div>
-<div class='profiles-suggestions'>
-  <h1><%= _("Communities suggestions for %s") % profile.name %></h1>
+<h1><%= _("Communities suggestions for %s") % profile.name %></h1>
  
-  <% button_bar do %>
-    <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
-  <% end %>
+<% button_bar do %>
+  <%= button(:back, _('Go to groups list'), :controller => 'memberships') %>
+<% end %>
  
-  <% if @suggestions.empty? %>
-    <p>
-      <em>
-        <%= _('You have no suggestions yet.') %>
-        <%= link_to _('Do you want to see communities in this environment?'), :controller => 'search', :action => 'assets', :asset => 'communities' %>
-      </em>
-    </p>
-  <% else %>
-    <%= render :partial => 'shared/profile_list', :locals => { :profiles => @suggestions, :collection => :communities_suggestions } %>
-  <% end %>
-
-  <%= pagination_links @suggestions, :param_name => 'npage' %>
-  <br style="clear:both" />
+<div class="profiles-suggestions">
+  <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions } %>
 </div>
@@ -1,38 +0,0 @@
-<ul class="profile-list">
-  <% profiles.each do |profile| %>
-    <li>
-    <%= link_to_profile profile_image(profile) + '<br/>' + profile.short_name,
-                        profile.identifier, :class => 'profile-link' %>
-    <div class="controll">
-      <% if collection == :friends %>
-        <%= button_without_text :remove, content_tag('span',_('remove')),
-            { :action => 'remove', :id => profile.id },
-              :title => _('remove') %>
-        <%= button_without_text 'menu-mail', content_tag('span',_('contact')),
-              profile.url.merge(:controller => 'contact', :action => 'new', :profile => profile.identifier),
-              :title => _('contact') %>
-      <% elsif collection == :friends_suggestions %>
-        <%= button_without_text :add, content_tag('span',_('add')),
-              profile.add_url,
-              :class => 'add-friend',
-              :title => _('Add friend') %>
-        <%= button_without_text :remove, content_tag('span',_('remove')),
-            { :action => 'remove_suggestion', :id => profile.identifier },
-              :title => _('Remove suggestion'),
-              :method => 'post',
-              :confirm => _('Are you sure you want to remove this suggestion?') %>
-      <% elsif collection == :communities_suggestions %>
-          <%= button_without_text :add, content_tag('span',_('join')),
-                profile.join_url,
-                :class => 'join-community',
-                :title => _("Join %s") % profile.name %>
-          <%= button_without_text :remove, content_tag('span',_('remove')),
-              { :action => 'remove_suggestion', :id => profile.identifier },
-                :title => _('Remove suggestion'),
-                :method => 'post',
-                :confirm => _('Are you sure you want to remove this suggestion?') %>
-      <% end %>
-    </div><!-- end class="controll" -->
-    </li>
-  <% end %>
-</ul>
@@ -0,0 +1,47 @@
+<% if suggestions.empty? %>
+  <p>
+    <em>
+      <%= _('You have no more suggestions :(') %>
+    </em>
+  </p>
+<% else %>
+  <ul class="profile-list">
+    <% suggestions.each do |s| %>
+      <li>
+        <%= link_to_profile profile_image(s.suggestion, :minor) + '<br/>' + s.suggestion.short_name,
+                            s.suggestion.identifier, :class => 'profile-link' %>
+        <%= button_without_text :help, content_tag('span',_('info about suggestion')),
+            { :action => '#' },
+              :class => 'explain-suggestion',
+              :title => _('Why this suggestion?') %>
+        <div class='extra_info' style='display:none'>
+          <%= profile_suggestion_categories(s) %>
+        </div>
+        <div class="controll">
+          <% if collection == :friends_suggestions %>
+            <%= button_without_text :add, content_tag('span',_('add')),
+                  s.suggestion.add_url,
+                  :class => 'add-friend accept-suggestion',
+                  :title => _('Add friend') %>
+            <%= button_without_text :remove, content_tag('span',_('remove')),
+                { :action => 'remove_suggestion', :id => s.suggestion.identifier },
+                  :class => 'remove-suggestion',
+                  :title => _('Remove suggestion'),
+                  :confirm => _('Are you sure you want to remove this suggestion?') %>
+          <% elsif collection == :communities_suggestions %>
+              <%= button_without_text :add, content_tag('span',_('join')),
+                    s.suggestion.join_url,
+                    :class => 'join-community accept-suggestion',
+                    :title => _("Join %s") % s.suggestion.name %>
+              <%= button_without_text :remove, content_tag('span',_('remove')),
+                  { :action => 'remove_suggestion', :id => s.suggestion.identifier },
+                    :class => 'remove-suggestion',
+                    :title => _('Remove suggestion'),
+                    :confirm => _('Are you sure you want to remove this suggestion?') %>
+          <% end %>
+        </div><!-- end class="controll" -->
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+<br style="clear:both" />
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  
-<p><%= _('We want to give you some suggestions to grow up your network. Check it out!') %></p>
+<p><%= _('We want to give you some suggestions to grow up your network.') %>
+<p><%= _('Check it out!') %></p>
  
 <% unless @people_suggestions.empty? %>
   <p><%= _('Friends suggestions:') %></p>
@@ -395,8 +395,8 @@ class Noosfero::Plugin
   end
  
   # -> Adds social networks share buttons to content
-  # returns = lambda block that creates html code
-  def social_buttons_javascript(environment)
+  # returns = proc that creates html code
+  def social_buttons_contents
     nil
   end
  
@@ -1,8 +0,0 @@
-require_dependency 'environment'
-
-class Environment
-
-  settings_items :socialshare, :type => Array, :default => []
-
-end
-
@@ -21,9 +21,10 @@ class SocialSharePrivacyPlugin &lt; Noosfero::Plugin
       settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
       locale = FastGettext.locale
       javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') + 
+      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
       javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + 
       (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
-      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({perma_option: false, info_link_target: '_blank'});});") +
+      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
       content_tag(:div, '', :class => "social-buttons")
     end
   end
@@ -7,4 +7,5 @@
 .social-buttons {
   display: inline-block;
   width: 100%;
+  margin: 10px 0;
 }
@@ -120,4 +120,23 @@ jQuery(function($) {
     return false;
   })
  
+  $(".remove-suggestion").live('click', function(){
+    clicked = $(this)
+    url = clicked.attr("href");
+    loading_for_button(this);
+    $.post(url, function(data){
+      clicked.fadeOut();
+      clicked.parents('.profiles-suggestions').html(data);
+    });
+    return false;
+  })
+
+  /* After adding a suggestion need to remove it from list */
+  $(".accept-suggestion").live('click', function(){
+    clicked = $(this)
+    loading_for_button(this);
+    clicked.parents('li').fadeOut();
+    return false;
+  })
+
 });
@@ -1053,6 +1053,13 @@ function showHideTermsOfUse() {
   }
 }
  
+jQuery('.profiles-suggestions .explain-suggestion').live('click', function() {
+  var clicked = jQuery(this);
+  clicked.toggleClass('active');
+  clicked.next('.extra_info').toggle();
+  return false;
+});
+
 jQuery(document).ready(function(){
   showHideTermsOfUse();
  
@@ -2131,7 +2131,8 @@ a.button.disabled, input.disabled {
 #content .common-profile-list-block .sex-male span, #content .common-profile-list-block .sex-female span, #content .common-profile-list-block .sex-undef span {
   display: none;
 }
-.common-profile-list-block .extra_info {
+.common-profile-list-block .extra_info,
+.profile-list .extra_info {
   font-size: 9px;
   opacity: 0.5;
   filter: alpha(opacity=50);
@@ -3955,16 +3956,24 @@ h1#agenda-title {
 .controller-friends .profile-list li,
 .profiles-suggestions .profile-list li {
   float: left;
-  width: 90px;
+  margin: 5px;
   height: 90px;
-  max-width: 80px;
   max-height: 80px;
-  margin: 5px;
   padding: 5px;
   border: 2px solid transparent;
   list-style: none;
   position: relative;
 }
+.controller-favorite_enterprises .profile-list li,
+.controller-friends .profile-list li {
+  width: 90px;
+  max-width: 80px;
+}
+.profiles-suggestions .profile-list li {
+  width: 76px;
+  max-width: 76px;
+}
+
 .controller-favorite_enterprises .profile-list li:hover,
 .controller-friends .profile-list li:hover,
 .profiles-suggestions .profile-list li:hover {
@@ -4000,12 +4009,22 @@ h1#agenda-title {
 .profiles-suggestions .profile-list {
   position: relative;
 }
+.profiles-suggestions .profile-list .explain-suggestion {
+  position: absolute;
+  top: 7px;
+  left: -5px;
+  z-index: 10;
+}
+#content .profiles-suggestions .profile-list .explain-suggestion.active {
+  border-bottom-color: transparent;
+}
+
 .controller-favorite_enterprises .profile-list .controll,
 .controller-friends .profile-list .controll,
 .profiles-suggestions .profile-list .controll {
   position: absolute;
   top: 7px;
-  right: -10px;
+  right: -5px;
 }
 .controller-favorite_enterprises .profile-list .controll a,
 .controller-friends .profile-list .controll a,
@@ -4024,6 +4043,31 @@ h1#agenda-title {
   clear: both;
   padding-top: 20px;
 }
+
+.profiles-suggestions .profile-list .extra_info {
+  background: url("/images/down-arrow.png") no-repeat scroll center top #eee;
+  border: 1px solid #ccc;
+  left: -66px;
+  min-width: 135px;
+  padding: 5px;
+  position: absolute;
+  top: 29px;
+  opacity: 0.9;
+  z-index: 5;
+}
+
+.profiles-suggestions .profile-list .extra_info p {
+  margin: 0px;
+}
+
+.profiles-suggestions .profile-list .extra_info span {
+  background-position: 4px 50%;
+  background-repeat: no-repeat;
+  display: block;
+  line-height: 20px;
+  padding: 0 0 0 25px;
+}
+
 /* ==> public/stylesheets/controller_friends.css <== */
  
 .controller-friends #remove_friend .friend_picture,
@@ -1391,4 +1391,29 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'meta', :attributes => { :property => 'og:image', :content => /\/images\/x.png/  }
   end
  
+  should 'add social content on content view page from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def social_buttons_contents
+        proc {"<strong>Plugin1 text</strong>"}
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def social_buttons_contents
+        proc {"<div class='social-buttons'></div>"}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+    Environment.default.enable_plugin(Plugin2.name)
+
+    page = profile.articles.build(:name => 'test')
+    page.save!
+
+    get :view_page, :profile => profile.identifier, :page => ['test']
+
+    assert_tag :tag => 'strong', :content => 'Plugin1 text'
+    assert_tag :tag => 'div', :attributes => {:class => 'social-buttons'}
+  end
+
 end
@@ -1544,6 +1544,28 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal [suggested_community], person.suggested_communities
   end
  
+  should 'disable friend suggestion' do
+    person = create_user('person').person
+    suggested_person = fast_create(Person)
+
+    suggestion = ProfileSuggestion.create(:person => person, :suggestion => suggested_person)
+
+    assert_difference 'person.suggested_people.count', -1 do
+      person.remove_suggestion(suggested_person)
+    end
+  end
+
+  should 'disable community suggestion' do
+    person = create_user('person').person
+    suggested_community = fast_create(Community)
+
+    suggestion = ProfileSuggestion.create(:person => person, :suggestion => suggested_community)
+
+    assert_difference 'person.suggested_communities.count', -1 do
+      person.remove_suggestion(suggested_community)
+    end
+  end
+
   should 'return url to people suggestions for a person' do
     environment = create_environment('mycolivre.net')
     profile = build(Person, :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
...	...	@@ -3,7 +3,7 @@ class FriendsController < MyProfileController
3	3	protect 'manage_friends', :profile
4	4
5	5	def index
6		- @suggestions = profile.suggested_people.limit(per_page/2)
	6	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
7	7	if is_cache_expired?(profile.manage_friends_cache_key(params))
8	8	@friends = profile.friends.paginate(:per_page => per_page, :page => params[:npage])
9	9	end
...	...	@@ -18,17 +18,16 @@ class FriendsController < MyProfileController
18	18	end
19	19
20	20	def suggest
21		- @suggestions = profile.suggested_people.paginate(:per_page => per_page, :page => params[:npage])
	21	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
22	22	end
23	23
24	24	def remove_suggestion
25	25	@person = profile.suggested_people.find_by_identifier(params[:id])
26	26	redirect_to :action => 'suggest' unless @person
27	27	if @person && request.post?
28		- suggestion = profile.profile_suggestions.find_by_suggestion_id @person.id
29		- suggestion.disable
30		- session[:notice] = _('Suggestion removed')
31		- redirect_to :action => 'suggest'
	28	+ profile.remove_suggestion(@person)
	29	+ @suggestions = profile.profile_suggestions.of_person.enabled.includes(:suggestion).limit(per_page)
	30	+ render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :friends_suggestions }
32	31	end
33	32	end
34	33
...	...
...	...	@@ -40,17 +40,23 @@ class MembershipsController < MyProfileController
40	40	end
41	41
42	42	def suggest
43		- @suggestions = profile.suggested_communities.paginate(:per_page => 8, :page => params[:npage])
	43	+ @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
44	44	end
45	45
46	46	def remove_suggestion
47	47	@community = profile.suggested_communities.find_by_identifier(params[:id])
48	48	redirect_to :action => 'suggest' unless @community
49	49	if @community && request.post?
50		- suggestion = profile.profile_suggestions.find_by_suggestion_id @community.id
51		- suggestion.disable
52		- redirect_to :action => 'suggest'
	50	+ profile.remove_suggestion(@community)
	51	+ @suggestions = profile.profile_suggestions.of_community.enabled.includes(:suggestion).limit(per_page)
	52	+ render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => @suggestions, :collection => :communities_suggestions }
53	53	end
54	54	end
55	55
	56	+ protected
	57	+
	58	+ def per_page
	59	+ 10
	60	+ end
	61	+
56	62	end
...	...
...	...	@@ -1419,4 +1419,9 @@ module ApplicationHelper
1419	1419	text_field_tag name, default, options.merge({:id => 'search-input', 'data-asset' => asset})
1420	1420	end
1421	1421
	1422	+ def profile_suggestion_categories(suggestion)
	1423	+ suggestion.categories.map do \|cat\|
	1424	+ content_tag(:p, content_tag(:span, "#{suggestion.category_label(cat[0])}: #{cat[1]}", :class => suggestion.category_icon(cat[0])))
	1425	+ end.join
	1426	+ end
1422	1427	end
...	...
...	...	@@ -54,7 +54,7 @@ class UserMailer < ActionMailer::Base
54	54	content_type: 'text/html',
55	55	to: user.email,
56	56	from: "#{user.environment.name} <#{user.environment.contact_email}>",
57		- subject: _("[%s] We have suggestions for your network") % user.environment.name
	57	+ subject: _("[%s] What about grow up your network?") % user.environment.name
58	58	)
59	59	end
60	60
...	...
...	...	@@ -507,7 +507,10 @@ class Article < ActiveRecord::Base
507	507	end
508	508
509	509	alias :allow_delete? :allow_post_content?
510		- alias :allow_spread? :allow_post_content?
	510	+
	511	+ def allow_spread?(user = nil)
	512	+ user && public?
	513	+ end
511	514
512	515	def allow_create?(user)
513	516	allow_post_content?(user) \|\| allow_publish_content?(user)
...	...
...	...	@@ -66,7 +66,7 @@ class Person < Profile
66	66	has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
67	67	has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
68	68
69		- has_many :profile_suggestions, :foreign_key => :person_id, :dependent => :destroy
	69	+ has_many :profile_suggestions, :foreign_key => :person_id, :order => 'id ASC', :dependent => :destroy
70	70	has_many :suggested_people, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
71	71	has_many :suggested_communities, :through => :profile_suggestions, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
72	72
...	...	@@ -498,6 +498,11 @@ class Person < Profile
498	498	person.notifier.reschedule_next_notification_mail
499	499	end
500	500
	501	+ def remove_suggestion(profile)
	502	+ suggestion = profile_suggestions.find_by_suggestion_id profile.id
	503	+ suggestion.disable if suggestion
	504	+ end
	505	+
501	506	protected
502	507
503	508	def followed_by?(profile)
...	...
...	...	@@ -2,7 +2,7 @@ class ProfileSuggestion < ActiveRecord::Base
2	2	belongs_to :person
3	3	belongs_to :suggestion, :class_name => 'Profile', :foreign_key => :suggestion_id
4	4
5		- attr_accessible :person, :suggestion, :suggestion_type, :categories, :similarity, :enabled
	5	+ attr_accessible :person, :suggestion, :suggestion_type, :categories, :enabled
6	6
7	7	before_create do \|profile_suggestion\|
8	8	profile_suggestion.suggestion_type = self.suggestion.class.to_s
...	...	@@ -18,11 +18,15 @@ class ProfileSuggestion < ActiveRecord::Base
18	18	end
19	19
20	20	validates_uniqueness_of :suggestion_id, :scope => [ :person_id ]
	21	+ scope :of_person, :conditions => { :suggestion_type => 'Person' }
	22	+ scope :of_community, :conditions => { :suggestion_type => 'Community' }
	23	+ scope :enabled, :conditions => { :enabled => true }
21	24
	25	+ # {:category_type => ['category-icon', 'category-label']}
22	26	CATEGORIES = {
23		- :common_friends => _('Friends in common'),
24		- :common_communities => _('Communities in common'),
25		- :common_tags => _('Tags in common')
	27	+ :common_friends => ['menu-people', _('Friends in common')],
	28	+ :common_communities => ['menu-community',_('Communities in common')],
	29	+ :common_tags => ['edit', _('Tags in common')]
26	30	}
27	31
28	32	CATEGORIES.keys.each do \|category\|
...	...	@@ -30,6 +34,14 @@ class ProfileSuggestion < ActiveRecord::Base
30	34	attr_accessible category.to_sym
31	35	end
32	36
	37	+ def category_icon(category)
	38	+ 'icon-' + ProfileSuggestion::CATEGORIES[category][0]
	39	+ end
	40	+
	41	+ def category_label(category)
	42	+ ProfileSuggestion::CATEGORIES[category][1]
	43	+ end
	44	+
33	45	RULES = %w[
34	46	people_with_common_friends
35	47	people_with_common_communities
...	...
...	...	@@ -15,7 +15,7 @@
15	15	<%= expirable_button @page, :delete, content, url, options %>
16	16	<% end %>
17	17
18		- <% if !@page.folder? && @page.public? && !remove_content_button(:spread) %>
	18	+ <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
19	19	<% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
20	20	<%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
21	21	<% end %>
...	...
...	...	@@ -42,7 +42,6 @@
42	42
43	43	<%= render :partial => 'shared/disabled_enterprise' %>
44	44
45		-<%= @plugins.dispatch(:social_buttons_javascript, @page).collect { \|content\| instance_exec(&content) }.join("") %>
46	45	<% if NOOSFERO_CONF['addthis_enabled'] %>
47	46	<%= render :partial => 'addthis' %>
48	47	<% end %>
...	...	@@ -71,6 +70,8 @@
71	70
72	71	<%= display_source_info(@page) %>
73	72
	73	+<%= @plugins.dispatch(:social_buttons_contents).collect { \|content\| instance_exec(&content) }.join("") %>
	74	+
74	75	<%= @plugins.dispatch(:article_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>
75	76
76	77	<div class="comments" id="comments_list">
...	...
...	...	@@ -0,0 +1,16 @@
	1	+<ul class="profile-list">
	2	+ <% profiles.each do \|profile\| %>
	3	+ <li>
	4	+ <%= link_to_profile profile_image(profile) + '<br/>' + profile.short_name,
	5	+ profile.identifier, :class => 'profile-link' %>
	6	+ <div class="controll">
	7	+ <%= button_without_text :remove, content_tag('span',_('remove')),
	8	+ { :action => 'remove', :id => profile.id },
	9	+ :title => _('remove') %>
	10	+ <%= button_without_text 'menu-mail', content_tag('span',_('contact')),
	11	+ profile.url.merge(:controller => 'contact', :action => 'new', :profile => profile.identifier),
	12	+ :title => _('contact') %>
	13	+ </div><!-- end class="controll" -->
	14	+ </li>
	15	+ <% end %>
	16	+</ul>
...	...