Show URL of request in disclaimer of follow up message, may as well.

5 files changed, 18 insertions, 10 deletions

diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 6d5e6b0cd..fc4197004 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,9 +4,10 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: request_mailer.rb,v 1.16 2008-01-10 01:13:28 francis Exp $
+# $Id: request_mailer.rb,v 1.17 2008-01-11 01:02:45 francis Exp $
 
 class RequestMailer < ActionMailer::Base
+    helper :application
 
     def initial_request(info_request, outgoing_message)
         @from = info_request.incoming_email
diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb
index d3638c38b..1e609ae32 100644
--- a/app/models/user_mailer.rb
+++ b/app/models/user_mailer.rb
@@ -4,9 +4,10 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: user_mailer.rb,v 1.2 2007-11-13 12:02:14 francis Exp $
+# $Id: user_mailer.rb,v 1.3 2008-01-11 01:02:45 francis Exp $
 
 class UserMailer < ActionMailer::Base
+    helper :application
 
     def confirm_login(user, reasons, url)
         @from = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
diff --git a/app/views/request_mailer/followup.rhtml b/app/views/request_mailer/followup.rhtml
index a3198d038..3c37b2763 100644
--- a/app/views/request_mailer/followup.rhtml
+++ b/app/views/request_mailer/followup.rhtml
@@ -1,8 +1,9 @@
 <%= @outgoing_message.body.strip %>
 
 -------------------------------------------------------------------
-Disclaimer: This message and all responses to it are public. Any reply that you
-make will be published on the Internet.
+Disclaimer: This message and all responses to it are public. Any
+reply that you make will be published on the Internet at this
+location: <%= main_url(request_url(@info_request)) %>
 
 Sent using GovernmentSpy, a project of UKCOD, registered charity number 1076346. 
 -------------------------------------------------------------------
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index a0e317926..133d990fb 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -284,12 +284,12 @@ table#list_requests .odd {
 
 #show_response_classify_action {
     float: left;
-    width: 35%;
+    width: 25%;
 }
 
 #show_response_view {
     float: right;
-    width: 60%;
+    width: 70%;
 }
 #show_response_followup {
     margin-top: 3em;
diff --git a/todo.txt b/todo.txt
index 762155cc1..a87e68582 100644
--- a/todo.txt
+++ b/todo.txt
@@ -19,11 +19,13 @@ BAILII - relationship with law courts, robots.txt ?
 Next
 ====
 
-Let requester send follow-ups - but to which email address???!! aargh
+Set From: to have name of user, and set To: to have name of body etc. for all mails
+
+Followups:
     - link to the follow up form, or embed in bottom of main request page
     - don't show classify link on /response/ page
     - add spec test code for followups
-    - should we quote the message we're replying to? hmmm
+    - rename get_quoted_part_of_followup
 Alert somewhere if working days table not up to date
 
 Test it works if exim is down - e.g. not accepting connections
@@ -41,12 +43,15 @@ Test that it is actually sending the request outgoing mail, by using deliveries
 Add fixtures for info_request_event
 Test sending a message to bounce/envelope-from address
 
+Show due date on, e.g.
+    http://foi.mysociety.org/request/4
+Sort by due date, show categorisation everywhere
+
+
 
 Tidying
 =======
 
-Set From: to have name of user, and set To: to have name of body etc. for all mails
-
 Add display of users to admin interface (so can find their email address out)
 Link internally between different bits of admin interface