Download as
Browse Code »

Commit 15e48e28a00fe6fd54d37c871afb12f6792597d3

Authored by Larissa Reis
1 parent 6abdae0a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

profile-suggestions: adds profile and tag connections below user 

(ActionItem3234)
Showing 3 changed files with 22 additions and 4 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @15e48e2
@@ -1420,12 +1420,19 @@ module ApplicationHelper @@ -1420,12 +1420,19 @@ module ApplicationHelper
1420 end 1420 end
1421 1421
1422 def profile_suggestion_profile_connections(suggestion) 1422 def profile_suggestion_profile_connections(suggestion)
1423 - suggestion.profile_connections.map do |cat| 1423 + profiles = suggestion.profile_connections.first(4).map do |profile|
  1424 + link_to(profile_image(profile, :icon), profile.url, :class => 'profile-suggestion-connection-icon')
1424 end.join 1425 end.join
  1426 + extra = suggestion.profile_connections.count > 4 ? "<big> +#{suggestion.profile_connections.count - 4}</big>" : ''
  1427 + content_tag(:p, profiles + extra)
1425 end 1428 end
1426 1429
1427 def profile_suggestion_tag_connections(suggestion) 1430 def profile_suggestion_tag_connections(suggestion)
1428 - suggestion.tag_connections.map do |cat|  
1429 - end.join 1431 + tags = suggestion.tag_connections.map do |tag|
  1432 + tag.name + ', '
  1433 + end
  1434 + last_tag = tags.pop
  1435 + tags << last_tag.strip.chop if last_tag.present?
  1436 + content_tag(:p, tags.join)
1430 end 1437 end
1431 end 1438 end
app/views/shared/_profile_suggestions_list.html.erb
  Diff comments   View file @15e48e2
@@ -18,7 +18,8 @@ @@ -18,7 +18,8 @@
18 s.suggestion.add_url, :class => 'accept-suggestion' %> 18 s.suggestion.add_url, :class => 'accept-suggestion' %>
19 <% end %> 19 <% end %>
20 <div class='extra_info'> 20 <div class='extra_info'>
21 - <%= profile_suggestion_categories(s) %> 21 + <%= profile_suggestion_profile_connections(s) %>
  22 + <%= profile_suggestion_tag_connections(s) %>
22 </div> 23 </div>
23 <div class="controll"> 24 <div class="controll">
24 <% if collection == :friends_suggestions %> 25 <% if collection == :friends_suggestions %>
public/stylesheets/application.css
  Diff comments   View file @15e48e2
@@ -4085,6 +4085,16 @@ h1#agenda-title { @@ -4085,6 +4085,16 @@ h1#agenda-title {
4085 margin: 0px; 4085 margin: 0px;
4086 } 4086 }
4087 4087
  4088 +#content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon {
  4089 + position: relative;
  4090 +}
  4091 +
  4092 +.profiles-suggestions .profile-list .extra_info big {
  4093 + font-size: 14px;
  4094 + font-weight: bold;
  4095 + vertical-align: text-bottom;
  4096 +}
  4097 +
4088 .profiles-suggestions .profile-list .extra_info span { 4098 .profiles-suggestions .profile-list .extra_info span {
4089 background-position: 4px 50%; 4099 background-position: 4px 50%;
4090 background-repeat: no-repeat; 4100 background-repeat: no-repeat;