aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/help_controller.rb5
-rw-r--r--app/views/help/contact.rhtml3
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index f701d38cf..a1da642b0 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.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: help_controller.rb,v 1.5 2008-02-29 10:34:15 francis Exp $
+# $Id: help_controller.rb,v 1.6 2008-07-09 07:29:54 francis Exp $
class HelpController < ApplicationController
@@ -12,6 +12,9 @@ class HelpController < ApplicationController
end
def contact
+ @contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
+ @contact_email.gsub!(/@/, "&#64;")
+
if params[:submitted_contact_form]
if @user
params[:contact][:email] = @user.email
diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml
index 8d660ccd4..60a8af4f3 100644
--- a/app/views/help/contact.rhtml
+++ b/app/views/help/contact.rhtml
@@ -29,7 +29,8 @@
<p class="form_note">
Please read the <a href="/help/about">about page</a> first, as it may
- answer your question quicker.
+ answer your question quicker. Then fill in this form, or send
+ an email to <a href="mailto:<%=@contact_email%>"><%=@contact_email%></a>
</p>
<% if not @user %>