diff --git a/app/views/enterprise_validation/index.rhtml b/app/views/enterprise_validation/index.rhtml index f461305..90d3152 100644 --- a/app/views/enterprise_validation/index.rhtml +++ b/app/views/enterprise_validation/index.rhtml @@ -1,8 +1,8 @@

<%= __('Enterprise validations') %>

<% button_bar do %> - <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }, :help => __('Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.')) %> - <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }, :help => _('Go back to the control panel.')) %> + <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %> + <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %> <% end %>

<%= __("Pending enterprise validations") %>

diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index 054ff25..cfc5994 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -74,7 +74,7 @@

<%= __('Activate your enterprise') %>

<%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %>

<%= environment.help_message_to_add_enterprise %>

- <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %> + <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %> <%= submit_button(:ok, _('Activate')) %> <% end %> diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml index 0b1df6b..bccbfd6 100644 --- a/app/views/shared/user_menu.rhtml +++ b/app/views/shared/user_menu.rhtml @@ -1,6 +1,4 @@ -
> +
<% if logged_in? %> @@ -40,22 +38,20 @@ <% end %>
  • - <%= link_to(''+ _('Control panel'), { :controller => 'profile_editor', :action => 'index', :profile => user.identifier }, :id => 'link_edit_profile', :help => _('Control panel: change your picture, edit your personal information, create content or change the way your home page looks.')) %> + <%= link_to(''+ _('Control panel'), { :controller => 'profile_editor', :action => 'index', :profile => user.identifier }, :id => 'link_edit_profile') %>
  • <% if user.is_admin?(environment) %>
  • <%= link_to( ''+ _('Admin'), {:controller => 'admin_panel' }, - :id => 'link_admin_panel', - :help => _('Access the site administration panel.') - )%>
  • + :id => 'link_admin_panel' ) %> + <% end %>
  • <%= link_to( ''+ _('Logout'), {:controller => 'account', :action => 'logout'}, - :id => 'link_logout', - :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.') - ) %>
  • + :id => 'link_logout' ) %> +
    diff --git a/app/views/tasks/_add_friend.rhtml b/app/views/tasks/_add_friend.rhtml index eb8e0ba..b8c57ff 100644 --- a/app/views/tasks/_add_friend.rhtml +++ b/app/views/tasks/_add_friend.rhtml @@ -21,18 +21,17 @@ :onclick => "Element.hide('group-for-friend-#{task.id}')") %> - <% - content_tag('div', :id => "group-for-friend-#{task.id}", - :help => _('You can type the first letters of an existing group and have the system present you the available options, or you can type the name of a new group if you want.')) do %> - <%= _('Classify your new friend:') %> - <%= text_field_with_local_autocomplete("task[group_for_friend]", - profile.suggested_friend_groups, - {:id => "field-group-for-friend-#{task.id}", :maxlength => 150}) %> + <% content_tag('div', :id => "group-for-friend-#{task.id}") do %> + <%= _('Classify your new friend:') %> + <%= text_field_with_local_autocomplete("task[group_for_friend]", + profile.suggested_friend_groups, + {:id => "field-group-for-friend-#{task.id}", :maxlength => 150}) %> +

    - <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %> + <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>

    - <% end %> +
    <% button_bar do %> -- libgit2 0.21.2