Download as
Browse Code »

Commit a691529a9f9a6022503c9fca6d74fc28971de3d6

Authored by Rodrigo Souto
1 parent 6e90cf7a
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: adjusting tags display on suggestions block

Showing 2 changed files with 20 additions and 14 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @a691529
... ... @@ -1427,7 +1427,11 @@ module ApplicationHelper
1427 1427 controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
1428 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 1435 end
1432 1436  
1433 1437 def profile_suggestion_tag_connections(suggestion)
... ... @@ -1439,8 +1443,12 @@ module ApplicationHelper
1439 1443 title = tags.join
1440 1444  
1441 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 1453 end
1446 1454 end
... ...
public/stylesheets/application.css
  Diff comments   View file @a691529
... ... @@ -1668,10 +1668,6 @@ a.button.disabled, input.disabled {
1668 1668 padding-bottom: 0px;
1669 1669 }
1670 1670  
1671   -#content .block-footer-content .profiles-suggestions a {
1672   - text-decoration: none;
1673   -}
1674   -
1675 1671 #content .communities-block .block-footer-content .profiles-suggestions a.accept-suggestion,
1676 1672 #content .communities-block .block-footer-content .profiles-suggestions a.remove-suggestion {
1677 1673 position: relative;
... ... @@ -2195,8 +2191,6 @@ a.button.disabled, input.disabled {
2195 2191 .common-profile-list-block .extra_info,
2196 2192 .profile-list .extra_info {
2197 2193 font-size: 9px;
2198   - opacity: 0.5;
2199   - filter: alpha(opacity=50);
2200 2194 }
2201 2195 /* ==> blocks/recent-documents-block.css <<= */
2202 2196  
... ... @@ -4102,7 +4096,12 @@ h1#agenda-title {
4102 4096 margin-left: 2px;
4103 4097 margin-top: 3px;
4104 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 4107 #content .profiles-suggestions .profile-list .extra_info .profile-suggestion-connection-icon {
... ... @@ -4131,12 +4130,11 @@ h1#agenda-title {
4131 4130 }
4132 4131  
4133 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 4135 overflow: hidden;
4139 4136 text-overflow: ellipsis;
  4137 + text-align: center;
4140 4138 }
4141 4139  
4142 4140 .box-1 .profiles-suggestions .profile-list .remove-suggestion,
... ...