Commit a691529a9f9a6022503c9fca6d74fc28971de3d6
1 parent
6e90cf7a
Exists in
master
and in
29 other branches
profile-suggestions: adjusting tags display on suggestions block
Showing
2 changed files
with
20 additions
and
14 deletions
Show diff stats
app/helpers/application_helper.rb
@@ -1427,7 +1427,11 @@ module ApplicationHelper | @@ -1427,7 +1427,11 @@ module ApplicationHelper | ||
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 - 4}</big>", :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 4 | 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 | + if profiles.present? |
1431 | + content_tag(:div, profiles.join , :class => 'profile-connections') | ||
1432 | + else | ||
1433 | + '' | ||
1434 | + end | ||
1431 | end | 1435 | end |
1432 | 1436 | ||
1433 | def profile_suggestion_tag_connections(suggestion) | 1437 | def profile_suggestion_tag_connections(suggestion) |
@@ -1439,8 +1443,12 @@ module ApplicationHelper | @@ -1439,8 +1443,12 @@ module ApplicationHelper | ||
1439 | title = tags.join | 1443 | title = tags.join |
1440 | 1444 | ||
1441 | controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships | 1445 | controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships |
1442 | - tags << link_to('...', :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.tag_connections.count > 4 | 1446 | + tags << ' ' + link_to('...', {:controller => controller_target, :action => :connections, :id => suggestion.suggestion_id}, :class => 'more-tag-connections') if suggestion.tag_connections.count > 4 |
1443 | 1447 | ||
1444 | - content_tag(:div, tags.join, :class => 'tag-connections', :title => title) | 1448 | + if tags.present? |
1449 | + content_tag(:div, tags.join, :class => 'tag-connections', :title => title) | ||
1450 | + else | ||
1451 | + '' | ||
1452 | + end | ||
1445 | end | 1453 | end |
1446 | end | 1454 | end |
public/stylesheets/application.css
@@ -1668,10 +1668,6 @@ a.button.disabled, input.disabled { | @@ -1668,10 +1668,6 @@ a.button.disabled, input.disabled { | ||
1668 | padding-bottom: 0px; | 1668 | padding-bottom: 0px; |
1669 | } | 1669 | } |
1670 | 1670 | ||
1671 | -#content .block-footer-content .profiles-suggestions a { | ||
1672 | - text-decoration: none; | ||
1673 | -} | ||
1674 | - | ||
1675 | #content .communities-block .block-footer-content .profiles-suggestions a.accept-suggestion, | 1671 | #content .communities-block .block-footer-content .profiles-suggestions a.accept-suggestion, |
1676 | #content .communities-block .block-footer-content .profiles-suggestions a.remove-suggestion { | 1672 | #content .communities-block .block-footer-content .profiles-suggestions a.remove-suggestion { |
1677 | position: relative; | 1673 | position: relative; |
@@ -2195,8 +2191,6 @@ a.button.disabled, input.disabled { | @@ -2195,8 +2191,6 @@ a.button.disabled, input.disabled { | ||
2195 | .common-profile-list-block .extra_info, | 2191 | .common-profile-list-block .extra_info, |
2196 | .profile-list .extra_info { | 2192 | .profile-list .extra_info { |
2197 | font-size: 9px; | 2193 | font-size: 9px; |
2198 | - opacity: 0.5; | ||
2199 | - filter: alpha(opacity=50); | ||
2200 | } | 2194 | } |
2201 | /* ==> blocks/recent-documents-block.css <<= */ | 2195 | /* ==> blocks/recent-documents-block.css <<= */ |
2202 | 2196 | ||
@@ -4102,7 +4096,12 @@ h1#agenda-title { | @@ -4102,7 +4096,12 @@ h1#agenda-title { | ||
4102 | margin-left: 2px; | 4096 | margin-left: 2px; |
4103 | margin-top: 3px; | 4097 | margin-top: 3px; |
4104 | overflow: hidden; | 4098 | overflow: hidden; |
4105 | - width: 120px; | 4099 | + width: 100px; |
4100 | +} | ||
4101 | + | ||
4102 | +#content .block-footer-content .profiles-suggestions .tag-connections a.more-tag-connections { | ||
4103 | + text-decoration: underline; | ||
4104 | + font-size: 14px; | ||
4106 | } | 4105 | } |
4107 | 4106 | ||
4108 | #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon { | 4107 | #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon { |
@@ -4131,12 +4130,11 @@ h1#agenda-title { | @@ -4131,12 +4130,11 @@ h1#agenda-title { | ||
4131 | } | 4130 | } |
4132 | 4131 | ||
4133 | .box-1 .profiles-suggestions .profile-list li { | 4132 | .box-1 .profiles-suggestions .profile-list li { |
4134 | - width: 100px; | ||
4135 | - max-width: 100px; | ||
4136 | - height: 130px; | ||
4137 | - max-height: 100%; | 4133 | + width: 100%; |
4134 | + height: 95px; | ||
4138 | overflow: hidden; | 4135 | overflow: hidden; |
4139 | text-overflow: ellipsis; | 4136 | text-overflow: ellipsis; |
4137 | + text-align: center; | ||
4140 | } | 4138 | } |
4141 | 4139 | ||
4142 | .box-1 .profiles-suggestions .profile-list .remove-suggestion, | 4140 | .box-1 .profiles-suggestions .profile-list .remove-suggestion, |