diff options
Diffstat (limited to 'app/views/request')
| -rw-r--r-- | app/views/request/_describe_state.rhtml | 44 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 43 | ||||
| -rw-r--r-- | app/views/request/show_response.rhtml | 32 |
4 files changed, 82 insertions, 43 deletions
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 6ed2fd39a..ed22a37b1 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -1,20 +1,40 @@ <% if @is_owning_user || @requires_admin_describe %> <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> <h2>What is the status of this request now?</h2> - <hr> - <div> - <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %> - <label for="waiting_response<%=id_suffix%>">I'm still <strong>waiting</strong> for my information</label> - </div> - <div> - <%= radio_button "incoming_message", "described_state", "waiting_clarification", :id => 'waiting_clarification' + id_suffix %> - <label for="waiting_clarification<%=id_suffix%>">I'm about to <strong>clarify</strong> my request</label> - </div> + + <hr> <!------------------------------------------------> + + <% if @info_request.described_state != 'internal_review' %> + <div> + <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %> + <label for="waiting_response<%=id_suffix%>">I'm still <strong>waiting</strong> for my information</label> + </div> + <% end %> + <% if @info_request.described_state == 'internal_review' %> + <div> + <%= radio_button "incoming_message", "described_state", "internal_review", :id => 'internal_review' + id_suffix %> + <label for="internal_review<%=id_suffix%>">I'm still <strong>waiting</strong> for the internal review</label> + </div> + <% end %> + + <% if @info_request.described_state != 'internal_review' %> + <div> + <%= radio_button "incoming_message", "described_state", "waiting_clarification", :id => 'waiting_clarification' + id_suffix %> + <label for="waiting_clarification<%=id_suffix%>">I'm about to <strong>clarify</strong> my request</label> + </div> + <% end %> + <div> <%= radio_button "incoming_message", "described_state", "gone_postal", :id => 'gone_postal' + id_suffix %> <label for="gone_postal<%=id_suffix%>">They are going to reply <strong>by post</strong></label> </div> - <hr> + + <hr> <!------------------------------------------------> + + <% if @info_request.described_state == 'internal_review' %> + <p>The <strong>review has finished</strong> and overall:</p> + <% end %> + <div> <%= radio_button "incoming_message", "described_state", "not_held", :id => 'not_held' + id_suffix %> <label for="not_held<%=id_suffix%>">They do <strong>not have</strong> the information <small>(maybe they say who does)</small></label> @@ -31,7 +51,9 @@ <%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %> <label for="rejected<%=id_suffix%>">My request has been <strong>rejected</strong></label> </div> - <hr> + + <hr> <!------------------------------------------------> + <div> <%= radio_button "incoming_message", "described_state", "requires_admin", :id => 'requires_admin' + id_suffix %> <label for="requires_admin<%=id_suffix%>"><strong>None</strong> of the above</label> diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index fe16ff33b..138503a30 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -9,6 +9,12 @@ </h2> <% end %> + <% if @internal_review %> + <p>Write a message asking the authority to conduct an internal review + of their handling of your request. + </p> + <% end %> + <% if @info_request.stop_new_responses %> <p>Follow ups and new responses to this request have been stopped to prevent spam. Please <a href="/help/contact">contact us</a> if you are <%= user_link(@info_request.user) %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index eb09bfa43..ef5c7557d 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -73,6 +73,13 @@ the response had to be <%= link_to "no later", about_url + "#quickly_response" %> than <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. + + <% if @info_request.days_overdue > 14 %> + They are <%= @info_request.days_overdue.to_i %> days late, you + can <strong>complain</strong> by + <%= link_to "requesting an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %>. + <% end %> + <% elsif @status == 'not_held' %> <%= public_body_link(@info_request.public_body) %> <strong>did not have</strong> the information requested. <% elsif @status == 'rejected' %> @@ -117,21 +124,27 @@ <div id="after_actions"> <h2>Things to do with this request</h2> - <%= link_to "Add an annotation", new_comment_url(:url_title => @info_request.url_title) %> (to help - the requester or others) - <br> - <% if @last_response.nil? %> - <%= link_to "Send follow up to " + RequestMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %> - <% 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 %> - (<%=h @info_request.user.name %> only) - <br> - <!-- <%= link_to "Request an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %> - (<%=h @info_request.user.name %> only) - <br> --> - <%= link_to "Respond to request", upload_response_url(:url_title => @info_request.url_title) %> - (<%=h @info_request.public_body.name %> only) + + <p> + <%= link_to "Add an annotation", new_comment_url(:url_title => @info_request.url_title) %> (to help + the requester or others) + </p> + + <p> + <strong><%=h @info_request.user.name %> only:</strong> + <% if @last_response.nil? %> + <%= link_to "Send follow up to " + RequestMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %> + <% 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 "Request an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %> + + <br> + + <strong><%=h @info_request.public_body.name %> only:</strong> + <%= link_to "Respond to request", upload_response_url(:url_title => @info_request.url_title) %> + </p> </div> </div> diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml index 25b9e6470..7f43aae7a 100644 --- a/app/views/request/show_response.rhtml +++ b/app/views/request/show_response.rhtml @@ -47,29 +47,27 @@ <% end %> <div id="show_response_view"> - <% if @is_owning_user %> - <% if @incoming_message.nil? %> - <h2>Your last message sent for request '<%= request_link @info_request %>'</h2> - <% elsif @incoming_message.recently_arrived %> - <h2>New response to your request '<%= request_link @info_request %>'</h2> + <% if !@incoming_message.nil? %> + <% if @is_owning_user %> + <% if @incoming_message.recently_arrived %> + <h2>New response to your request '<%= request_link @info_request %>'</h2> + <% else %> + <h2>Response to your request '<%= request_link @info_request %>'</h2> + <% end %> <% else %> - <h2>Response to your request '<%= request_link @info_request %>'</h2> + <% if @incoming_message.recently_arrived %> + <h2>New response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> + <% else %> + <h2>Response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> + <% end %> <% end %> - <% else %> + <% if @incoming_message.nil? %> - <h2>Last message sent for <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> - <% elsif @incoming_message.recently_arrived %> - <h2>New response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> + <%= render :partial => 'correspondence', :locals => { :info_request_event => @info_request.get_last_outgoing_event, :incoming_message => nil } %> <% else %> - <h2>Response to <%=h(@info_request.law_used_short)%> request '<%= request_link @info_request %>'</h2> + <%= render :partial => 'correspondence', :locals => { :info_request_event => nil, :incoming_message => @incoming_message } %> <% end %> <% end %> - - <% if @incoming_message.nil? %> - <%= render :partial => 'correspondence', :locals => { :info_request_event => @info_request.get_last_outgoing_event, :incoming_message => nil } %> - <% else %> - <%= render :partial => 'correspondence', :locals => { :info_request_event => nil, :incoming_message => @incoming_message } %> - <% end %> <%= render :partial => 'followup', :locals => { :incoming_message => @incoming_message } %> </div> |