ActionItem1165: usability

Antonio Terceiro
1 parent 0fb00124
Showing 5 changed files with 23 additions and 9 deletions Show diff stats
app/views/friends/invite.rhtml
app/views/memberships/new_community.rhtml
app/views/search/_display_results.rhtml
app/views/search/communities.rhtml
lib/zen3_terminology.rb
@@ -28,7 +28,7 @@
       }
     </script>
     <div id='invite-friends-login-password' <%= "style='display: none;'" if (@import_from == 'manual') %>>
-    <%= labelled_form_field(__("Login") + ":", text_field_tag(:login, @login)) %>
+    <%= labelled_form_field(__("Username") + ":", text_field_tag(:login, @login)) %>
     <%= labelled_form_field(__("Password") + ":", password_field_tag(:password)) %>
     </div>
@@ -48,13 +48,23 @@
   <%= __('Indicate which friends you want to invite.') %>
   </p>
+  <% if @wizard && @import_from == 'manual' %>
+    <div>
+    <%= __('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')] %>
+    </div>
+    <div>
+      <%= _('or') %>
+    </div>
+  <% end %>
+
   <% form_tag do %>
     <%= hidden_field_tag(:confirmation, 1) %>
     <%= hidden_field_tag(:import_from, @import_from) %>
     <%= hidden_field_tag(:wizard, @wizard) %>
     <div>
-      <%= labelled_form_field(__('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5)) %>
+    <%= __('Enter one e-mail address per line:') %>
+    <%= text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5) %>
     </div>
     <% if @import_from != 'manual' %>
       <div>
@@ -89,9 +99,6 @@
     <% end %>
   <% end %>
-  <% if @wizard && @import_from == 'manual' %>
-    <%= __('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')] %>
-  <% end %>
 <% end %>
 <% if @wizard %>
@@ -15,7 +15,7 @@
   <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>
   <%= f.text_field('tag_list', :size => 64) %>
-  <%= content_tag( 'small', _('Separate tags with commas') ) %>
+  <%= 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.") ) %>
   <% f.fields_for :image_builder, @community.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
@@ -2,8 +2,8 @@
 <% if @wizard %>
   <div id='visualization-mode'>
-    <%= button_without_text('product', '', params.merge(:visualization_mode => 'icons'), :title => _('View as icons')) %>
-    <%= button_without_text('todo', '', params.merge(:visualization_mode => 'list'), :title => _('View as list')) %>
+    <%= button_without_text('product', _('View as icons'), params.merge(:visualization_mode => 'icons')) %>
+    <%= button_without_text('todo',  _('View as list'), params.merge(:visualization_mode => 'list')) %>
   </div>
 <% end %>
+<% if @wizard %>
+  <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
+<% else %>
 <%= search_page_title( __('Communities'), { :query => @query, 
                                       :category => @category ? @category.name : nil, 
                                       :total_results => @total_results, 
                                       :region => @region ? @region.name : nil, 
                                       :distance => @radius } ) %>
+<% end %>
 <%= search_page_link_to_all( { :asset => params[:asset],
                                :category => @category }) %>
@@ -22,7 +26,7 @@
 <% if logged_in? %>
   <% button_bar do %>
     <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-    <%= button(:add, _('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :wizard => @wizard)) %>
+    <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :wizard => @wizard)) %>
   <% end %>
 <% end %>
@@ -79,6 +79,9 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
       'Enable Enterprise' => N_('Enable Organization'),
       'Enterprise Validation' => N_('Organization Validation'),
       'Enterprise Info and settings' => N_('Organization Info and settings'),
+      '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.'),
+      'New community' => N_('New group'),
+      "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."),
     })
   end
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	<%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>	15	<%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>
16		16
17	<%= f.text_field('tag_list', :size => 64) %>	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	<% f.fields_for :image_builder, @community.image do \|i\| %>	20	<% f.fields_for :image_builder, @community.image do \|i\| %>
21	<%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>	21	<%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>