Follow feature views and controller actions

- Follow and Unfollow profile options - Followed profiles categorization - Manage followed profiles page Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>

Follow feature views and controller actions
- Follow and Unfollow profile options - Followed profiles categorization - Manage followed profiles page Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Gabriel Silva
1 parent e697a141
Showing 18 changed files with 316 additions and 18 deletions Show diff stats
app/controllers/my_profile/followers_controller.rb
app/controllers/public/profile_controller.rb
app/models/person.rb
app/models/profile.rb
app/models/profile_follower.rb
app/views/blocks/profile_info_actions/_person.html.erb
app/views/followers/_profile_list.html.erb
app/views/followers/_set_category_modal.html.erb
app/views/followers/index.html.erb
app/views/profile/following.html.erb
app/views/profile_editor/edit.html.erb
app/views/profile_editor/index.html.erb
public/javascripts/application.js
public/javascripts/followers.js
public/stylesheets/blocks/profile-info.scss
public/stylesheets/profile-list.scss
test/functional/followers_controller_test.rb
test/functional/profile_controller_test.rb
@@ -0,0 +1,16 @@
+class FollowersController < MyProfileController
+
+  def index
+    @followed_people = current_person.following_profiles.paginate(:per_page => 5, :page => params[:npage])
+  end
+
+  def set_category
+    if request.method == "GET"
+      render :partial => "set_category_modal", :locals => { :followed_profile_id => params[:followed_profile_id] }
+    elsif request.method == "POST"
+      follower = ProfileFollower.find_by(follower_id: current_person.id, profile_id: params[:followed_profile_id])
+      follower.update_attributes(:group => params[:category_name]) if follower
+      redirect_to url_for(:controller => "followers", :action => "index")
+    end
+  end
+end
@@ -3,7 +3,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
-  before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
+  before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail, :follow, :unfollow]
   helper TagsHelper
   helper ActionTrackerHelper
@@ -65,6 +65,10 @@ class ProfileController &lt; PublicController
     end
   end
+  def following
+    @followed_people = [].paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
+  end
+
   def members
     if is_cache_expired?(profile.members_cache_key(params))
       sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
@@ -151,6 +155,22 @@ class ProfileController &lt; PublicController
     end
   end
+  def follow
+    if !current_person.follows?(profile)
+      group = params['follow'] ? params['follow']['category'] : ''
+      current_person.follow(profile, group)
+    end
+    redirect_to profile.url
+  end
+
+  def unfollow
+    if current_person.follows?(profile)
+       current_person.unfollow(profile)
+    end
+    redirect_url = params["redirect_to"] ? params["redirect_to"] : profile.url
+    redirect_to redirect_url
+  end
+
   def check_friendship
     unless logged_in?
       render :text => ''
@@ -200,7 +200,7 @@ class Person &lt; Profile
     end
   end
-  def follow(profile, group = nil)
+  def follow(profile, group = "")
     unless self.following_profiles.include?(profile)
       profile_follower = ProfileFollower.new
       profile_follower.profile = profile
@@ -601,7 +601,7 @@ class Person &lt; Profile
   protected
   def followed_by?(profile)
-    self == profile || self.is_a_friend?(profile) || self.followers.include(profile)
+    self == profile || self.followers.include?(profile)
   end
 end
@@ -204,7 +204,7 @@ class Profile &lt; ApplicationRecord
   scope :more_recent, -> { order "created_at DESC" }
   scope :following_profiles, -> person {
-    distinct.select('profiles.*').
+    distinct.select('profiles.*, profile_followers.group').
     joins('join profile_followers ON profile_followers.profile_id = profiles.id').
     where('profile_followers.follower_id = ?', person.id)
   }
 class ProfileFollower < ApplicationRecord
   track_actions :new_follower, :after_create, :keep_params => ["follower.name", "follower.url", "follower.profile_custom_icon"], :custom_user => :profile
+  attr_accessible :group
   belongs_to :profile, :foreign_key => :profile_id
   belongs_to :follower, :class_name => 'Person', :foreign_key => :follower_id
@@ -7,6 +7,20 @@
       </li>
     <% end %>
+    <li>
+      <% if user.follows?(profile) %>
+        <%= button(:unfollow, content_tag('span', _('Unfollow')), {:profile => profile.identifier, :controller => 'profile', :action => 'unfollow'}) %>
+      <% else %>
+        <form id="follower-container" action="<%= url_for({:profile => profile.identifier, :controller => 'profile', :action => 'follow'}) %>">
+          <div id="category-form" style="display: none;">
+            <%= labelled_text_field _("Choose a category: "), "follow[category]" %>
+          </div>
+          <%= submit_button('follow', _('Follow')) %>
+        </form>
+      <% end %>
+    </li>
+
+
     <% if user.is_a_friend?(profile) && profile.enable_contact? %>
       <li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
     <% end %>
@@ -0,0 +1,18 @@
+<ul class="profile-list">
+  <% profiles.each do |profile| %>
+    <li>
+    <%= link_to_profile profile_image(profile) + tag('br') + profile.short_name,
+                        profile.identifier, :class => 'profile-link' %>
+        <p class="category-name">
+            <%= profile.group %> 
+        </p>
+    <div class="controll">
+      <%= button_without_text :remove, content_tag('span',_('unfollow')),
+          { :controller => "profile", :profile => profile.identifier , :action => 'unfollow', :redirect_to => url_for({:controller => "followers", :profile => user.identifier}) },
+            :title => _('remove') %>
+      <%= modal_icon_button :change_categoy, content_tag('span',_('change category')),
+             url_for(:controller => 'followers', :action => 'set_category', :followed_profile_id => profile.id) %>
+    </div><!-- end class="controll" -->
+    </li>
+  <% end %>
+</ul>
@@ -0,0 +1,13 @@
+<div class='set-category-modal'>
+  <h2><%= _("Choose a new category") %></h2>
+  <%= form_for :follower_category, :url => url_for(:controller => 'followers', :action => 'set_category') do |f| %>
+    <div id="category-name">
+      <%= labelled_text_field _("Category: "), "category_name" %>
+    </div>
+    <%= hidden_field_tag 'followed_profile_id', followed_profile_id %>
+    <div id="actions-container">
+        <%= submit_button('save', _('Save')) %>
+        <%= modal_close_button  _("Cancel") %>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,25 @@
+<div id="manage_followed people">
+
+<h1><%= _("%s following") % profile.name %></h1>
+
+<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
+  <% if @followed_people.empty? %>
+    <p>
+      <em>
+        <%= _("You don't follow anybody yet.") %>
+      </em>
+    </p>
+  <% end %>
+
+  <%= button_bar do %>
+    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+    <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
+  <% end %>
+
+  <%= render :partial => 'profile_list', :locals => { :profiles => @followed_people } %>
+
+  <br style="clear:both" />
+  <%= pagination_links @followed_people, :param_name => 'npage' %>
+<% end %>
+
+</div>
@@ -0,0 +1,24 @@
+<div class="common-profile-list-block">
+
+<h1><%= _("%s is following") % profile.name %></h1>
+
+<% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
+<ul class='profile-list'>
+  <% @followed_people.each do |followed_person| %>
+    <%= profile_image_link(followed_person) %>
+  <% end%>
+</ul>
+
+  <div id='pagination-profiles'>
+    <%= pagination_links @followed_people, :param_name => 'npage' %>
+  </div>
+<% end %>
+
+<%= button_bar do %>
+  <%= button :back, _('Go back'), { :controller => 'profile' } %>
+  <% if user == profile %>
+    <%= button :edit, _('Manage followed people'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
+  <% end %>
+<% end %>
+
+</div>
@@ -26,6 +26,11 @@
   <% if profile.person? %>
     <div>
+      <!-- TODO: chagen to correct attributes after finishing the backend-->
+      <%= labelled_check_box _("Allow other users to follow me"), 'profile_data[can_be_followed]', true, profile.secret, :class => "person-can-be-followed" %>
+    </div>
+    <br>
+    <div>
       <%= labelled_radio_button _('Public &mdash; show my contents to all internet users').html_safe, 'profile_data[public_profile]', true, @profile.public_profile? %>
     </div>
     <div>
@@ -72,6 +72,8 @@
   <%= control_panel_button(_('Email Templates'), 'email-templates', :controller => :profile_email_templates) if profile.organization? %>
+  <%= control_panel_button(_('Manage followed people'), 'manage-followed-people', :controller => :followers) %>
+
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
     <%= control_panel_button(button[:title], button[:icon], button[:url], button[:html_options]) %>
   <% end %>
@@ -26,6 +26,7 @@
 *= require pagination.js
 * views speficics
 *= require add-and-join.js
+*= require followers.js
 *= require report-abuse.js
 *= require autogrow.js
 *= require require_login.js
@@ -0,0 +1,5 @@
+$("#follower-container").live("mouseenter", function() {
+  $("#category-form").fadeIn();
+}).live("mouseleave", function() {
+  $("#category-form").fadeOut();
+});
@@ -99,3 +99,16 @@
   margin: 0px 0px 5px 0px;
   padding: 2px;
 }
+#follower-container:hover {
+  background-color: #eee;
+  -o-transition:.5s;
+  -ms-transition:.5s;
+  -moz-transition:.5s;
+  -webkit-transition:.5s;
+  transition:.5s;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+#follower-container #category-form {
+  margin-bottom: 5px;
+}
@@ -23,6 +23,7 @@
 }
 .controller-favorite_enterprises .profile-list a.profile-link,
 .controller-friends .profile-list a.profile-link,
+.controller-followers .profile-list a.profile-link,
 .list-profile-connections .profile-list a.profile-link,
 .profiles-suggestions .profile-list a.profile-link {
   text-decoration: none;
@@ -32,11 +33,13 @@
 }
 .controller-favorite_enterprises .profile-list a.profile-link:hover,
 .controller-friends .profile-list a.profile-link:hover,
+.controller-followers .profile-list a.profile-link:hover,
 .profiles-suggestions .profile-list a.profile-link:hover {
   color: #FFF;
 }
 .controller-favorite_enterprises .profile-list .profile_link span,
 .controller-friends .profile-list .profile_link span,
+.controller-followers .profile-list .profile_link span,
 .box-1 .profiles-suggestions .profile-list .profile_link span {
   width: 80px;
   display: block;
@@ -44,12 +47,14 @@
 }
 .controller-favorite_enterprises .profile-list,
 .controller-friends .profile-list,
+.controller-followers .profile-list,
 .profiles-suggestions .profile-list {
   position: relative;
 }
 .controller-favorite_enterprises .profile-list .controll,
 .controller-friends .profile-list .controll,
+.controller-followers .profile-list .controll,
 .profiles-suggestions .profile-list .controll {
   position: absolute;
   top: 7px;
@@ -57,17 +62,20 @@
 }
 .controller-favorite_enterprises .profile-list .controll a,
 .controller-friends .profile-list .controll a,
+.controller-followers .profile-list .controll a,
 .profiles-suggestions .profile-list .controll a {
   display: block;
   margin-bottom: 2px;
 }
 .controller-favorite_enterprises .msie6 .profile-list .controll a,
 .controller-friends .msie6 .profile-list .controll a,
+.controller-folloed_people .msie6 .profile-list .controll a,
 .profiles-suggestions .msie6 .profile-list .controll a {
   width: 0px;
 }
 .controller-favorite_enterprises .button-bar,
 .controller-friends .button-bar,
+.controller-followers .button-bar,
 .profiles-suggestions .button-bar {
   clear: both;
   padding-top: 20px;
@@ -208,22 +216,35 @@
   font-size: 12px;
 }
 .action-profile-members .profile_link{
-	position: relative;
+  position: relative;
 }
 .action-profile-members .profile_link span.new-profile:last-child{
-	position: absolute;
-	top: 3px;
-	right: 2px;
-	text-transform: uppercase;
-	color: #FFF;
-	font-size: 9px;
-	background: #66CC33;
-	padding: 2px;
-	display: block;
-	width: 35px;
-	font-weight: 700;
+  position: absolute;
+  top: 3px;
+  right: 2px;
+  text-transform: uppercase;
+  color: #FFF;
+  font-size: 9px;
+  background: #66CC33;
+  padding: 2px;
+  display: block;
+  width: 35px;
+  font-weight: 700;
 }
 .action-profile-members .profile_link .fn{
-	font-style: normal;
-	color: #000;
+  font-style: normal;
+  color: #000;
+}
+.category-name {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  font-style: italic;
+  color: #888a85;
+  text-align: center;
+}
+.set-category-modal {
+  width: 250px;
+}
+.set-category-modal #actions-container {
+  margin-top: 20px
 }
@@ -0,0 +1,48 @@
+require_relative "../test_helper"
+require 'followers_controller'
+
+class FollowersControllerTest < ActionController::TestCase
+  def setup
+    @profile = create_user('testuser').person
+  end
+
+  should 'return followed people list' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    fast_create(ProfileFollower, :profile_id => person.id, :follower_id => @profile.id)
+
+    get :index, :profile => @profile.identifier
+    assert_includes assigns(:followed_people), person 
+  end
+
+  should 'redirect to login page if not logged in' do
+    person = fast_create(Person)
+    get :index, :profile => @profile.identifier
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'render set category modal' do
+    login_as(@profile.identifier)
+    get :set_category, :profile => @profile.identifier, :followed_profile_id => 3
+    assert_tag :tag => "input", :attributes => { :id => "followed_profile_id", :value => 3 }
+  end
+
+  should 'update followed person category' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    fast_create(ProfileFollower, :profile_id => person.id, :follower_id => @profile.id)
+
+    post :set_category, :profile => @profile.identifier, :category_name => "category test", :followed_profile_id => person.id
+    follower = ProfileFollower.find_by(:profile_id => person.id, :follower_id => @profile.id)
+    assert_equal follower.group, "category test"
+  end
+
+  should 'not update category of not followed person' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+
+    post :set_category, :profile => @profile.identifier, :category_name => "category test", :followed_profile_id => person.id
+    follower = ProfileFollower.find_by(:profile_id => person.id, :follower_id => @profile.id)
+    ProfileFollower.any_instance.expects(:update_attributes).times(0)
+  end
+end
@@ -1932,4 +1932,76 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
+  should 'follow a user without defining a group' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    get :follow, :profile => person.identifier
+
+    follower = ProfileFollower.find_by(:profile_id => person.id, :follower_id => @profile.id)
+    assert_not_nil follower
+  end
+
+  should "not follow user if not logged" do
+    person = fast_create(Person)
+    get :follow, :profile => person.identifier
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should 'follow a user with a group' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    get :follow, :profile => person.identifier, :follow => { :category => "A Group" }
+
+    follower = ProfileFollower.find_by(:profile_id => person.id, :follower_id => @profile.id)
+    assert_not_nil follower
+    assert_equal "A Group", follower.group
+  end
+
+  should 'not follow if current_person already follows the person' do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    fast_create(ProfileFollower, :profile_id => person.id, :follower_id => @profile.id)
+
+    assert_no_difference 'ProfileFollower.count' do
+      get :follow, :profile => person.identifier, :follow => { :category => "A Group" }
+    end
+  end
+
+  should "not unfollow user if not logged" do
+    person = fast_create(Person)
+    get :unfollow, :profile => person.identifier
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  should "unfollow a followed person" do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    follower = fast_create(ProfileFollower, :profile_id => person.id, :follower_id => @profile.id)
+    assert_not_nil follower
+
+    get :unfollow, :profile => person.identifier
+    follower = ProfileFollower.find_by(:profile_id => person.id, :follower_id => @profile.id)
+    assert_nil follower
+  end
+
+  should "not unfollow a not followed person" do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+
+    assert_no_difference 'ProfileFollower.count' do
+      get :unfollow, :profile => person.identifier
+    end
+  end
+
+  should "redirect to page after unfollow" do
+    login_as(@profile.identifier)
+    person = fast_create(Person)
+    fast_create(ProfileFollower, :profile_id => person.id, :follower_id => @profile.id)
+
+    get :unfollow, :profile => person.identifier, :redirect_to => "/some/url"
+    assert_redirected_to "/some/url"
+  end
+
 end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class FollowersController < MyProfileController
	2	+
	3	+ def index
	4	+ @followed_people = current_person.following_profiles.paginate(:per_page => 5, :page => params[:npage])
	5	+ end
	6	+
	7	+ def set_category
	8	+ if request.method == "GET"
	9	+ render :partial => "set_category_modal", :locals => { :followed_profile_id => params[:followed_profile_id] }
	10	+ elsif request.method == "POST"
	11	+ follower = ProfileFollower.find_by(follower_id: current_person.id, profile_id: params[:followed_profile_id])
	12	+ follower.update_attributes(:group => params[:category_name]) if follower
	13	+ redirect_to url_for(:controller => "followers", :action => "index")
	14	+ end
	15	+ end
	16	+end
	@@ -3,7 +3,7 @@ class ProfileController < PublicController		@@ -3,7 +3,7 @@ class ProfileController < PublicController
3	needs_profile	3	needs_profile
4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]	4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5	before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]	5	before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
6	- before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]	6	+ before_filter :login_required, :only => [:add, :join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail, :follow, :unfollow]
7		7
8	helper TagsHelper	8	helper TagsHelper
9	helper ActionTrackerHelper	9	helper ActionTrackerHelper
	@@ -65,6 +65,10 @@ class ProfileController < PublicController		@@ -65,6 +65,10 @@ class ProfileController < PublicController
65	end	65	end
66	end	66	end
67		67
		68	+ def following
		69	+ @followed_people = [].paginate(:per_page => per_page, :page => params[:npage], :total_entries => profile.friends.count)
		70	+ end
		71	+
68	def members	72	def members
69	if is_cache_expired?(profile.members_cache_key(params))	73	if is_cache_expired?(profile.members_cache_key(params))
70	sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'	74	sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
	@@ -151,6 +155,22 @@ class ProfileController < PublicController		@@ -151,6 +155,22 @@ class ProfileController < PublicController
151	end	155	end
152	end	156	end
153		157
		158	+ def follow
		159	+ if !current_person.follows?(profile)
		160	+ group = params['follow'] ? params['follow']['category'] : ''
		161	+ current_person.follow(profile, group)
		162	+ end
		163	+ redirect_to profile.url
		164	+ end
		165	+
		166	+ def unfollow
		167	+ if current_person.follows?(profile)
		168	+ current_person.unfollow(profile)
		169	+ end
		170	+ redirect_url = params["redirect_to"] ? params["redirect_to"] : profile.url
		171	+ redirect_to redirect_url
		172	+ end
		173	+
154	def check_friendship	174	def check_friendship
155	unless logged_in?	175	unless logged_in?
156	render :text => ''	176	render :text => ''
	@@ -200,7 +200,7 @@ class Person < Profile		@@ -200,7 +200,7 @@ class Person < Profile
200	end	200	end
201	end	201	end
202		202
203	- def follow(profile, group = nil)	203	+ def follow(profile, group = "")
204	unless self.following_profiles.include?(profile)	204	unless self.following_profiles.include?(profile)
205	profile_follower = ProfileFollower.new	205	profile_follower = ProfileFollower.new
206	profile_follower.profile = profile	206	profile_follower.profile = profile
	@@ -601,7 +601,7 @@ class Person < Profile		@@ -601,7 +601,7 @@ class Person < Profile
601	protected	601	protected
602		602
603	def followed_by?(profile)	603	def followed_by?(profile)
604	- self == profile \|\| self.is_a_friend?(profile) \|\| self.followers.include(profile)	604	+ self == profile \|\| self.followers.include?(profile)
605	end	605	end
606		606
607	end	607	end
	@@ -204,7 +204,7 @@ class Profile < ApplicationRecord		@@ -204,7 +204,7 @@ class Profile < ApplicationRecord
204	scope :more_recent, -> { order "created_at DESC" }	204	scope :more_recent, -> { order "created_at DESC" }
205		205
206	scope :following_profiles, -> person {	206	scope :following_profiles, -> person {
207	- distinct.select('profiles.*').	207	+ distinct.select('profiles.*, profile_followers.group').
208	joins('join profile_followers ON profile_followers.profile_id = profiles.id').	208	joins('join profile_followers ON profile_followers.profile_id = profiles.id').
209	where('profile_followers.follower_id = ?', person.id)	209	where('profile_followers.follower_id = ?', person.id)
210	}	210	}
1	class ProfileFollower < ApplicationRecord	1	class ProfileFollower < ApplicationRecord
2	track_actions :new_follower, :after_create, :keep_params => ["follower.name", "follower.url", "follower.profile_custom_icon"], :custom_user => :profile	2	track_actions :new_follower, :after_create, :keep_params => ["follower.name", "follower.url", "follower.profile_custom_icon"], :custom_user => :profile
		3	+ attr_accessible :group
3		4
4	belongs_to :profile, :foreign_key => :profile_id	5	belongs_to :profile, :foreign_key => :profile_id
5	belongs_to :follower, :class_name => 'Person', :foreign_key => :follower_id	6	belongs_to :follower, :class_name => 'Person', :foreign_key => :follower_id
	@@ -7,6 +7,20 @@		@@ -7,6 +7,20 @@
7	</li>	7	</li>
8	<% end %>	8	<% end %>
9		9
		10	+ <li>
		11	+ <% if user.follows?(profile) %>
		12	+ <%= button(:unfollow, content_tag('span', _('Unfollow')), {:profile => profile.identifier, :controller => 'profile', :action => 'unfollow'}) %>
		13	+ <% else %>
		14	+ <form id="follower-container" action="<%= url_for({:profile => profile.identifier, :controller => 'profile', :action => 'follow'}) %>">
		15	+ <div id="category-form" style="display: none;">
		16	+ <%= labelled_text_field _("Choose a category: "), "follow[category]" %>
		17	+ </div>
		18	+ <%= submit_button('follow', _('Follow')) %>
		19	+ </form>
		20	+ <% end %>
		21	+ </li>
		22	+
		23	+
10	<% if user.is_a_friend?(profile) && profile.enable_contact? %>	24	<% if user.is_a_friend?(profile) && profile.enable_contact? %>
11	<li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>	25	<li><%= button(:back, _('Send an e-mail'), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}) %></li>
12	<% end %>	26	<% end %>
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+<ul class="profile-list">
	2	+ <% profiles.each do \|profile\| %>
	3	+ <li>
	4	+ <%= link_to_profile profile_image(profile) + tag('br') + profile.short_name,
	5	+ profile.identifier, :class => 'profile-link' %>
	6	+ <p class="category-name">
	7	+ <%= profile.group %>
	8	+ </p>
	9	+ <div class="controll">
	10	+ <%= button_without_text :remove, content_tag('span',_('unfollow')),
	11	+ { :controller => "profile", :profile => profile.identifier , :action => 'unfollow', :redirect_to => url_for({:controller => "followers", :profile => user.identifier}) },
	12	+ :title => _('remove') %>
	13	+ <%= modal_icon_button :change_categoy, content_tag('span',_('change category')),
	14	+ url_for(:controller => 'followers', :action => 'set_category', :followed_profile_id => profile.id) %>
	15	+ </div><!-- end class="controll" -->
	16	+ </li>
	17	+ <% end %>
	18	+</ul>
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<div class='set-category-modal'>
	2	+ <h2><%= _("Choose a new category") %></h2>
	3	+ <%= form_for :follower_category, :url => url_for(:controller => 'followers', :action => 'set_category') do \|f\| %>
	4	+ <div id="category-name">
	5	+ <%= labelled_text_field _("Category: "), "category_name" %>
	6	+ </div>
	7	+ <%= hidden_field_tag 'followed_profile_id', followed_profile_id %>
	8	+ <div id="actions-container">
	9	+ <%= submit_button('save', _('Save')) %>
	10	+ <%= modal_close_button _("Cancel") %>
	11	+ </div>
	12	+ <% end %>
	13	+</div>
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+<div id="manage_followed people">
	2	+
	3	+<h1><%= _("%s following") % profile.name %></h1>
	4	+
	5	+<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
	6	+ <% if @followed_people.empty? %>
	7	+ <p>
	8	+ <em>
	9	+ <%= _("You don't follow anybody yet.") %>
	10	+ </em>
	11	+ </p>
	12	+ <% end %>
	13	+
	14	+ <%= button_bar do %>
	15	+ <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
	16	+ <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
	17	+ <% end %>
	18	+
	19	+ <%= render :partial => 'profile_list', :locals => { :profiles => @followed_people } %>
	20	+
	21	+ <br style="clear:both" />
	22	+ <%= pagination_links @followed_people, :param_name => 'npage' %>
	23	+<% end %>
	24	+
	25	+</div>
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+<div class="common-profile-list-block">
	2	+
	3	+<h1><%= _("%s is following") % profile.name %></h1>
	4	+
	5	+<% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
	6	+<ul class='profile-list'>
	7	+ <% @followed_people.each do \|followed_person\| %>
	8	+ <%= profile_image_link(followed_person) %>
	9	+ <% end%>
	10	+</ul>
	11	+
	12	+ <div id='pagination-profiles'>
	13	+ <%= pagination_links @followed_people, :param_name => 'npage' %>
	14	+ </div>
	15	+<% end %>
	16	+
	17	+<%= button_bar do %>
	18	+ <%= button :back, _('Go back'), { :controller => 'profile' } %>
	19	+ <% if user == profile %>
	20	+ <%= button :edit, _('Manage followed people'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
	21	+ <% end %>
	22	+<% end %>
	23	+
	24	+</div>