Download as
Browse Code »

Commit 16fea390a197aadb02e4409a0d29b9ed83af9d41

Authored by Larissa Reis
1 parent 87f14728
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

profile-suggestions: fixes hidden link for connections page 

  The link for connection page wasn't visible because the tags weren't
  set to wraping. Also, changing the limit of profiles to 4 so all 4
  profiles plus the +X indicator can stay in the same line.

(ActionItem3234)
Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @16fea39
@@ -1420,12 +1420,12 @@ module ApplicationHelper @@ -1420,12 +1420,12 @@ module ApplicationHelper
1420 end 1420 end
1421 1421
1422 def profile_suggestion_profile_connections(suggestion) 1422 def profile_suggestion_profile_connections(suggestion)
1423 - profiles = suggestion.profile_connections.first(5).map do |profile| 1423 + profiles = suggestion.profile_connections.first(4).map do |profile|
1424 link_to(profile_image(profile, :icon), profile.url, :class => 'profile-suggestion-connection-icon', :title => profile.name) 1424 link_to(profile_image(profile, :icon), profile.url, :class => 'profile-suggestion-connection-icon', :title => profile.name)
1425 end 1425 end
1426 1426
1427 controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships 1427 controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
1428 - 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 1428 + 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
1429 1429
1430 content_tag(:div, profiles.join , :class => 'profile-connections') 1430 content_tag(:div, profiles.join , :class => 'profile-connections')
1431 end 1431 end
public/stylesheets/application.css
  Diff comments   View file @16fea39
@@ -4102,8 +4102,6 @@ h1#agenda-title { @@ -4102,8 +4102,6 @@ h1#agenda-title {
4102 margin-left: 2px; 4102 margin-left: 2px;
4103 margin-top: 3px; 4103 margin-top: 3px;
4104 overflow: hidden; 4104 overflow: hidden;
4105 - text-overflow: ellipsis;  
4106 - white-space: nowrap;  
4107 width: 120px; 4105 width: 120px;
4108 } 4106 }
4109 4107