Download as
Browse Code »

Commit 2421a7512ac057d6b42bbe96b8ba065438b46b64

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 75806710
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Substituting 'helps' -> With footnote obs 

* This patch includes the substitutions that removes the help
	  animation and includes an obs footnote with the content.
Showing 2 changed files with 5 additions and 6 deletions   Show diff stats
app/views/favorite_enterprises/index.rhtml
  Diff comments   View file @2421a75
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 <%= link_to content_tag('span',_('remove')), 12 <%= link_to content_tag('span',_('remove')),
13 { :action => 'remove', :id => enterprise.id }, 13 { :action => 'remove', :id => enterprise.id },
14 :class => 'button icon-delete', 14 :class => 'button icon-delete',
15 - :title => _('remove'),  
16 - :help => _('Clicking on this button will remove your friend relation with %s.') % enterprise.name %> 15 + :title => _('remove') %>
17 </div><!-- end class="controll" --> 16 </div><!-- end class="controll" -->
18 </li> 17 </li>
19 <% end %> 18 <% end %>
@@ -30,6 +29,7 @@ @@ -30,6 +29,7 @@
30 <% button_bar do %> 29 <% button_bar do %>
31 <%= button(:back, _('Go back'), :controller => 'profile_editor') %> 30 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
32 <% end %> 31 <% end %>
  32 +<%= content_tag(:small,_('* Notice that clicking on the remove button, you will remove your friends relation with this enterprise.')) %>
33 33
34 </div><!-- end id="manage_friends" --> 34 </div><!-- end id="manage_friends" -->
35 35
app/views/friends/index.rhtml
  Diff comments   View file @2421a75
@@ -27,13 +27,11 @@ @@ -27,13 +27,11 @@
27 <%= link_to content_tag('span',_('remove')), 27 <%= link_to content_tag('span',_('remove')),
28 { :action => 'remove', :id => friend.id }, 28 { :action => 'remove', :id => friend.id },
29 :class => 'button icon-delete', 29 :class => 'button icon-delete',
30 - :title => _('remove'),  
31 - :help => __('Clicking on this button will remove your friend relation with %s.') % friend.name %> 30 + :title => _('remove') %>
32 <%= link_to content_tag('span',_('contact')), 31 <%= link_to content_tag('span',_('contact')),
33 friend.url.merge(:controller => 'contact', :action => 'new'), 32 friend.url.merge(:controller => 'contact', :action => 'new'),
34 :class => 'button icon-menu-mail', 33 :class => 'button icon-menu-mail',
35 - :title => _('contact'),  
36 - :help => __('Clicking on this button will let you send a message to %s.') % friend.name %> 34 + :title => _('contact') %>
37 </div><!-- end class="controll" --> 35 </div><!-- end class="controll" -->
38 </li> 36 </li>
39 <% end %> 37 <% end %>
@@ -48,6 +46,7 @@ @@ -48,6 +46,7 @@
48 <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'friends') %> 46 <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'friends') %>
49 <% end %> 47 <% end %>
50 <% end %> 48 <% end %>
  49 +<%= content_tag(:small,_('* Notice that clicking on the remove button, you will remove your friends relation with this friend.')) %>
51 50
52 </div><!-- end id="manage_friends" --> 51 </div><!-- end id="manage_friends" -->
53 52