From 8db91f9a13d6ab8c0005e4116dd5d0dbbb6a3376 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 3 Aug 2009 17:43:56 -0300 Subject: [PATCH] ActionItem1165: usability --- app/views/friends/invite.rhtml | 17 ++++++++++++----- app/views/memberships/new_community.rhtml | 2 +- app/views/search/_display_results.rhtml | 4 ++-- app/views/search/communities.rhtml | 6 +++++- lib/zen3_terminology.rb | 3 +++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/views/friends/invite.rhtml b/app/views/friends/invite.rhtml index 1f7e265..ab87d30 100644 --- a/app/views/friends/invite.rhtml +++ b/app/views/friends/invite.rhtml @@ -28,7 +28,7 @@ }
> - <%= 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)) %>
@@ -48,13 +48,23 @@ <%= __('Indicate which friends you want to invite.') %>

+ <% 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')] %> +
+
+ <%= _('or') %> +
+ <% end %> + <% form_tag do %> <%= hidden_field_tag(:confirmation, 1) %> <%= hidden_field_tag(:import_from, @import_from) %> <%= hidden_field_tag(:wizard, @wizard) %>
- <%= 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) %>
<% if @import_from != 'manual' %>
@@ -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 %> diff --git a/app/views/memberships/new_community.rhtml b/app/views/memberships/new_community.rhtml index 7d66ea3..1f868f2 100644 --- a/app/views/memberships/new_community.rhtml +++ b/app/views/memberships/new_community.rhtml @@ -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.') + '
' + __("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) %> diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml index da6c868..97ce519 100644 --- a/app/views/search/_display_results.rhtml +++ b/app/views/search/_display_results.rhtml @@ -2,8 +2,8 @@ <% if @wizard %>
- <%= 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')) %>
<% end %> diff --git a/app/views/search/communities.rhtml b/app/views/search/communities.rhtml index f651793..301d7a1 100644 --- a/app/views/search/communities.rhtml +++ b/app/views/search/communities.rhtml @@ -1,8 +1,12 @@ +<% if @wizard %> +

<%= _('Hello %s, now you can choose yours groups') % user.identifier %>

+<% 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 %> diff --git a/lib/zen3_terminology.rb b/lib/zen3_terminology.rb index 8c58a50..a8a3475 100644 --- a/lib/zen3_terminology.rb +++ b/lib/zen3_terminology.rb @@ -79,6 +79,9 @@ class Zen3Terminology < 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 -- libgit2 0.21.2