Substituting 'helps' -> All the rest

* This patch includes the rest changes that I am not quite sure...

Substituting 'helps' -> All the rest
* This patch includes the rest changes that I am not quite sure...
Rodrigo Souto · Antonio Terceiro
1 parent a36dc590
Showing 4 changed files with 17 additions and 22 deletions Show diff stats
app/views/enterprise_validation/index.rhtml
app/views/profile_editor/index.rhtml
app/views/shared/user_menu.rhtml
app/views/tasks/_add_friend.rhtml
 <h1><%= __('Enterprise validations') %></h1>
 <% 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 %>
 <h2><%= __("Pending enterprise validations") %></h2>
@@ -74,7 +74,7 @@
         <p><strong><%= __('Activate your enterprise') %></strong></p>
 	<p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p>
 	<p><%= environment.help_message_to_add_enterprise %> </p>
-        <%= 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 %>
     </div>
-<div id="user_menu" class="top_extra_menu AOM_paddingBottom_6"<%=
-  ' help="'+ _('This menu gives you access to your personal functionalities.') +'"' if logged_in?
-  %>>
+<div id="user_menu" class="top_extra_menu AOM_paddingBottom_6">
   <% if logged_in? %>
@@ -40,22 +38,20 @@
         <% end %>
         <li>
-        <%= 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.')) %>
+        <%= link_to('<span class="icon-menu-ctrl-panel"></span>'+ _('Control panel'), { :controller => 'profile_editor', :action => 'index', :profile => user.identifier }, :id => 'link_edit_profile') %>
         </li>
         <% if user.is_admin?(environment) %>
           <li><%= link_to( '<span class="icon-menu-admin"></span>'+ _('Admin'),
                              {:controller => 'admin_panel' },
-                             :id => 'link_admin_panel',
-                             :help => _('Access the site administration panel.')
-                             )%></li>
+                             :id => 'link_admin_panel' ) %>
+          </li>
         <% end %>
         <li><%= link_to( '<span class="icon-menu-logout"></span>'+ _('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.')
-                                ) %></li>
+                                  :id => 'link_logout' ) %>
+        </li>
       </ul>
     </div><!-- id="user_menu_ul" -->
@@ -21,18 +21,17 @@
         :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
     <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
-    <%
-      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}) %>
+
       <p class="friend-classify-suggestions">
-      <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
+        <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
       </p>
-
     <% end %>
+
   </div>
   <% button_bar do %>
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>
	@@ -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>