aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2009-10-04 21:59:10 +0000
committerfrancis <francis>2009-10-04 21:59:10 +0000
commit6ee71c76ed9ca3b0c7e14ffa463348b815b68cfa (patch)
tree4fa844f673a227c54a30c1c6de162b2dde36cced
parentf3de94d4ad38cf753e66eb296d5489fcf60b5e57 (diff)
Fix formatting of the outgoing mailers as use different wrapping.
-rw-r--r--app/views/outgoing_mailer/followup.rhtml10
-rw-r--r--app/views/outgoing_mailer/initial_request.rhtml14
2 files changed, 9 insertions, 15 deletions
diff --git a/app/views/outgoing_mailer/followup.rhtml b/app/views/outgoing_mailer/followup.rhtml
index eacf24617..c7ec02703 100644
--- a/app/views/outgoing_mailer/followup.rhtml
+++ b/app/views/outgoing_mailer/followup.rhtml
@@ -3,13 +3,11 @@
<%= @outgoing_message.quoted_part_to_append_to_email.strip %>
-------------------------------------------------------------------
+Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:
+http://www.whatdotheyknow.com/help/about#officers
+
Please use this email address for all replies to this request:
<%= @info_request.incoming_email %>
-Disclaimer: This message and any reply that you make will be
-published on the internet. Our privacy and copyright policies:
-http://www.whatdotheyknow.com/help/about#officers
-
-If you find WhatDoTheyKnow useful as an FOI officer, please ask
-your web manager to suggest us on your organisation's FOI page.
+If you find WhatDoTheyKnow useful as an FOI officer, please ask your web manager to suggest us on your organisation's FOI page.
-------------------------------------------------------------------
diff --git a/app/views/outgoing_mailer/initial_request.rhtml b/app/views/outgoing_mailer/initial_request.rhtml
index 7c16dfd90..b2dce81e7 100644
--- a/app/views/outgoing_mailer/initial_request.rhtml
+++ b/app/views/outgoing_mailer/initial_request.rhtml
@@ -1,18 +1,14 @@
<%= @outgoing_message.body.strip %>
-------------------------------------------------------------------
+Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:
+http://www.whatdotheyknow.com/help/about#officers
+
Please use this email address for all replies to this request:
<%= @info_request.incoming_email %>
-Disclaimer: This message and any reply that you make will be
-published on the internet. Our privacy and copyright policies:
-http://www.whatdotheyknow.com/help/about#officers
-
-Is <%= @info_request.public_body.request_email%> the wrong address
-for <%= @info_request.law_used_full %> requests to <%= @info_request.public_body.name%>?
-If so please contact us using this form:
+Is <%= @info_request.public_body.request_email%> the wrong address for <%= @info_request.law_used_full %> requests to <%= @info_request.public_body.name%>? If so please contact us using this form:
http://www.whatdotheyknow.com/help/contact
-If you find WhatDoTheyKnow useful as an FOI officer, please ask
-your web manager to suggest us on your organisation's FOI page.
+If you find WhatDoTheyKnow useful as an FOI officer, please ask your web manager to suggest us on your organisation's FOI page.
-------------------------------------------------------------------