Download as
Browse Code »

Commit ede53a926c1dbb941e7b397c70916802c04f39df

Authored by Rodrigo Souto
1 parent 23f8a40a
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

invitation: review texts and icons

Showing 8 changed files with 23 additions and 23 deletions   Show diff stats
app/views/friends/index.html.erb
  Diff comments   View file @ede53a9
... ... @@ -16,7 +16,7 @@
16 16 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
17 17 <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
18 18 <% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
19   - <%= button(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
  19 + <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
20 20 <% end %>
21 21 <% end %>
22 22  
... ...
app/views/invite/invite_friends.html.erb
  Diff comments   View file @ede53a9
... ... @@ -2,7 +2,7 @@
2 2 <h1><%= _('Ask for friendship') %></h1>
3 3 <% description = _('You can search for user profiles and ask them to become your friends.') %>
4 4 <% else %>
5   - <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
  5 + <h1><%= _('Invite people to join') %></h1>
6 6 <% description = _('You can search for user profiles and invite them to join this group.') %>
7 7 <% end %>
8 8  
... ...
app/views/invite/select_friends.html.erb
  Diff comments   View file @ede53a9
1 1 <%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
2 2  
3 3 <% if profile.person? %>
4   - <h1><%= _('Invite your friends') %></h1>
  4 + <h1><%= _('Invite people') %></h1>
5 5 <% else %>
6   - <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
  6 + <h1><%= _('Invite people to join') %></h1>
7 7 <% end %>
8 8  
9 9  
10   -<h2><%= _('Step 2 of 2: Selecting Friends') %></h2>
  10 +<h2><%= _('Step 2 of 2: Selecting People') %></h2>
11 11  
12 12 <%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
13 13  
14 14 <p>
15   -<%= _('Indicate which friends you want to invite.') %>
  15 +<%= _('Indicate which people you want to invite.') %>
16 16 </p>
17 17  
18 18 <%= form_tag do %>
... ... @@ -33,6 +33,6 @@
33 33 <%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
34 34  
35 35 <% button_bar do %>
36   - <%= submit_button(:ok, _("Invite my friends!")) %>
  36 + <%= submit_button(:ok, _("Invite!")) %>
37 37 <% end %>
38 38 <% end %>
... ...
app/views/profile/friends.html.erb
  Diff comments   View file @ede53a9
... ... @@ -18,7 +18,7 @@
18 18 <%= button :back, _('Go back'), { :controller => 'profile' } %>
19 19 <% if user == profile %>
20 20 <%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
21   - <%= button(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
  21 + <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
22 22 <% end %>
23 23 <% end %>
24 24  
... ...
app/views/profile/members.html.erb
  Diff comments   View file @ede53a9
... ... @@ -18,7 +18,7 @@
18 18 <%= button :back, _('Go back'), { :controller => 'profile' } %>
19 19 <% if profile.community? and user %>
20 20 <% if user.has_permission?(:invite_members, profile) %>
21   - <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'invite_friends' %>
  21 + <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
22 22 <% end %>
23 23 <% if user.has_permission?(:send_mail_to_members, profile) %>
24 24 <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
... ...
app/views/profile_members/_index_buttons.html.erb
  Diff comments   View file @ede53a9
... ... @@ -2,7 +2,7 @@
2 2 <%= button :back, _('Back'), :controller => 'profile_editor' %>
3 3 <%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
4 4 <% if profile.community? and user.has_permission?(:invite_members, profile) %>
5   - <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'invite_friends' %>
  5 + <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
6 6 <% end %>
7 7 <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
8 8 <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
... ...
features/invitation.feature
  Diff comments   View file @ede53a9
... ... @@ -37,30 +37,30 @@ Feature: invitation
37 37 And I fill in "manual_import_addresses" with "misfits@devil.doll"
38 38 And I follow "Personalize invitation mail"
39 39 And I fill in "mail_template" with "Follow this link <url>"
40   - When I press "Invite my friends!"
  40 + When I press "Invite!"
41 41 Then I should be on /profile/josesilva/friends
42 42  
43 43 Scenario: see link to invite members to community
44 44 When I am on /profile/26-bsslines/members
45   - Then I should see "Invite your friends to join 26 Bsslines" link
  45 + Then I should see "Invite people to join" link
46 46  
47 47 Scenario: not see link to invite members to community if has no rights
48 48 Given I am logged in as "josesantos"
49 49 When I am on /profile/26-bsslines/members
50   - Then I should not see "Invite your friends to join 26 Bsslines" link
  50 + Then I should not see "Invite people to join" link
51 51  
52 52 Scenario: go to invitation screen when follow link to invite members
53 53 Given I am on /profile/26-bsslines/members
54   - When I follow "Invite your friends to join 26 Bsslines"
  54 + When I follow "Invite people to join"
55 55 Then I am on /profile/26-bsslines/invite/friends
56 56  
57 57 Scenario: see title when invite members
58 58 When I am on /profile/26-bsslines/invite/friends
59   - Then I should see "Invite your friends to join 26 Bsslines"
  59 + Then I should see "Invite people to join"
60 60  
61 61 Scenario: not see link to invite members to enterprise
62 62 When I am on /profile/beatles-for-sale/members
63   - Then I should not see "Invite your friends to join Beatles For Sale" link
  63 + Then I should not see "Invite people to join" link
64 64  
65 65 Scenario: deny access if user has no right to invite members
66 66 Given I am logged in as "josesantos"
... ... @@ -69,7 +69,7 @@ Feature: invitation
69 69  
70 70 Scenario: not see link to invite members to enterprise in manage members
71 71 Given I am on Beatles For Sale's members management
72   - Then I should not see "Invite your friends to join Beatles For Sale" link
  72 + Then I should not see "Invite people to join" link
73 73  
74 74 @selenium
75 75 Scenario: back to members after invite friends to join a community
... ... @@ -80,7 +80,7 @@ Feature: invitation
80 80 And I fill in "manual_import_addresses" with "misfits@devil.doll"
81 81 And I follow "Personalize invitation mail"
82 82 And I fill in "mail_template" with "Follow this link <url>"
83   - When I press "Invite my friends!"
  83 + When I press "Invite!"
84 84 Then I should be on /profile/26-bsslines/members
85 85  
86 86 @selenium
... ... @@ -92,7 +92,7 @@ Feature: invitation
92 92 And I fill in "manual_import_addresses" with "santos@invalid.br"
93 93 And I follow "Personalize invitation mail"
94 94 And I fill in "mail_template" with "Follow this link <url>"
95   - And I press "Invite my friends!"
  95 + And I press "Invite!"
96 96 Given there are no pending jobs
97 97 When I am logged in as "josesantos"
98 98 And I go to josesantos's control panel
... ... @@ -138,7 +138,7 @@ Feature: invitation
138 138 And I fill in "manual_import_addresses" with "santos@invalid.br"
139 139 And I follow "Personalize invitation mail"
140 140 And I fill in "mail_template" with "Follow this link <url>"
141   - And I press "Invite my friends!"
  141 + And I press "Invite!"
142 142 Given there are no pending jobs
143 143 When I am logged in as "josesantos"
144 144 And I go to josesantos's control panel
... ...
features/step_definitions/invitation_steps.rb
  Diff comments   View file @ede53a9
1 1 Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
2 2 identifier = Community.find_by_name(community).identifier
3 3 visit("/myprofile/#{identifier}/profile_members")
4   - first(:link, "Invite your friends to join #{community}").click
  4 + first(:link, "Invite people to join").click
5 5 choose("Email")
6 6 click_button('Next')
7 7 fill_in('manual_import_addresses', :with => "#{email}")
8 8 click_link('Personalize invitation mail')
9 9 fill_in('mail_template', :with => 'Follow this link <url>')
10   - click_button("Invite my friends!")
  10 + click_button("Invite!")
11 11 end
12 12  
13 13 Given /^I invite email "(.+)" to be my friend$/ do |email|
... ... @@ -18,5 +18,5 @@ Given /^I invite email &quot;(.+)&quot; to be my friend$/ do |email|
18 18 fill_in('manual_import_addresses', :with => "#{email}")
19 19 click_link('Personalize invitation mail')
20 20 fill_in('mail_template', :with => 'Follow this link <url>')
21   - click_button("Invite my friends!")
  21 + click_button("Invite!")
22 22 end
... ...