Download as
Browse Code »

Commit 6ae99cef94360781c39a41b2c4ca48caa6339c77

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent a54bd711
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Balloon links appear in communities block too

Showing 2 changed files with 15 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @6ae99ce
@@ -538,7 +538,9 @@ module ApplicationHelper @@ -538,7 +538,9 @@ module ApplicationHelper
538 # #profile_image) and its name and number of members beside it. 538 # #profile_image) and its name and number of members beside it.
539 def community_image_link( profile, size=:portrait, tag='li' ) 539 def community_image_link( profile, size=:portrait, tag='li' )
540 name = h(profile.name) 540 name = h(profile.name)
  541 + links = links_for_balloon(profile)
541 content_tag tag, 542 content_tag tag,
  543 + (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => 'menu-submenu-trigger' ) : "") +
542 link_to( 544 link_to(
543 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) + 545 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
544 content_tag( 'span', name, :class => 'org' ) + 546 content_tag( 'span', name, :class => 'org' ) +
features/balloon.feature
  Diff comments   View file @6ae99ce
@@ -29,7 +29,7 @@ Feature: balloon @@ -29,7 +29,7 @@ Feature: balloon
29 Then I should not see "Friends" 29 Then I should not see "Friends"
30 30
31 @selenium 31 @selenium
32 - Scenario: I should see balloon when clicked on block trigger 32 + Scenario: I should see balloon when clicked on people block trigger
33 Given the following blocks 33 Given the following blocks
34 | owner | type | 34 | owner | type |
35 | environment | PeopleBlock | 35 | environment | PeopleBlock |
@@ -41,6 +41,18 @@ Feature: balloon @@ -41,6 +41,18 @@ Feature: balloon
41 And I should see "Home Page" 41 And I should see "Home Page"
42 42
43 @selenium 43 @selenium
  44 + Scenario: I should see balloon when clicked on community block trigger
  45 + Given the following blocks
  46 + | owner | type |
  47 + | environment | CommunitiesBlock |
  48 + And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
  49 + And I go to the homepage
  50 + When I click ".menu-submenu-trigger"
  51 + Then I should see "Profile"
  52 + And I should see "Members"
  53 + And I should see "Agenda"
  54 +
  55 + @selenium
44 Scenario: I should not see trigger if not enabled on page 56 Scenario: I should not see trigger if not enabled on page
45 Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment 57 Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
46 And I go to /assets/communities 58 And I go to /assets/communities