Download as
Browse Code »

Commit e28cdc7d6b63ef1024f6251472d5c20725ab38b5

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 937b2caf
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

Revert "Changing friends online to friends in chat" 

This reverts commit bf661b69c99feebc5616149ae6a29052c12fef60.

(ActionItem1959)
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/layouts/chat.rhtml
  Diff comments   View file @e28cdc7
... ... @@ -26,7 +26,7 @@
26 26 </head>
27 27 <body id='chat'>
28 28 <div id='title-bar'>
29   - <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
  29 + <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
30 30 </div>
31 31 <div id='buddy-list'>
32 32 <div id='environment-logo'>
... ...
features/chat.feature
  Diff comments   View file @e28cdc7
... ... @@ -64,7 +64,7 @@ Feature: chat
64 64 And I am logged in as "tame"
65 65 When I follow "Open chat"
66 66 And I select window "noosfero_chat"
67   - Then I should see "Chat - Colivre.net - Friends in chat (0)"
  67 + Then I should see "Chat - Colivre.net - Friends online (0)"
68 68  
69 69 @selenium
70 70 Scenario: open chat with an online user in a new window
... ... @@ -75,7 +75,7 @@ Feature: chat
75 75 When I click "#chat-online-users-title"
76 76 And I follow "Maria Silva"
77 77 And I select window "noosfero_chat"
78   - Then I should see "Chat - Colivre.net - Friends in chat (0)"
  78 + Then I should see "Chat - Colivre.net - Friends online (0)"
79 79  
80 80 @selenium
81 81 Scenario: chat starts disconnected by default
... ... @@ -141,4 +141,4 @@ Feature: chat
141 141 When I go to Autoramas's profile
142 142 And I follow "Enter chat room"
143 143 And I select window "noosfero_chat"
144   - Then I should see "Chat - Colivre.net - Friends in chat (0)"
  144 + Then I should see "Chat - Colivre.net - Friends online (0)"
... ...