diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/request/_after_actions.rhtml | 8 | ||||
| -rw-r--r-- | app/views/request/_other_describe_state.rhtml | 4 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 15 |
3 files changed, 19 insertions, 8 deletions
diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml index aa6411453..b8d087a12 100644 --- a/app/views/request/_after_actions.rhtml +++ b/app/views/request/_after_actions.rhtml @@ -5,6 +5,9 @@ <div id="anyone_actions"> <%= link_to "Add an annotation", new_comment_url(:url_title => @info_request.url_title) %> (to help the requester or others) + <% if @old_unclassified %> + | <%= link_to "Update the status of this request", '#describe_state_form_1' %> + <% end %> </div> <div id="owner_actions"> @@ -14,8 +17,9 @@ <% else %> <%= link_to "Reply to " + RequestMailer.name_for_followup(@info_request, @last_response), show_response_url(:id => @info_request.id, :incoming_message_id => @last_response.id) + "#followup" %> <% end %> - | - <%= link_to "Update the status of this request", request_url(@info_request, :update_status => 1) %> + <% if !@old_unclassified %> + | <%= link_to "Update the status of this request", request_url(@info_request, :update_status => 1) %> + <% end %> | <%= link_to "Request an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %> </div> diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml index 25514cf52..aa153043b 100644 --- a/app/views/request/_other_describe_state.rhtml +++ b/app/views/request/_other_describe_state.rhtml @@ -2,10 +2,10 @@ <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> <h2>Can you help us by describing the status of this request now?</h2> - <small> + <div class="form_explanation"> <%= user_link(@info_request.user) %> hasn't yet let us know whether this request was successful or not. Perhaps you could help us out by doing so? - </small> + </div> <hr> <!------------------------------------------------> <% if @info_request.described_state != 'internal_review' %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index fa9c8f4a7..aac8d0851 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -28,10 +28,17 @@ Please <strong>answer the question above</strong> so we know whether the <%= MySociety::Format.fancy_pluralize(@new_responses_count, 'recent response contains', 'recent responses contain') %> useful information. <% else %> - This request has an <strong>unknown status</strong>. We're waiting for - <%= user_link(@info_request.user) %> to read - <%= MySociety::Format.fancy_pluralize(@new_responses_count, 'a recent response', 'recent responses') %> - and update the status. + This request has an <strong>unknown status</strong>. + <% if @old_unclassified %> + We're waiting for someone to read + <%= MySociety::Format.fancy_pluralize(@new_responses_count, 'a recent response', 'recent responses') %> + and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that? + <% else %> + We're waiting for + <%= user_link(@info_request.user) %> to read + <%= MySociety::Format.fancy_pluralize(@new_responses_count, 'a recent response', 'recent responses') %> + and update the status. + <% end %> <% end %> <% elsif @status == 'waiting_response' %> Currently <strong>waiting for a response</strong> from <%= public_body_link(@info_request.public_body) %>, |