Download as
Browse Code »

Commit 5631ef13a252d2adc444bed32b64d4afdea0d94e

Authored by Antonio Terceiro
1 parent 75d2e28c
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

ActionItem910: usability enhancements on invite screens

Showing 2 changed files with 9 additions and 13 deletions   Show diff stats
app/views/friends/index.rhtml
  Diff comments   View file @5631ef1
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <% button_bar do %> 37 <% button_bar do %>
38 <%= button(:back, _('Go back'), :controller => 'profile_editor') %> 38 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
39 <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %> 39 <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
40 - <%= button(:search, _('Invite friends from my e-mail contacts'), :action => 'invite') %> 40 + <%= button(:search, _('Invite people from my e-mail contacts'), :action => 'invite') %>
41 <% end %> 41 <% end %>
42 42
43 </div><!-- end id="manage_friends" --> 43 </div><!-- end id="manage_friends" -->
app/views/friends/invite.rhtml
  Diff comments   View file @5631ef1
@@ -3,21 +3,17 @@ @@ -3,21 +3,17 @@
3 3
4 <% unless @friends %> 4 <% unless @friends %>
5 5
6 - <h2><%= __('Step 1 of 1: Accessing your contact list') %></h2>  
7 -  
8 - <p>  
9 - <%= __('Choose your webmail provider and enter your login and password so we can fetch your contact list. If you only want to invite specific people by listing their e-mail addresses, select the "Enter e-mail addresses manually" option.') %>  
10 - </p> 6 + <h2><%= __('Step 1 of 1: Select address book') %></h2>
11 7
12 <% form_tag do %> 8 <% form_tag do %>
13 <%= hidden_field_tag(:import, 1) %> 9 <%= hidden_field_tag(:import, 1) %>
14 10
15 - <%= labelled_form_field(_('Select your e-mail provider:'), [ 11 + <%= [
  12 + radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', __('Manually (empty field)'), :for => "import_from_manual"),
16 radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Gmail', :for => 'import_from_gmail'), 13 radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
17 radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"), 14 radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
18 - radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Hotmail', :for => "import_from_hotmail"),  
19 - radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', __('Enter e-mail addresses manually'), :for => "import_from_manual")  
20 - ].join("\n<br/>\n")) %> 15 + radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
  16 + ].join("\n<br/>\n") %>
21 17
22 <script type="text/javascript"> 18 <script type="text/javascript">
23 function hide_invite_friend_login_password() { 19 function hide_invite_friend_login_password() {
@@ -52,8 +48,7 @@ @@ -52,8 +48,7 @@
52 <%= hidden_field_tag(:import_from, @import_from) %> 48 <%= hidden_field_tag(:import_from, @import_from) %>
53 49
54 <div> 50 <div>
55 - <%= __("Enter one e-mail address per line, following the example below.")%>  
56 - <%= labelled_form_field(__('E-mail addresses'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || __("Firstname Lastname <friend@email.com>")), :cols => 72, :rows => 5)) %> 51 + <%= labelled_form_field(__('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5)) %>
57 </div> 52 </div>
58 <% if @import_from != 'manual' %> 53 <% if @import_from != 'manual' %>
59 <div> 54 <div>
@@ -70,9 +65,10 @@ @@ -70,9 +65,10 @@
70 </div> 65 </div>
71 <% end -%> 66 <% end -%>
72 67
  68 + <br/>
73 <div> 69 <div>
74 <%= h __("Now enter an invitation message. You must keep the <url> code in your invitation message. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %> 70 <%= h __("Now enter an invitation message. You must keep the <url> code in your invitation message. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
75 - <%= labelled_form_field(__('Invitation message'), text_area_tag(:message, @message, :cols => 72, :rows => 8)) %> 71 + <%= labelled_form_field(__('Invitation message:'), text_area_tag(:message, @message, :cols => 72, :rows => 8)) %>
76 </div> 72 </div>
77 73
78 <% button_bar do %> 74 <% button_bar do %>