Commit d7d85f8b62e22874a46b543180dc3dcfe2edbca6
Committed by
Antonio Terceiro
Antonio Terceiro
1 parent
a36dc590
Exists in
master
and in
29 other branches
Substituting 'helps' -> All the rest
* This patch includes the rest changes that I am not quite sure...
Showing
4 changed files
with
17 additions
and
22 deletions
Show diff stats
app/views/enterprise_validation/index.rhtml
| 1 | <h1><%= __('Enterprise validations') %></h1> | 1 | <h1><%= __('Enterprise validations') %></h1> |
| 2 | 2 | ||
| 3 | <% button_bar do %> | 3 | <% button_bar do %> |
| 4 | - <%= 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.')) %> | ||
| 5 | - <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }, :help => _('Go back to the control panel.')) %> | 4 | + <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %> |
| 5 | + <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %> | ||
| 6 | <% end %> | 6 | <% end %> |
| 7 | 7 | ||
| 8 | <h2><%= __("Pending enterprise validations") %></h2> | 8 | <h2><%= __("Pending enterprise validations") %></h2> |
app/views/profile_editor/index.rhtml
| @@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
| 74 | <p><strong><%= __('Activate your enterprise') %></strong></p> | 74 | <p><strong><%= __('Activate your enterprise') %></strong></p> |
| 75 | <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p> | 75 | <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p> |
| 76 | <p><%= environment.help_message_to_add_enterprise %> </p> | 76 | <p><%= environment.help_message_to_add_enterprise %> </p> |
| 77 | - <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %> | 77 | + <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %> |
| 78 | <%= submit_button(:ok, _('Activate')) %> | 78 | <%= submit_button(:ok, _('Activate')) %> |
| 79 | <% end %> | 79 | <% end %> |
| 80 | </div> | 80 | </div> |
app/views/shared/user_menu.rhtml
| 1 | -<div id="user_menu" class="top_extra_menu AOM_paddingBottom_6"<%= | ||
| 2 | - ' help="'+ _('This menu gives you access to your personal functionalities.') +'"' if logged_in? | ||
| 3 | - %>> | 1 | +<div id="user_menu" class="top_extra_menu AOM_paddingBottom_6"> |
| 4 | 2 | ||
| 5 | <% if logged_in? %> | 3 | <% if logged_in? %> |
| 6 | 4 | ||
| @@ -40,22 +38,20 @@ | @@ -40,22 +38,20 @@ | ||
| 40 | <% end %> | 38 | <% end %> |
| 41 | 39 | ||
| 42 | <li> | 40 | <li> |
| 43 | - <%= link_to('<span class="icon-menu-ctrl-panel"></span>'+ _('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.')) %> | 41 | + <%= link_to('<span class="icon-menu-ctrl-panel"></span>'+ _('Control panel'), { :controller => 'profile_editor', :action => 'index', :profile => user.identifier }, :id => 'link_edit_profile') %> |
| 44 | </li> | 42 | </li> |
| 45 | 43 | ||
| 46 | <% if user.is_admin?(environment) %> | 44 | <% if user.is_admin?(environment) %> |
| 47 | <li><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'), | 45 | <li><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'), |
| 48 | {:controller => 'admin_panel' }, | 46 | {:controller => 'admin_panel' }, |
| 49 | - :id => 'link_admin_panel', | ||
| 50 | - :help => _('Access the site administration panel.') | ||
| 51 | - )%></li> | 47 | + :id => 'link_admin_panel' ) %> |
| 48 | + </li> | ||
| 52 | <% end %> | 49 | <% end %> |
| 53 | 50 | ||
| 54 | <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'), | 51 | <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('Logout'), |
| 55 | {:controller => 'account', :action => 'logout'}, | 52 | {:controller => 'account', :action => 'logout'}, |
| 56 | - :id => 'link_logout', | ||
| 57 | - :help => _('This link takes you out of the system. You should logout if other people are willing to use the same computer after you.') | ||
| 58 | - ) %></li> | 53 | + :id => 'link_logout' ) %> |
| 54 | + </li> | ||
| 59 | 55 | ||
| 60 | </ul> | 56 | </ul> |
| 61 | </div><!-- id="user_menu_ul" --> | 57 | </div><!-- id="user_menu_ul" --> |
app/views/tasks/_add_friend.rhtml
| @@ -21,18 +21,17 @@ | @@ -21,18 +21,17 @@ | ||
| 21 | :onclick => "Element.hide('group-for-friend-#{task.id}')") %> | 21 | :onclick => "Element.hide('group-for-friend-#{task.id}')") %> |
| 22 | <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label> | 22 | <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label> |
| 23 | 23 | ||
| 24 | - <% | ||
| 25 | - content_tag('div', :id => "group-for-friend-#{task.id}", | ||
| 26 | - :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 %> | ||
| 27 | - <%= _('Classify your new friend:') %> | ||
| 28 | - <%= text_field_with_local_autocomplete("task[group_for_friend]", | ||
| 29 | - profile.suggested_friend_groups, | ||
| 30 | - {:id => "field-group-for-friend-#{task.id}", :maxlength => 150}) %> | 24 | + <% content_tag('div', :id => "group-for-friend-#{task.id}") do %> |
| 25 | + <%= _('Classify your new friend:') %> | ||
| 26 | + <%= text_field_with_local_autocomplete("task[group_for_friend]", | ||
| 27 | + profile.suggested_friend_groups, | ||
| 28 | + {:id => "field-group-for-friend-#{task.id}", :maxlength => 150}) %> | ||
| 29 | + | ||
| 31 | <p class="friend-classify-suggestions"> | 30 | <p class="friend-classify-suggestions"> |
| 32 | - <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %> | 31 | + <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %> |
| 33 | </p> | 32 | </p> |
| 34 | - | ||
| 35 | <% end %> | 33 | <% end %> |
| 34 | + | ||
| 36 | </div> | 35 | </div> |
| 37 | 36 | ||
| 38 | <% button_bar do %> | 37 | <% button_bar do %> |