From a47c559bb92919661dcf28bbb5648d215b81921c Mon Sep 17 00:00:00 2001
From: francis <francis>
Date: Sat, 7 Mar 2009 00:38:26 +0000
Subject: Change email warning a bit, and make a few warnings into red errors,
 rather than green notices.

---
 app/controllers/request_controller.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'app/controllers/request_controller.rb')

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 9ca1855ef..c8828c191 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: request_controller.rb,v 1.148 2009-02-27 22:32:13 francis Exp $
+# $Id: request_controller.rb,v 1.149 2009-03-07 00:38:26 francis Exp $
 
 class RequestController < ApplicationController
     
@@ -181,18 +181,20 @@ class RequestController < ApplicationController
         if params[:preview].to_i == 1
             message = ""
             if @outgoing_message.contains_email?
-                message += "<p>Your request contains an <strong>email address</strong>.</p><p>Unless the email directly relates to the subject of your request, you should remove it, as it will <strong>appear publicly on the Internet</strong>.</p>"
+                message += "<p>You've put an <strong>email address</strong> in your request.
+                            This is a warning that it will <strong>appear
+                            publicly on the Internet</strong>.</p>"
                 if @user.nil? 
-                    message += "<p>You do not need to include your email in order to get a reply, as we will ask for it on the next screen (<a href=\"/help/about#email_address\">details</a>).</p>";
+                    message += "<p>You do not need to include your own email in order to get a reply, as we will ask for it on the next screen (<a href=\"/help/about#email_address\">details</a>).</p>";
                 else
-                    message += "<p>You do not need to include your email in order to get a reply (<a href=\"/help/about#email_address\">details</a>).</p>";
+                    message += "<p>You do not need to include your own email in order to get a reply (<a href=\"/help/about#email_address\">details</a>).</p>";
                 end
             end
             if @outgoing_message.contains_postcode?
                 message += "<p>Your request contains a <strong>postcode</strong>. Unless it directly relates to the subject of your request, please remove any address as it will <strong>appear publicly on the Internet</strong>.</p>";
             end
             if not message.empty?
-                flash[:notice] = message
+                flash[:error] = message
             end
             render :action => 'preview'
             return
@@ -410,7 +412,7 @@ class RequestController < ApplicationController
 
         if !params[:submitted_followup].nil? && !params[:reedit]
             if @info_request.stop_new_responses
-                flash[:notice] = 'Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href="/help/contact">contact us</a> if you really want to send a follow up message.'
+                flash[:error] = 'Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href="/help/contact">contact us</a> if you really want to send a follow up message.'
             else
                 # See if values were valid or not
                 @outgoing_message.info_request = @info_request
-- 
cgit v1.2.3