Download as
Browse Code »

Commit 7e35c14744d3e2990c3c1578dc3d338d34126769

Authored by Antonio Terceiro
1 parent 28c193d4
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Don't associate people with recycle bins

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/views/friends/index.rhtml
  Diff comments   View file @7e35c14
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="controll"> 26 <div class="controll">
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-remove',
30 :title => _('remove') %> 30 :title => _('remove') %>
31 <%= link_to content_tag('span',_('contact')), 31 <%= link_to content_tag('span',_('contact')),
32 friend.url.merge(:controller => 'contact', :action => 'new'), 32 friend.url.merge(:controller => 'contact', :action => 'new'),