aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/request_controller.rb6
-rw-r--r--app/controllers/user_controller.rb10
-rw-r--r--app/models/application_mailer.rb4
-rw-r--r--app/models/incoming_message.rb4
-rw-r--r--app/views/help/about.rhtml6
-rw-r--r--app/views/help/contact.rhtml4
-rw-r--r--app/views/help/unhappy.rhtml8
-rw-r--r--app/views/layouts/default.rhtml6
-rw-r--r--app/views/request/show.rhtml2
-rw-r--r--app/views/request_mailer/new_response.rhtml2
-rw-r--r--app/views/request_mailer/overdue_alert.rhtml2
-rw-r--r--app/views/user/_signin.rhtml2
-rw-r--r--app/views/user/_signup.rhtml2
-rw-r--r--app/views/user_mailer/already_registered.rhtml4
-rw-r--r--app/views/user_mailer/confirm_login.rhtml2
15 files changed, 32 insertions, 32 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 817fc2fdf..885e1fcc1 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.62 2008-02-28 14:14:47 francis Exp $
+# $Id: request_controller.rb,v 1.63 2008-02-28 14:25:51 francis Exp $
class RequestController < ApplicationController
@@ -193,7 +193,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 foi.mysociety.org"
+ flash[:notice] = "We're glad you got all the information that you wanted. Thank you for using WhatDoTheyKnow."
# XXX quiz them here for a comment
redirect_to show_request_url(:url_title => @info_request.url_title)
elsif @info_request.calculate_status == 'partially_successful'
@@ -204,7 +204,7 @@ class RequestController < ApplicationController
flash[:notice] = "Please write your follow up message containing the necessary clarifications below."
redirect_to show_response_url(:id => @info_request.id, :incoming_message_id => @events_needing_description[-1].params[:incoming_message_id])
elsif @info_request.calculate_status == 'requires_admin'
- flash[:notice] = "Thanks! The foi.mysociety.org team have been notified."
+ flash[:notice] = "Thanks! The WhatDoTheyKnow team have been notified."
redirect_to show_request_url(:url_title => @info_request.url_title)
else
raise "unknown calculate_status " + @info_request.calculate_status
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 954d44b17..03b93db6f 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.32 2008-02-28 12:29:43 francis Exp $
+# $Id: user_controller.rb,v 1.33 2008-02-28 14:25:51 francis Exp $
class UserController < ApplicationController
# Show page about a set of users with same url name
@@ -125,8 +125,8 @@ class UserController < ApplicationController
post_redirect = PostRedirect.new(:uri => url , :post_params => {},
:reason_params => {
:web => "",
- :email => "Then your can change your password on foi.mysociety.org",
- :email_subject => "Change your password on foi.mysociety.org"
+ :email => "Then your can change your password on WhatDoTheyKnow.com",
+ :email_subject => "Change your password on WhatDoTheyKnow.com"
})
post_redirect.user = user_signchange
post_redirect.save!
@@ -179,8 +179,8 @@ class UserController < ApplicationController
@post_redirect = PostRedirect.new(:uri => params[:r], :post_params => {},
:reason_params => {
:web => "",
- :email => "Then your can sign in to foi.mysociety.org",
- :email_subject => "Confirm your account on foi.mysociety.org"
+ :email => "Then your can sign in to WhatDoTheyKnow.com",
+ :email_subject => "Confirm your account on WhatDoTheyKnow.com"
})
@post_redirect.save!
params[:token] = @post_redirect.token
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb
index 71cc96ead..d41c68dfc 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.5 2008-02-20 12:51:29 francis Exp $
+# $Id: application_mailer.rb,v 1.6 2008-02-28 14:25:51 francis Exp $
class ApplicationMailer < ActionMailer::Base
# Include all the functions views get, as emails call similar things.
@@ -15,7 +15,7 @@ class ApplicationMailer < ActionMailer::Base
self.raise_delivery_errors = true
def contact_from_name_and_email
- "foi.mysociety.org <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">"
+ "WhatDoTheyKnow <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">"
end
end
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index d91df8989..b3560e006 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.47 2008-02-27 14:01:30 francis Exp $
+# $Id: incoming_message.rb,v 1.48 2008-02-28 14:25:51 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'), "[foi.mysociety.org contact email]")
+ text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[WhatDoTheyKnow contact email]")
return text
end
diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml
index afd4443f9..b10aba32f 100644
--- a/app/views/help/about.rhtml
+++ b/app/views/help/about.rhtml
@@ -9,10 +9,10 @@ something about the site, <a href="/help/contact">contact&nbsp;us</a>.
</p>
</div>
-<h1>Introduction to foi.mysociety.org</h1>
+<h1>Introduction to WhatDoTheyKnow</h1>
<dl>
-<dt>What is foi.mysociety.org for?</dt>
+<dt>What is WhatDoTheyKnow for?</dt>
<dd>To help you find out inside information about what the UK government
is doing.</dd>
@@ -36,7 +36,7 @@ are done badly, and to celebrate the things that are done well.
</dd>
<dt>Who makes it?</dt>
-<dd>foi.mysociety.org is made by <a href="http://www.mysociety.org">mySociety</a>,
+<dd>WhatDoTheyKnow 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/contact.rhtml b/app/views/help/contact.rhtml
index 2d37d4c57..0f122cd70 100644
--- a/app/views/help/contact.rhtml
+++ b/app/views/help/contact.rhtml
@@ -5,7 +5,7 @@
<% form_for :contact do |f| %>
<div class="form_note">
- <h1>Contact foi.mysociety.org team</h1>
+ <h1>Contact the WhatDoTheyKnow team</h1>
</div>
<p class="form_note">
@@ -40,7 +40,7 @@
</p>
<p class="form_note">
- <strong>Note:</strong> This is for contacting the foi.mysociety.org
+ <strong>Note:</strong> This is for contacting the WhatDoTheyKnow
team only. If you are trying to send a new Freedom of Information
request to part of the UK Government, then <a href="/new">go here</a>.
</p>
diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml
index 999ecc57a..f36433ab9 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
-foi.mysociety.org, you can include a link to the page about your request, so the
+WhatDoTheyKnow, 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,9 +46,9 @@ 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 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.
+<p>Again, you can include a link to your request on WhatDoTheyKnow, 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 e6c1b2851..9b8104ea9 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -3,17 +3,17 @@
<head>
<%= javascript_include_tag :defaults %>
<script type="text/javascript" src="/jslib/spell/spellChecker.js"></script>
- <title><%=@title%> <%= @title ? "-" : "" %> foi.mysociety.org</title>
+ <title><%=@title%> <%= @title ? "-" : "" %> WhatDoTheyKnow</title>
<%= stylesheet_link_tag 'main' %>
</head>
<body>
<div id="header">
<h1>
- <a href="/">foi.mysociety.org</a>
+ <a href="/">WhatDoTheyKnow</a>
<span id="beta">(<%= link_to "in development", about_url %>)</span>
</h1>
<div id="tagline">
- Request and explore UK Government information
+ Lift the lid on the UK public sector!
</div>
</div>
<ul id="navigation">
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index e98aabb70..821e5974b 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -52,7 +52,7 @@
<%= link_to "sign in", signin_url(:r => request.request_uri) %> to send a follow up message.
<% end %>
<% elsif @status == 'requires_admin' %>
- This request has had an unusual response, and <strong>requires attention</strong> from the foi.mysociety.org team.
+ This request has had an unusual response, and <strong>requires attention</strong> from the WhatDoTheyKnow team.
<% else %>
<% raise "unknown status " + @status %>
<% end %>
diff --git a/app/views/request_mailer/new_response.rhtml b/app/views/request_mailer/new_response.rhtml
index 6c539bce2..947558c4d 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 foi.mysociety.org team
+-- the WhatDoTheyKnow team
diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml
index 2a0847220..019bbae4e 100644
--- a/app/views/request_mailer/overdue_alert.rhtml
+++ b/app/views/request_mailer/overdue_alert.rhtml
@@ -8,6 +8,6 @@ Click on the link below to send a message to <%= @info_request.public_body.name
<%=@url%>
--- the foi.mysociety.org team
+-- the WhatDoTheyKnow team
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 4b06b7e05..aefcde17e 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 foi.mysociety.org before</h2>
+ <h2>If you've used WhatDoTheyKnow 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 787afe7f1..14bf360ca 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 foi.mysociety.org</h2>
+ <h2>If you're new to WhatDoTheyKnow</h2>
<p>
<label class="form_label" for="user_signup_email">Your e-mail:</label>
diff --git a/app/views/user_mailer/already_registered.rhtml b/app/views/user_mailer/already_registered.rhtml
index 14dee6d97..165df469c 100644
--- a/app/views/user_mailer/already_registered.rhtml
+++ b/app/views/user_mailer/already_registered.rhtml
@@ -1,6 +1,6 @@
<%= @name %>,
-You just tried to sign up to foi.mysociety.org, when you
+You just tried to sign up to WhatDoTheyKnow.com, when you
already have an account. Your name and password have been
left as they previously were.
@@ -8,4 +8,4 @@ Please click on the link below. <%=@reasons[:email]%>
<%=@url%>
--- the foi.mysociety.org team
+-- the WhatDoTheyKnow team
diff --git a/app/views/user_mailer/confirm_login.rhtml b/app/views/user_mailer/confirm_login.rhtml
index 17a581738..8a2525ba9 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 foi.mysociety.org team
+-- the WhatDoTheyKnow team
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-28 09:46:24 +0000