diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/request/_sidebar.rhtml | 16 | ||||
| -rw-r--r-- | app/views/request_mailer/external_response.rhtml | 1 | ||||
| -rw-r--r-- | app/views/request_mailer/requires_admin.rhtml | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 2534190f0..d20e27e23 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -8,8 +8,20 @@ </div> <% if @info_request.described_state != "attention_requested" %> <h2><%= _('Offensive? Unsuitable?') %></h2> - <% if @info_request.attention_requested %> - <p><%= ('The site administrators have reviewed this request and consider it to be suitable for the website.') %></p> + <% if @info_request.attention_requested %> + <% if @info_request.prominence == 'hidden' %> + <%# The eccentric formatting of the following string is in order that it be identical + to the corresponding string in request/show.rhtml %> + <p><%= _('This request has prominence \'hidden\'. You can only see it because you are logged + in as a super user.') %></p> + <% elsif @info_request.prominence == 'requester_only' %> + <%# The eccentric formatting of the following string is in order that it be identical + to the corresponding string in request/show.rhtml %> + <p><%= _('This request is hidden, so that only you the requester can see it. Please + <a href="%s">contact us</a> if you are not sure why.') % [help_requesting_path] %></p> + <% else %> + <p><%= _('This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href="%s">contact us</a>.') % [help_requesting_path] %></p> + <% end %> <% else %> <p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %></p> <p><%= ('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> diff --git a/app/views/request_mailer/external_response.rhtml b/app/views/request_mailer/external_response.rhtml new file mode 100644 index 000000000..e9858f03f --- /dev/null +++ b/app/views/request_mailer/external_response.rhtml @@ -0,0 +1 @@ +<%=@body%> diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml index acd37f405..06a798792 100644 --- a/app/views/request_mailer/requires_admin.rhtml +++ b/app/views/request_mailer/requires_admin.rhtml @@ -1,5 +1,5 @@ --------------------------------------------------------------------- -<%=@info_request.user.name%> <%= _('has reported an')%> <%=@info_request.law_used_short%> +<%=@reported_by.name%> <%= _('has reported an')%> <%=@info_request.law_used_short%> <%= _('response as needing administrator attention. Take a look, and reply to this email to let them know what you are going to do about it.')%> |