diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/user_controller.rb | 6 | ||||
| -rw-r--r-- | app/models/application_mailer.rb | 4 | ||||
| -rw-r--r-- | app/models/incoming_message.rb | 4 | ||||
| -rw-r--r-- | app/views/help/about.rhtml | 6 | ||||
| -rw-r--r-- | app/views/help/unhappy.rhtml | 4 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 4 | ||||
| -rw-r--r-- | app/views/request_mailer/new_response.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/_signin.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/_signup.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/confirm_login.rhtml | 2 | ||||
| -rw-r--r-- | todo.txt | 3 |
12 files changed, 20 insertions, 23 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index dd27d3265..d32a852a8 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.50 2008-02-18 23:01:35 francis Exp $ +# $Id: request_controller.rb,v 1.51 2008-02-19 12:13:07 francis Exp $ class RequestController < ApplicationController @@ -139,7 +139,7 @@ class RequestController < ApplicationController flash[:notice] = "Oh no! Sorry to hear that your request was rejected. Here is what to do now." redirect_to unhappy_url elsif @info_request.calculate_status == 'successful' - flash[:notice] = "We're glad you got all the information that you wanted. Thank you for using GovernmentSpy." + flash[:notice] = "We're glad you got all the information that you wanted. Thank you for using foi.mysociety.org" # XXX quiz them here for a comment redirect_to show_request_url(:id => @info_request) elsif @info_request.calculate_status == 'partially_successful' diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 4aad19cd4..a764bdb35 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_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: user_controller.rb,v 1.24 2008-02-12 11:42:09 francis Exp $ +# $Id: user_controller.rb,v 1.25 2008-02-19 12:13:07 francis Exp $ class UserController < ApplicationController # XXX See controllers/application.rb simplify_url_part for reverse of expression in SQL below @@ -104,8 +104,8 @@ class UserController < ApplicationController @post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {}, :reason_params => { :web => "", - :email => "Then your can sign in to GovernmentSpy.", - :email_subject => "Confirm your account on GovernmentSpy" + :email => "Then your can sign in to foi.mysociety.org", + :email_subject => "Confirm your account on foi.mysociety.org" }) @post_redirect.save! params[:token] = @post_redirect.token diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index e504b88fc..9d61a16e6 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_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: application_mailer.rb,v 1.3 2008-02-13 08:12:10 francis Exp $ +# $Id: application_mailer.rb,v 1.4 2008-02-19 12:13:07 francis Exp $ class ApplicationMailer < ActionMailer::Base # Include all the functions views get, as emails call similar things. @@ -13,7 +13,7 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def contact_from_name_and_email - "GovernmentSpy <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">" + "foi.mysociety.org <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">" end end diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index b4af65d77..8d1972a50 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -18,7 +18,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.41 2008-02-16 02:36:17 francis Exp $ +# $Id: incoming_message.rb,v 1.42 2008-02-19 12:13:07 francis Exp $ # TODO @@ -107,7 +107,7 @@ class IncomingMessage < ActiveRecord::Base end text = text.gsub(self.info_request.incoming_email, "[FOI #" + self.info_request.id.to_s + " email]") text = text.gsub(self.info_request.envelope_email, "[FOI #" + self.info_request.id.to_s + " bounce email]") - text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[GovernmentSpy contact email]") + text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[foi.mysociety.org contact email]") return text end diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index f0524ea28..32cb15595 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -10,10 +10,10 @@ to a public body that we don't have yet, then email <a href="mailto:<%=contact_email%>"><%=contact_email%></a>. </dd> -<h1>Introduction to GovernmentSpy</h1> +<h1>Introduction to foi.mysociety.org</h1> <dl> -<dt>What is GovernmentSpy for?</dt> +<dt>What is foi.mysociety.org for?</dt> <dd>To help you find out inside information about what the UK government is doing.</dd> @@ -37,7 +37,7 @@ are done badly, and to celebrate the things that are done well. <dt>Who makes it?</dt> -<dd>GovernmentSpy is made by <a href="http://www.mysociety.org">mySociety</a>, +<dd>foi.mysociety.org is made by <a href="http://www.mysociety.org">mySociety</a>, and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the registered charity <a href="http://www.ukcod.org.uk/UK_Citizens_Online_Democracy">UK Citizens Online Democracy</a>. If you like what we're doing, then you can diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml index a76b2c93c..999ecc57a 100644 --- a/app/views/help/unhappy.rhtml +++ b/app/views/help/unhappy.rhtml @@ -25,7 +25,7 @@ internal review. <p>You should be able to find the email address for this by searching the website of the public body. If you filed your request using -GovernmentSpy, you can include a link to the page about your request, so the +foi.mysociety.org, you can include a link to the page about your request, so the internal review has easy access to all the relevant correspondence. </p> @@ -46,7 +46,7 @@ then you can complain to the Information Commisioner. To do this read <a href="http://www.ico.gov.uk/complaints/freedom_of_information.aspx">Complaints about Freedom of Information</a> on the Information Commisioner's website. -<p>Again, you can include a link to your request on GovernmentSpy, or print +<p>Again, you can include a link to your request on foi.mysociety.org, or print out the whole page of your request, to make it easy to send the relevant information to the Information Commissioner. diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 8ca1ce51f..238f49667 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -2,13 +2,13 @@ <html lang="en-gb"> <head> <!-- <script type="text/javascript" src="/js.js"></script> --> - <title><%=@title%> <%= @title ? "-" : "" %> GovernmentSpy</title> + <title><%=@title%> <%= @title ? "-" : "" %> foi.mysociety.org</title> <%= stylesheet_link_tag 'main' %> </head> <body> <div id="header"> <h1> - <a href="/">GovernmentSpy</a> + <a href="/">foi.mysociety.org</a> <span id="beta">(<%= link_to "in development", about_url %>)</span> </h1> <div id="tagline">It's your information. Free it from them.</div> diff --git a/app/views/request_mailer/new_response.rhtml b/app/views/request_mailer/new_response.rhtml index 028fb4138..6c539bce2 100644 --- a/app/views/request_mailer/new_response.rhtml +++ b/app/views/request_mailer/new_response.rhtml @@ -8,6 +8,6 @@ To view the response, click on the link below. When you get there, let us know if the response contains any useful information. --- the GovernmentSpy.com team +-- the foi.mysociety.org team diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 0d129645a..b4d0dda31 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %> <%= foi_error_messages_for :user_signin %> - <h2>If you've used GovernmentSpy before</h2> + <h2>If you've used foi.mysociety.org before</h2> <p> <label class="form_label" for="user_signin_email">Your e-mail:</label> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 330d22f0a..787afe7f1 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2>If you're new to GovernmentSpy</h2> + <h2>If you're new to foi.mysociety.org</h2> <p> <label class="form_label" for="user_signup_email">Your e-mail:</label> diff --git a/app/views/user_mailer/confirm_login.rhtml b/app/views/user_mailer/confirm_login.rhtml index 0c58905a8..17a581738 100644 --- a/app/views/user_mailer/confirm_login.rhtml +++ b/app/views/user_mailer/confirm_login.rhtml @@ -8,4 +8,4 @@ Please click on the link below to confirm your email address. We will never give away or sell your email address to anyone else without your permission. --- the GovernmentSpy.com team +-- the foi.mysociety.org team @@ -39,9 +39,6 @@ Go through all requests and check status is shiny Next ==== -"By law, you should get a response before the end of 23 January 2008." message needs updating -if that is in the future. - Consider on staging sites making follow ups go to dummy address also Put the admin "Public page" link on request page somewhere clearer |