Add title="" to the revoke/grant icons that indicate what they're about to do

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index b0faeaf6427cf820970b47f4df246b2bafb64dcb..dfd26e609edc95cbfea1b0f047f6180e0bc63221 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -2,9 +2,9 @@
 <% UserRole::ALL_ROLES.each do |role| %>
 <% if @user and @user.administrator? %>
 <% if @this_user.has_role? role %>
 <% UserRole::ALL_ROLES.each do |role| %>
 <% if @user and @user.administrator? %>
 <% if @this_user.has_role? role %>

-<%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %>
+<%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %>

 <% else %>
 <% else %>

-<%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>
+<%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>

 <% end %>
 <% elsif @this_user.has_role? role %>
 <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}")) %>
 <% end %>
 <% elsif @this_user.has_role? role %>
 <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}")) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 38dc04bc39a1d55905e6fc96b08717d01a491c14..8d53dcdf361dfa7a9fafd80c0e5c905450fd9098 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -948,8 +948,12 @@ en:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:

-        administrator: "Administrator"
-        moderator: "Moderator"
+        grant:
+          administrator: "Grant administrator access"
+          moderator: "Grant moderator access"
+        revoke:
+          administrator: "Revoke administrator access"
+          moderator: "Revoke moderator access"

       block_history: "view blocks received"
       moderator_history: "view blocks given"
       create_block: "block this user"
       block_history: "view blocks received"
       moderator_history: "view blocks given"
       create_block: "block this user"