invitation: review texts and icons

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