aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/request/show.rhtml2
-rw-r--r--app/views/request/upload_response.rhtml35
-rw-r--r--todo.txt14
3 files changed, 33 insertions, 18 deletions
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 4189a775f..cab82f1b5 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -112,7 +112,7 @@
<%= link_to "Add an annotation", new_comment_url(:url_title => @info_request.url_title) %> (to help
the requester or others)
<br>
- <%= link_to "Upload large response", upload_response_url(:url_title => @info_request.url_title) %> (FOI
+ <%= link_to "Respond to request", upload_response_url(:url_title => @info_request.url_title) %> (FOI
officers only)
</div>
</div>
diff --git a/app/views/request/upload_response.rhtml b/app/views/request/upload_response.rhtml
index f618dcadb..d7946c07d 100644
--- a/app/views/request/upload_response.rhtml
+++ b/app/views/request/upload_response.rhtml
@@ -1,21 +1,36 @@
-<% @title = "Upload a response to the FOI request '" + h(@info_request.title) + "' made by " + h(@info_request.user.name) %>
+<% @title = "Respond to the FOI request '" + h(@info_request.title) + "' made by " + h(@info_request.user.name) %>
<%= foi_error_messages_for :comment %>
-<h1>Upload a response to the FOI request '<%=request_link(@info_request)%>' made by <%=user_link(@info_request.user) %></h1>
+<h1>Respond to the FOI request '<%=request_link(@info_request)%>' made by <%=user_link(@info_request.user) %></h1>
+
+<p>
+ Your response will <strong>appear on the Internet</strong>, <a href="http://localhost:3000/help/about#officers">read why</a> and answers to other questions.
+</p>
+
+<h2>Respond by email</h2>
+
+<p>You should have received a copy of the request by email, and you can respond
+by <strong>simply replying</strong> to that email. For your convenience, here is the address:
+<a href="mailto:<%=h @info_request.incoming_email%>"><%=h @info_request.incoming_email%></a>.
+You may <strong>include attachments</strong>. If you would like to attach a
+file too large for email, use the form below.
+</p>
-<% form_tag '', :html => { :id => 'upload_response_form' }, :multipart => true do %>
- <p>
- Your response will <strong>appear on the Internet</strong>, <a href="http://localhost:3000/help/about#officers">read why</a> and answers to other questions.
- </p>
+<h2>Respond using the web</h2>
+
+<p>Enter your response below. You may attach one file (use email, or
+<a href="/help/contact">contact us</a> if you need more).</p>
+
+<% form_tag '', :html => { :id => 'upload_response_form' }, :multipart => true do %>
<p>
- <label class="form_label" for="upload_response_body">Message (to go with file):</label>
+ <label class="form_label" for="upload_response_body">Response:<label>
<%= text_area_tag :body, "", :size => "55x10" %>
</p>
<p>
- <label class="form_label" for="outgoing_message_body">File to upload (optional):</label>
+ <label class="form_label" for="outgoing_message_body">Attachment (optional):</label>
<%= file_field_tag :file_1, :size => 35 %>
</p>
@@ -25,10 +40,6 @@
(<strong>patience</strong>, especially for large files, it may take a while!)
</p>
- <p>If you prefer, you may send responses to this FOI request by email to
- <a href="mailto:<%=h @info_request.incoming_email%>"><%=h @info_request.incoming_email%></a>.
- </p>
-
<% end %>
diff --git a/todo.txt b/todo.txt
index 3d0505a5d..6d55927a8 100644
--- a/todo.txt
+++ b/todo.txt
@@ -71,6 +71,7 @@ http://www.whatdotheyknow.com/search/variety:comment/newest
Try changing "email me" link to something else like "track by email"
CSS things
+ - http://localhost:3000/help/contact has gone ugly
- CSS error on "all councils" page on some browsers
- Need Icon for annotations in search results
- Icon for government departments is too Parliamentary
@@ -79,13 +80,8 @@ CSS things
Merge workflow into one stream - find information, if you can't find it then request it.
so just search is on front page, with popular stuff below a la Google Directory
-Shamefully your incremental search, make it as nice as Matthew's i.e.
- - have actual space in layout for full list rather than pop down.
- - show things beginning with the term first, separated visually
- - highlight the parts which match
Google search within website of authority.
Show similar requests after you have filed yours - maybe on preview too.
-Use spelling correction for public bodies search (in addition to substring?)
Turning off frontpage
- Remove javascript from default :)
@@ -97,8 +93,16 @@ Flag bad comments, delete comments from admin interface
Add "I have a large file" to FOI office FAQ
Add "Who should I make my request to?"
Add "I want to file squillions of requests"
+Add "I didn't get the email / spam question" and link to from FOI offcier upload page
+Add "Postal replies stuff" and link to from FOI officer upload page
Simple initial bulk request prevention (see Tony's mail on this)
+Don't let somebody file a new request if they haven't classified all existing ones?
+ - nobody will logout and reconfirm email for each one, so can just make it
+ "can't file while already logged in"?
+ - and *after* filing get them to go classify existing ones
+
+Test code for FOI officer upload
Later
=====