diff options
| -rw-r--r-- | app/models/contact_mailer.rb | 4 | ||||
| -rw-r--r-- | app/views/contact_mailer/message.rhtml | 5 | ||||
| -rw-r--r-- | app/views/help/about.rhtml | 5 | ||||
| -rw-r--r-- | app/views/help/contact.rhtml | 4 | ||||
| -rw-r--r-- | app/views/layouts/contact_mailer.rhtml | 1 |
5 files changed, 10 insertions, 9 deletions
diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb index 53a87cc25..92547e2a5 100644 --- a/app/models/contact_mailer.rb +++ b/app/models/contact_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: contact_mailer.rb,v 1.1 2008-02-19 17:41:58 francis Exp $ +# $Id: contact_mailer.rb,v 1.2 2008-02-20 07:40:43 francis Exp $ class ContactMailer < ApplicationMailer @@ -13,7 +13,7 @@ class ContactMailer < ApplicationMailer @recipients = contact_from_name_and_email @subject = subject @body = { :message => message, - :request_details => "IP " + request_details + :request_details => request_details } end diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/message.rhtml index 5551a4a66..70b56941d 100644 --- a/app/views/contact_mailer/message.rhtml +++ b/app/views/contact_mailer/message.rhtml @@ -1,4 +1,5 @@ <%= @message.strip %> --- -Message sent using contact form <%= @request_details %> +--------------------------------------------------------------------- +Message sent using contact form with <%= @request_details %> +--------------------------------------------------------------------- diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index 63a44d131..0bde9c898 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -3,12 +3,11 @@ <dt>Is this site still in development?</dt> <dd>Yes, that's right. The site is currently being tested and improved. -Feel free to make a test request, and <a href="/contact">let us know</a> how you +Feel free to make a test request, and <a href="/help/contact">let us know</a> how you find it. The design and the name are not final. If you have any comments, or would like to help test by sending a request to a public body that -we don't have yet, then email +we don't have yet, then <a href="/help/contact">contact us</a>. -<a href="mailto:<%=contact_email%>"><%=contact_email%></a>. </dd> <div id="about_sidebar"> diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index ae3837875..348628b6f 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -38,9 +38,9 @@ </p> <p class="form_note"> - <strong>Notes:</strong> This is for contacting the foi.mysociety.org + <strong>Note:</strong> This is for contacting the foi.mysociety.org team only. If you are trying to send a new Freedom of Information - request, then <a href="/new">go here</a>. + request to part of the UK Government, then <a href="/new">go here</a>. </p> <div class="form_button"> diff --git a/app/views/layouts/contact_mailer.rhtml b/app/views/layouts/contact_mailer.rhtml new file mode 100644 index 000000000..ce5c18c5b --- /dev/null +++ b/app/views/layouts/contact_mailer.rhtml @@ -0,0 +1 @@ +<%= MySociety::Format.wrap_email_body(yield) %> |