Commit 8db91f9a13d6ab8c0005e4116dd5d0dbbb6a3376

Authored by Antonio Terceiro
1 parent 0fb00124

ActionItem1165: usability

app/views/friends/invite.rhtml
... ... @@ -28,7 +28,7 @@
28 28 }
29 29 </script>
30 30 <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
31   - <%= labelled_form_field(__("Login") + ":", text_field_tag(:login, @login)) %>
  31 + <%= labelled_form_field(__("Username") + ":", text_field_tag(:login, @login)) %>
32 32 <%= labelled_form_field(__("Password") + ":", password_field_tag(:password)) %>
33 33 </div>
34 34  
... ... @@ -48,13 +48,23 @@
48 48 <%= __('Indicate which friends you want to invite.') %>
49 49 </p>
50 50  
  51 + <% if @wizard && @import_from == 'manual' %>
  52 + <div>
  53 + <%= __('Import now your contacts from %s, %s or %s') % [link_to_import('GMail', :import_from => 'gmail'), link_to_import('Yahoo', :import_from => 'yahoo'), link_to_import('Hotmail', :import_from => 'hotmail')] %>
  54 + </div>
  55 + <div>
  56 + <%= _('or') %>
  57 + </div>
  58 + <% end %>
  59 +
51 60 <% form_tag do %>
52 61 <%= hidden_field_tag(:confirmation, 1) %>
53 62 <%= hidden_field_tag(:import_from, @import_from) %>
54 63 <%= hidden_field_tag(:wizard, @wizard) %>
55 64  
56 65 <div>
57   - <%= labelled_form_field(__('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5)) %>
  66 + <%= __('Enter one e-mail address per line:') %>
  67 + <%= text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5) %>
58 68 </div>
59 69 <% if @import_from != 'manual' %>
60 70 <div>
... ... @@ -89,9 +99,6 @@
89 99 <% end %>
90 100 <% end %>
91 101  
92   - <% if @wizard && @import_from == 'manual' %>
93   - <%= __('Import now your contacts from %s, %s or %s') % [link_to_import('GMail', :import_from => 'gmail'), link_to_import('Yahoo', :import_from => 'yahoo'), link_to_import('Hotmail', :import_from => 'hotmail')] %>
94   - <% end %>
95 102 <% end %>
96 103  
97 104 <% if @wizard %>
... ...
app/views/memberships/new_community.rhtml
... ... @@ -15,7 +15,7 @@
15 15 <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>
16 16  
17 17 <%= f.text_field('tag_list', :size => 64) %>
18   - <%= content_tag( 'small', _('Separate tags with commas') ) %>
  18 + <%= content_tag( 'small', _('Separate tags with commas.') + '<br/>' + __("Tags are important to new users, they'll be able to find your new community more easily.") ) %>
19 19  
20 20 <% f.fields_for :image_builder, @community.image do |i| %>
21 21 <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
... ...
app/views/search/_display_results.rhtml
... ... @@ -2,8 +2,8 @@
2 2  
3 3 <% if @wizard %>
4 4 <div id='visualization-mode'>
5   - <%= button_without_text('product', '', params.merge(:visualization_mode => 'icons'), :title => _('View as icons')) %>
6   - <%= button_without_text('todo', '', params.merge(:visualization_mode => 'list'), :title => _('View as list')) %>
  5 + <%= button_without_text('product', _('View as icons'), params.merge(:visualization_mode => 'icons')) %>
  6 + <%= button_without_text('todo', _('View as list'), params.merge(:visualization_mode => 'list')) %>
7 7 </div>
8 8 <% end %>
9 9  
... ...
app/views/search/communities.rhtml
  1 +<% if @wizard %>
  2 + <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
  3 +<% else %>
1 4 <%= search_page_title( __('Communities'), { :query => @query,
2 5 :category => @category ? @category.name : nil,
3 6 :total_results => @total_results,
4 7 :region => @region ? @region.name : nil,
5 8 :distance => @radius } ) %>
  9 +<% end %>
6 10  
7 11 <%= search_page_link_to_all( { :asset => params[:asset],
8 12 :category => @category }) %>
... ... @@ -22,7 +26,7 @@
22 26 <% if logged_in? %>
23 27 <% button_bar do %>
24 28 <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
25   - <%= button(:add, _('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :wizard => @wizard)) %>
  29 + <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :wizard => @wizard)) %>
26 30 <% end %>
27 31 <% end %>
28 32  
... ...
lib/zen3_terminology.rb
... ... @@ -79,6 +79,9 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
79 79 'Enable Enterprise' => N_('Enable Organization'),
80 80 'Enterprise Validation' => N_('Organization Validation'),
81 81 'Enterprise Info and settings' => N_('Organization Info and settings'),
  82 + 'Choose the communities you want to join and/or create your own.' => N_('Choose the groups you want to join and/or create your own.'),
  83 + 'New community' => N_('New group'),
  84 + "Tags are important to new users, they'll be able to find your new community more easily." => N_("Tags are important to new users, they'll be able to find your new group more easily."),
82 85 })
83 86 end
84 87  
... ...