Download as
Browse Code »

Commit f6fb45cf8c2549b6d1894c3d5992b44c7bacfcb2

Authored by Larissa Reis
2 parents 6fab2d0f 397d8a89
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

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

Conflicts:
	app/helpers/application_helper.rb
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @f6fb45c
@@ -1436,10 +1436,11 @@ module ApplicationHelper @@ -1436,10 +1436,11 @@ module ApplicationHelper
1436 end 1436 end
1437 last_tag = tags.pop 1437 last_tag = tags.pop
1438 tags << last_tag.strip.chop if last_tag.present? 1438 tags << last_tag.strip.chop if last_tag.present?
  1439 + title = tags.join
1439 1440
1440 controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships 1441 controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
1441 tags << link_to('...', :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.tag_connections.count > 4 1442 tags << link_to('...', :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.tag_connections.count > 4
1442 1443
1443 - content_tag(:div, tags.join, :class => 'tag-connections') 1444 + content_tag(:div, tags.join, :class => 'tag-connections', :title => title)
1444 end 1445 end
1445 end 1446 end
public/stylesheets/application.css
  Diff comments   View file @f6fb45c
@@ -4100,6 +4100,10 @@ h1#agenda-title { @@ -4100,6 +4100,10 @@ h1#agenda-title {
4100 .tag-connections { 4100 .tag-connections {
4101 margin-left: 2px; 4101 margin-left: 2px;
4102 margin-top: 3px; 4102 margin-top: 3px;
  4103 + overflow: hidden;
  4104 + text-overflow: ellipsis;
  4105 + white-space: nowrap;
  4106 + width: 120px;
4103 } 4107 }
4104 4108
4105 #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon { 4109 #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon {