Merge remote-tracking branch 'colivre/stoa' into feedback

Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css public/stylesheets/application.css

Merge remote-tracking branch 'colivre/stoa' into feedback
Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css public/stylesheets/application.css
Larissa Reis
2 parents 4094e425 12f1d2a5
Showing 7 changed files with 68 additions and 60 deletions Show diff stats
app/helpers/application_helper.rb
app/models/profile_suggestion.rb
app/views/blocks/communities.html.erb
plugins/people_block/public/style.css
plugins/people_block/views/blocks/friends.html.erb
public/designs/themes/base/style.css
public/stylesheets/application.css
@@ -1420,14 +1420,14 @@ module ApplicationHelper
   end
   def profile_suggestion_profile_connections(suggestion)
-    profiles = suggestion.profile_connections.first(4).map do |profile|
-      link_to(profile_image(profile, :icon), profile.url, :class => 'profile-suggestion-connection-icon')
+    profiles = suggestion.profile_connections.first(5).map do |profile|
+      link_to(profile_image(profile, :icon), profile.url, :class => 'profile-suggestion-connection-icon', :title => profile.name)
     end
     controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
-    profiles << link_to("<big> +#{suggestion.profile_connections.count - 4}</big>", :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 4
+    profiles << link_to("<big> +#{suggestion.profile_connections.count - 5}</big>", :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 5
-    content_tag(:p, profiles.join)
+    content_tag(:div, profiles.join , :class => 'profile-connections')
   end
   def profile_suggestion_tag_connections(suggestion)
@@ -1440,6 +1440,6 @@ module ApplicationHelper
     controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
     tags << link_to('...', :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.tag_connections.count > 4
-    content_tag(:p, tags.join)
+    content_tag(:div, tags.join, :class => 'tag-connections')
   end
 end
@@ -135,6 +135,7 @@ class ProfileSuggestion &lt; ActiveRecord::Base
         end
         suggestion.send("#{rule}=", value)
         connections.each do |connection_id|
+          next if SuggestionConnection.where(:suggestion_id => suggestion.id, :connection_id => connection_id, :connection_type => options[:connection]).present?
            SuggestionConnection.create!(:suggestion => suggestion, :connection_id => connection_id, :connection_type => options[:connection])
         end
         suggestion.score += value * options[:weight]
@@ -12,6 +12,8 @@
     <div class='profiles-suggestions'>
       <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions } %>
     </div>
-    <%= link_to _('See more suggestions'), profile.communities_suggestions_url, :class => 'more-suggestions' %>
+    <div class='more-suggestions'>
+      <%= link_to _('See more suggestions'), profile.communities_suggestions_url %>
+    </div>
   </div>
 <% end %>
@@ -73,17 +73,6 @@
   width: auto;
   display: block;
 }
-#content .people-block .block-footer-content a,
-#content .friends-block .block-footer-content a,
-#content .members-block .block-footer-content a {
-  position: absolute;
-  top: 2px;
-  right: 0px;
-  font-size: 11px;
-  color: #000;
-  text-decoration: none;
-  padding-right: 15px;
-}
 #content .members-block .block-footer-content .join-leave-button a {
   position: relative;
   background-color: #EEE;
@@ -6,6 +6,8 @@
     <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 class='more-suggestions'>
+      <%= link_to _('See more suggestions'), profile.people_suggestions_url %>
+    </div>
   </div>
 <% end %>
@@ -416,7 +416,7 @@ div#notice {
   font-variant: normal;
   color: #AAA;
   font-size: 11px;
-  text-align: left;
+  text-align: center;
   border-bottom: 1px solid #AAA;
   padding: 2px 0;
 }
@@ -504,10 +504,7 @@ div#notice {
   display: block;
 }
-#content .tags-block .block-footer-content a,
-#content .profile-list-block .block-footer-content a,
-#content .enterprises-block .block-footer-content a,
-#content .communities-block .block-footer-content a {
+.block-footer-content a.view-all {
   position: absolute;
   top: 2px;
   right: 0px;
@@ -515,11 +512,6 @@ div#notice {
   color: #000;
   text-decoration: none;
   padding-right: 15px;
-}
-#content .tags-block .block-footer-content a,
-#content .profile-list-block .block-footer-content a,
-#content .enterprises-block .block-footer-content a,
-#content .communities-block .block-footer-content a.view-all {
   background: url(imgs/arrow-right-p.png) 100% 50% no-repeat;
 }
@@ -1668,6 +1668,10 @@ a.button.disabled, input.disabled {
   padding-bottom: 0px;
 }
+#content .block-footer-content .profiles-suggestions a {
+  text-decoration: none;
+}
+
 #content .communities-block .block-footer-content .profiles-suggestions a.accept-suggestion,
 #content .communities-block .block-footer-content .profiles-suggestions a.remove-suggestion {
   position: relative;
@@ -1676,8 +1680,13 @@ a.button.disabled, input.disabled {
 #content .block-footer-content .profiles-suggestions a.accept-suggestion {
   padding-bottom: 3px;
-  display: block;
+  display: inline-block;
   color: #333;
+  font-size: 11px
+}
+
+#content .block-footer-content .profiles-suggestions a.accept-suggestion:hover {
+  text-decoration: underline;
 }
 #content .profiles-suggestions .profile-list a.remove-suggestion {
@@ -1690,6 +1699,7 @@ a.button.disabled, input.disabled {
   font-size: 14px;
   text-align: center;
   font-weight: bold;
+  margin: 1px 1px 0 0;
 }
 #content .profiles-suggestions .profile-list a.remove-suggestion:hover {
@@ -1705,12 +1715,13 @@ a.button.disabled, input.disabled {
   font-weight: bold;
 }
-#content .communities-block .profiles-suggestions .profile-list .extra_info {
-  z-index: 10;
+.more-suggestions {
+  text-align: center;
 }
-#content .communities-block .block-footer-content a.more-suggestions {
-  position: relative;
+.profiles-suggestions .profile-list .extra_info {
+  z-index: 10;
+  display: inline-block;
 }
 .suggestions-block .block-subtitle {
@@ -3995,49 +4006,31 @@ h1#agenda-title {
 /* ==> @import url(manage_contacts_list.css); <== */
-.controller-favorite_enterprises .profile-list,
-.controller-friends .profile-list,
-.profiles-suggestions .profile-list {
+.profile-list {
   margin: 0px;
   padding: 0px;
   list-style: none;
 }
-.controller-favorite_enterprises .profile-list li,
-.controller-friends .profile-list li {
+
+.profile-list li {
   float: left;
   margin: 5px;
-  height: 90px;
-  max-height: 80px;
   padding: 5px;
-  border: 2px solid transparent;
   list-style: none;
   position: relative;
 }
-.profiles-suggestions .profile-list li {
-  float: left;
-  margin: 5px;
-  height: 90px;
-  max-height: 80px;
-  padding: 5px;
-  border: 1px solid transparent;
-  list-style: none;
-  position: relative;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
+
+.profile-list li:hover {
+  background-color: #eeeeec;
 }
+
 .controller-favorite_enterprises .profile-list li,
 .controller-friends .profile-list li {
   width: 90px;
   max-width: 80px;
 }
-.controller-favorite_enterprises .profile-list li:hover,
-.controller-friends .profile-list li:hover {
-  border: 2px solid #eeeeec;
-}
-.controller-favorite_enterprises .profile-list img,
-.controller-friends .profile-list img,
-.profiles-suggestions .profile-list img {
+.profile-list img {
   border: none;
 }
 .controller-favorite_enterprises .profile-list a.profile-link,
@@ -4097,6 +4090,16 @@ h1#agenda-title {
 .profiles-suggestions .profile-list .extra_info a {
   text-decoration: none;
+  padding: 0;
+}
+
+.profile-connections {
+  height: 20px;
+}
+
+.tag-connections {
+  margin-left: 2px;
+  margin-top: 3px;
 }
 #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon {
@@ -4106,7 +4109,7 @@ h1#agenda-title {
 .profiles-suggestions .profile-list .extra_info big {
     font-size: 14px;
     font-weight: bold;
-    vertical-align: text-bottom;
+    line-height: 20px;
 }
 .profiles-suggestions .profile-list .extra_info span {
@@ -4162,6 +4165,25 @@ h1#agenda-title {
   position: relative;
 }
+#content .common-profile-list-block .profiles-suggestions .profile-list li {
+  width: 100%;
+  max-width: 100%;
+  padding: 3px 0;
+}
+
+.common-profile-list-block .profiles-suggestions .profile-list li img {
+  float: left;
+}
+
+#content .common-profile-list-block .profiles-suggestions .profile-list a.profile-link {
+  text-align: left;
+  position: relative;
+  height: 50px;
+  width: 50px;
+  float: left;
+  margin-right: 5px;
+}
+
 /* ==> public/stylesheets/controller_friends.css <== */
 .controller-friends #remove_friend .friend_picture,
	@@ -73,17 +73,6 @@		@@ -73,17 +73,6 @@
73	width: auto;	73	width: auto;
74	display: block;	74	display: block;
75	}	75	}
76	-#content .people-block .block-footer-content a,
77	-#content .friends-block .block-footer-content a,
78	-#content .members-block .block-footer-content a {
79	- position: absolute;
80	- top: 2px;
81	- right: 0px;
82	- font-size: 11px;
83	- color: #000;
84	- text-decoration: none;
85	- padding-right: 15px;
86	-}
87	#content .members-block .block-footer-content .join-leave-button a {	76	#content .members-block .block-footer-content .join-leave-button a {
88	position: relative;	77	position: relative;
89	background-color: #EEE;	78	background-color: #EEE;