diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index b3b9dc772..1d06c9294 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -62,10 +62,10 @@ module WatchersHelper :object_id => object.id, :user_id => user} s << ' ' - s << link_to(l(:button_delete), url, + s << link_to(l(:button_remove), url, :remote => true, :method => 'delete', - :class => "delete icon-only icon-del", - :title => l(:button_delete)) + :class => "delete icon-only icon-remove", + :title => l(:button_remove)) end content << content_tag('li', s, :class => "user-#{user.id}") end diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index 8c2ab7e4b..a3ee444bc 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -11,7 +11,7 @@ <%= link_to_user user %> - <%= delete_link group_user_path(@group, :user_id => user), :remote => true %> + <%= link_to l(:button_remove), group_user_path(@group, user_id: user), {remote: true, method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-remove'} %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ff0ae432..2aaa78ff5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1116,6 +1116,7 @@ en: button_collapse_all: Collapse all button_expand_all: Expand all button_delete: Delete + button_remove: Remove button_create: Create button_create_and_continue: Create and add another button_test: Test diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 0c4102459..be1fa7e2e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1591,7 +1591,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container { .icon-sorted-desc { background-image: url(../images/arrow_up.png); } .icon-toggle-plus { background-image: url(../images/bullet_toggle_plus.png) } .icon-toggle-minus { background-image: url(../images/bullet_toggle_minus.png) } -.icon-clear-query { background-image: url(../images/close_hl.png); } +.icon-clear-query, .icon-remove { background-image: url(../images/close_hl.png); } .icon-import { background-image: url(../images/database_go.png); } .icon-file { background-image: url(../images/files/default.png); }