Download as
Browse Code »

Commit 2421a7512ac057d6b42bbe96b8ba065438b46b64

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 75806710
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 12 <%= link_to content_tag('span',_('remove')),
13 13 { :action => 'remove', :id => enterprise.id },
14 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 16 </div><!-- end class="controll" -->
18 17 </li>
19 18 <% end %>
... ... @@ -30,6 +29,7 @@
30 29 <% button_bar do %>
31 30 <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
32 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 34 </div><!-- end id="manage_friends" -->
35 35  
... ...
app/views/friends/index.rhtml
  Diff comments   View file @2421a75
... ... @@ -27,13 +27,11 @@
27 27 <%= link_to content_tag('span',_('remove')),
28 28 { :action => 'remove', :id => friend.id },
29 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 31 <%= link_to content_tag('span',_('contact')),
33 32 friend.url.merge(:controller => 'contact', :action => 'new'),
34 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 35 </div><!-- end class="controll" -->
38 36 </li>
39 37 <% end %>
... ... @@ -48,6 +46,7 @@
48 46 <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'friends') %>
49 47 <% end %>
50 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 51 </div><!-- end id="manage_friends" -->
53 52  
... ...