diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin_request/edit.rhtml | 1 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 1 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 39 | ||||
| -rw-r--r-- | app/views/request/followup_preview.rhtml | 7 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 5 |
5 files changed, 43 insertions, 10 deletions
diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml index b5f31e403..646d643fe 100644 --- a/app/views/admin_request/edit.rhtml +++ b/app/views/admin_request/edit.rhtml @@ -24,6 +24,7 @@ 'rejected', 'successful', 'partially_successful', + 'internal_review', 'requires_admin', ]) %> </p> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index cd63bc12d..54c680ade 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -130,6 +130,7 @@ <tr><td><strong><%=search_link('status:successful')%></strong></td><td> All of the information requested has been received </td></tr> <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td> The public authority would like part of the request explained </td></tr> <tr><td><strong><%=search_link('status:gone_postal')%></strong></td><td> The public authority would like to / has responded by post </td></tr> + <tr><td><strong><%=search_link('status:internal_review')%></strong></td><td> Waiting for the public authority to complete an internal review of the request</td></tr> <tr><td><strong><%=search_link('status:requires_admin')%></strong></td><td> A strange reponse, required attention by the WhatDoTheyKnow team </td></tr> </table> <% end %> diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 87b1bde82..fe16ff33b 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -1,11 +1,11 @@ <div id="followup"> <% if incoming_message.nil? || !incoming_message.valid_to_reply_to? %> - <h2>Send a follow up message + <h2>Send a public follow up message to '<%=h RequestMailer.name_for_followup(@info_request, nil) %>' </h2> <% else %> - <h2>Send a reply to <%=h RequestMailer.name_for_followup(@info_request, incoming_message) %> + <h2>Send a public reply to <%=h RequestMailer.name_for_followup(@info_request, incoming_message) %> </h2> <% end %> @@ -14,14 +14,13 @@ <a href="/help/contact">contact us</a> if you are <%= user_link(@info_request.user) %> and need to send a follow up.</p> <% else %> - <p>Use this to tell the public authority something, such as to clarify - your request, or if they are late responding.</p> - <p>Please do <strong>not</strong> make new requests here. +<!-- <p>Please do <strong>not</strong> make new requests here. If you are asking for information which was not in your original request, then <%= link_to "file a new request", new_request_to_body_url(:public_body_id => @info_request.public_body.id.to_s) %> instead. </p> + --> <% if @info_request.calculate_status == 'waiting_response_overdue' %> <p>This request is currently <strong>overdue a response</strong> from <%= @@ -39,11 +38,31 @@ <%= o.text_area :body, :rows => 10, :cols => 55 %> <br><script type="text/javascript">document.write('<input name="doSpell" type="button" value="Check spelling" onClick="openSpellChecker(document.getElementById(\'followup_form\').body);"/> (optional)')</script> </p> - - <p> - <strong>Privacy warning:</strong> Your follow up message, and any response - to it, will also be displayed publicly on this website. - </p> + + <h3>What are you doing?</h3> + + <% if !@outgoing_message.errors[:what_doing_dummy].nil? %> + <div class="fieldWithErrors"> + <% else %> + <div> + <% end %> + <!-- + <div> + <%= radio_button "outgoing_message", "what_doing", "new_information", :id => "new_information" %> + <label for="new_information">I am asking for <strong>new information</strong> </label> + </div> + --> + <div> + <%= radio_button "outgoing_message", "what_doing", "internal_review", :id => "internal_review" %> + <label for="internal_review">I am requesting an <strong>internal review</strong> + (<a href="/help/unhappy">what's that?</a>) + </label> + </div> + <div> + <%= radio_button "outgoing_message", "what_doing", "normal_sort", :id => "sort_normal" %> + <label for="sort_normal"><strong>Anything else</strong>, such as clarifying, prompting, thanking</label> + </div> + </div> <p> <%= hidden_field_tag 'submitted_followup', 1 %> diff --git a/app/views/request/followup_preview.rhtml b/app/views/request/followup_preview.rhtml index 543924ed2..a924b46ae 100644 --- a/app/views/request/followup_preview.rhtml +++ b/app/views/request/followup_preview.rhtml @@ -29,6 +29,13 @@ <% end %> <p> + <strong>Privacy warning:</strong> Your message, and any response + to it, will be displayed publicly on this website. + + <%= o.hidden_field(:what_doing) %> + </p> + + <p> <%= hidden_field_tag(:submitted_followup, 1) %> <%= hidden_field_tag(:preview, 0 ) %> <%= submit_tag "Re-edit this follow up", :name => 'reedit' %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 00cd27086..eb09bfa43 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -94,6 +94,8 @@ <% end %> <% elsif @status == 'gone_postal' %> The authority would like to / has <strong>responded by post</strong> to this request. + <% elsif @status == 'internal_review' %> + Waiting for an <strong>internal review</strong> by <%= public_body_link(@info_request.public_body) %> of their handling of this request. <% elsif @status == 'requires_admin' %> This request has had an unusual response, and <strong>requires attention</strong> from the WhatDoTheyKnow team. <% else %> @@ -125,6 +127,9 @@ <% 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) </div> |