Set title/h1 to something sensible when granting/revoking roles

diff --git a/app/views/user_roles/grant.html.erb b/app/views/user_roles/grant.html.erb
index ca45266d67788c46dccd4720a441cfc2da1a6426..f9e54fd1c8cd757478d0fc4e169f413b04cbab1a 100644 (file)
--- a/app/views/user_roles/grant.html.erb
+++ b/app/views/user_roles/grant.html.erb
@@ -1,5 +1,7 @@
 <% form_tag request.request_uri do %>
 <%= hidden_field_tag 'nonce', @nonce %>
 <% form_tag request.request_uri do %>
 <%= hidden_field_tag 'nonce', @nonce %>

+<% @title = t('user_role.grant.heading') %>
+<h1><%= t('user_role.grant.heading') %></h1>

 <p><%= t('user_role.grant.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p>
 <p><%= submit_tag t'user_role.grant.confirm' %></p>
 <% end %>
 <p><%= t('user_role.grant.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p>
 <p><%= submit_tag t'user_role.grant.confirm' %></p>
 <% end %>

diff --git a/app/views/user_roles/revoke.html.erb b/app/views/user_roles/revoke.html.erb
index 17219d9c7dace547e9ef2861df994f3574def6d6..e5aadeae08da62b0fc2c57450b4c50cc23b3eedb 100644 (file)
--- a/app/views/user_roles/revoke.html.erb
+++ b/app/views/user_roles/revoke.html.erb
@@ -1,5 +1,7 @@
 <% form_tag request.request_uri do %>
 <%= hidden_field_tag 'nonce', @nonce %>
 <% form_tag request.request_uri do %>
 <%= hidden_field_tag 'nonce', @nonce %>

+<% @title = t('user_role.revoke.heading') %>
+<h1><%= t('user_role.revoke.heading') %></h1>

 <p><%= t('user_role.revoke.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p>
 <p><%= submit_tag t'user_role.revoke.confirm' %></p>
 <% end %>
 <p><%= t('user_role.revoke.are_you_sure', :name => params[:display_name], :role => params[:role]) %></p>
 <p><%= submit_tag t'user_role.revoke.confirm' %></p>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8d53dcdf361dfa7a9fafd80c0e5c905450fd9098..9105a2d425ac2bd03c521e05e6dc0cc5dd670d79 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1013,10 +1013,14 @@ en:
       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:
       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:

+      title: Confirm role granting
+      heading: Confirm role granting

       are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
     revoke:
       are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
     revoke:

+      title: Confirm role revoking
+      heading: Confirm role revoking

       are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
       are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."