From de452eab71dd38e715efd6304c51f4bb7cdeb499 Mon Sep 17 00:00:00 2001
From: Daniela Feitosa <danielafeitosa@colivre.coop.br>
Date: Mon, 4 Aug 2014 19:47:08 -0300
Subject: [PATCH] [suggestions] Added suggestion list on friends block

---
 app/views/shared/_profile_suggestions_list.html.erb |  4 ++--
 plugins/people_block/lib/friends_block.rb           |  7 ++++++-
 plugins/people_block/public/style.css               | 26 ++++++++++++++++++++++++++
 plugins/people_block/views/blocks/friends.html.erb  | 10 ++++++++++
 public/designs/themes/base/style.css                |  6 +++++-
 public/stylesheets/application.css                  | 20 ++++++++++++++------
 6 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/app/views/shared/_profile_suggestions_list.html.erb b/app/views/shared/_profile_suggestions_list.html.erb
index c22f671..d34d4db 100644
--- a/app/views/shared/_profile_suggestions_list.html.erb
+++ b/app/views/shared/_profile_suggestions_list.html.erb
@@ -11,7 +11,7 @@
         <%= 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'>
@@ -24,7 +24,7 @@
                   :class => 'add-friend accept-suggestion',
                   :title => _('Add friend') %>
             <%= button_without_text :remove, content_tag('span',_('remove')),
-                { :action => 'remove_suggestion', :id => s.suggestion.identifier },
+                { :controller => 'friends', :action => 'remove_suggestion', :id => s.suggestion.identifier },
                   :class => 'remove-suggestion',
                   :title => _('Remove suggestion'),
                   :confirm => _('Are you sure you want to remove this suggestion?') %>
diff --git a/plugins/people_block/lib/friends_block.rb b/plugins/people_block/lib/friends_block.rb
index 72e23fd..f094e6c 100644
--- a/plugins/people_block/lib/friends_block.rb
+++ b/plugins/people_block/lib/friends_block.rb
@@ -16,10 +16,15 @@ class FriendsBlock < PeopleBlockBase
     owner.friends
   end
 
+  def suggestions
+    owner.profile_suggestions.of_person.enabled.limit(limit).includes(:suggestion)
+  end
+
   def footer
     profile = self.owner
+    suggestions = self.suggestions
     proc do
-      render :file => 'blocks/friends', :locals => { :profile => profile }
+      render :file => 'blocks/friends', :locals => { :profile => profile, :suggestions => suggestions }
     end
   end
 
diff --git a/plugins/people_block/public/style.css b/plugins/people_block/public/style.css
index 1c00554..2348188 100644
--- a/plugins/people_block/public/style.css
+++ b/plugins/people_block/public/style.css
@@ -102,3 +102,29 @@
 #content .members-block .block-footer-content a.view-all {
   background: url(/designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
 }
+
+#content .friends-block .block-footer-content .profiles-suggestions a,
+#content .friends-block .block-footer-content a.more-suggestions {
+  position: relative;
+}
+#content .friends-block .block-footer-content .profiles-suggestions a.explain-suggestion {
+  position: absolute;
+}
+
+#content .common-profile-list-block .profiles-suggestions .profile-list .extra_info {
+  top: 20px;
+  left: -69px;
+}
+
+#content .common-profile-list-block .profiles-suggestions .button span {
+  display: none;
+}
+#content .common-profile-list-block .profiles-suggestions .controll {
+  top: 0px;
+  right: 0px;
+}
+#content .common-profile-list-block .profiles-suggestions .controll a,
+#content .friends-block .block-footer-content .profiles-suggestions a.explain-suggestion {
+  width: 16px;
+  padding: 1px;
+}
diff --git a/plugins/people_block/views/blocks/friends.html.erb b/plugins/people_block/views/blocks/friends.html.erb
index 04410ae..1cc41ac 100644
--- a/plugins/people_block/views/blocks/friends.html.erb
+++ b/plugins/people_block/views/blocks/friends.html.erb
@@ -1 +1,11 @@
 <%= link_to s_('friends|View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'friends'}, :class => 'view-all' %>
+
+<% if user == profile && !suggestions.empty? %>
+  <div class='common-profile-list-block'>
+    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+    <div class='profiles-suggestions'>
+      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :friends_suggestions } %>
+    </div>
+    <%= link_to _('See more suggestions'), profile.people_suggestions_url, :class => 'more-suggestions' %>
+  </div>
+<% end %>
diff --git a/public/designs/themes/base/style.css b/public/designs/themes/base/style.css
index 38019d3..deff3f3 100644
--- a/public/designs/themes/base/style.css
+++ b/public/designs/themes/base/style.css
@@ -405,13 +405,17 @@ div#notice {
 }
 
 
-#content .block-title {
+#content .block-title,
+#content .block-subtitle {
   font-variant: small-caps;
   color: #AAA;
   font-size: 14px;
   text-align: left;
   border-bottom: 2px solid #AAA;
 }
+#content .block-subtitle {
+  font-size: 13px;
+}
 
 /*************************** Login block *****************************/
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6c9aae2..379c59f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3969,14 +3969,10 @@ h1#agenda-title {
   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 {
+.box-1 .profiles-suggestions .profile-list li:hover {
   border: 2px solid #eeeeec;
 }
 .controller-favorite_enterprises .profile-list img,
@@ -3999,7 +3995,7 @@ h1#agenda-title {
 }
 .controller-favorite_enterprises .profile-list .profile_link span,
 .controller-friends .profile-list .profile_link span,
-.profiles-suggestions .profile-list .profile_link span {
+.box-1 .profiles-suggestions .profile-list .profile_link span {
   width: 80px;
   display: block;
   overflow: hidden;
@@ -4066,6 +4062,18 @@ h1#agenda-title {
   display: block;
   line-height: 20px;
   padding: 0 0 0 25px;
+  width: auto;
+}
+
+.profiles-suggestions .profile-list li {
+  width: 58px;
+  max-width: 58px;
+}
+
+.box-1 .profiles-suggestions .profile-list li {
+  width: 76px;
+  max-width: 76px;
+  border: 2px solid transparent;
 }
 
 /* ==> public/stylesheets/controller_friends.css <== */
--
libgit2 0.21.2