Download as
Browse Code »

Commit 5631ef13a252d2adc444bed32b64d4afdea0d94e

Authored by Antonio Terceiro
1 parent 75d2e28c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 37 <% button_bar do %>
38 38 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
39 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 41 <% end %>
42 42  
43 43 </div><!-- end id="manage_friends" -->
... ...
app/views/friends/invite.rhtml
  Diff comments   View file @5631ef1
... ... @@ -3,21 +3,17 @@
3 3  
4 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 8 <% form_tag do %>
13 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 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 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 18 <script type="text/javascript">
23 19 function hide_invite_friend_login_password() {
... ... @@ -52,8 +48,7 @@
52 48 <%= hidden_field_tag(:import_from, @import_from) %>
53 49  
54 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 52 </div>
58 53 <% if @import_from != 'manual' %>
59 54 <div>
... ... @@ -70,9 +65,10 @@
70 65 </div>
71 66 <% end -%>
72 67  
  68 + <br/>
73 69 <div>
74 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 72 </div>
77 73  
78 74 <% button_bar do %>
... ...