diff --git a/README.textile b/README.textile index 5c4d47480..a703a7046 100644 --- a/README.textile +++ b/README.textile @@ -1,4 +1,4 @@ -PlanningAlerts.org.au - a free service which searches as many planning authority websites as it can find and emails +PlanningAlerts - a free service which searches as many planning authority websites as it can find and emails you details of applications near you Copyright (C) 2009, 2010 OpenAustralia Foundation Limited and original contributors to PlanningAlerts.com @@ -9,7 +9,7 @@ This is the code for the web application side of things written using Ruby on Ra This code is free and open-source and is licensed under the GPL v2. -PlanningAlerts.org.au is brought to you by the "OpenAustralia Foundation":http://www.openaustraliafoundation.org.au. It was adapted for Australia by Matthew Landauer and Katherine Szuminska, and is based on the UK site "PlanningAlerts.com":http://www.planningalerts.com, built by Richard Pope, Mikel Maron, Sam Smith, Duncan Parkes, Tom Hughes and Andy Armstrong. +PlanningAlerts is brought to you by the "OpenAustralia Foundation":http://www.openaustraliafoundation.org.au. It was adapted for Australia by Matthew Landauer and Katherine Szuminska, and is based on the UK site "PlanningAlerts.com":http://www.planningalerts.com, built by Richard Pope, Mikel Maron, Sam Smith, Duncan Parkes, Tom Hughes and Andy Armstrong. h3. Setting up a dev environment !https://secure.travis-ci.org/openaustralia/planningalerts-app.png?branch=master(Build Status)!:http://travis-ci.org/openaustralia/planningalerts-app !https://gemnasium.com/openaustralia/planningalerts-app.png(Dependency Status)!:https://gemnasium.com/openaustralia/planningalerts-app diff --git a/app/models/configuration.rb b/app/models/configuration.rb index 6d88a0f8b..a95ec8652 100644 --- a/app/models/configuration.rb +++ b/app/models/configuration.rb @@ -12,7 +12,7 @@ module Configuration # Email setup EMAIL_FROM_ADDRESS = 'contact@planningalerts.org.au' - EMAIL_FROM_NAME = 'PlanningAlerts.org.au' + EMAIL_FROM_NAME = 'PlanningAlerts' # Email that bounced emails go to (sets Return-Path header in outgoing email) BOUNCE_EMAIL_ADDRESS = EMAIL_FROM_ADDRESS # The email that abuse reports are sent to diff --git a/app/views/alert_notifier/_footer.text.erb b/app/views/alert_notifier/_footer.text.erb index e009b481b..4cd8da4c0 100644 --- a/app/views/alert_notifier/_footer.text.erb +++ b/app/views/alert_notifier/_footer.text.erb @@ -1,6 +1,6 @@ ============================================================ -PlanningAlerts.org.au is a free service run by the charity OpenAustralia Foundation. +PlanningAlerts is a free service run by the charity OpenAustralia Foundation. This service depends on donations from people like you for its survival. If you use this service please consider donating: http://www.openaustraliafoundation.org.au/donate/?utm_medium=email&utm_source=alerts diff --git a/app/views/comment_notifier/notify.text.erb b/app/views/comment_notifier/notify.text.erb index f27a5edd5..a51a5a809 100644 --- a/app/views/comment_notifier/notify.text.erb +++ b/app/views/comment_notifier/notify.text.erb @@ -10,8 +10,8 @@ Email of commenter: <%= @comment.email %> <%= @comment.text.html_safe %> ============================================================================= -This comment was submitted via PlanningAlerts.org.au, a free service -run by the OpenAustralia Foundation for the public good. +This comment was submitted via PlanningAlerts, a free service run by the +OpenAustralia Foundation for the public good. See <%= application_url(@comment.application) %> for more information http://www.openaustraliafoundation.org.au diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 72439915f..060f671d7 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -27,13 +27,7 @@ .container #header #banner - %h1 - = link_to root_path do - PlanningAlerts - %span<> . - org - %span<> . - au + %h1= link_to 'PlanningAlerts', root_path %h2 Email alerts of planning applications near you #statsbanner %p#stats diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 52c8f050e..445924d9d 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -11,7 +11,7 @@ %body .page .head - %h1.logo= link_to "PlanningAlerts.org.au", root_url + %h1.logo= link_to "PlanningAlerts", root_url .body= yield .foot .mobile= mobile_switcher_links diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml index d11764cd0..9b84173be 100644 --- a/app/views/static/about.html.haml +++ b/app/views/static/about.html.haml @@ -6,18 +6,18 @@ probably never find out if the old cinema or pub 5 streets away is going to be converted into luxury flats until the bulldozers turned up. %p - PlanningAlerts.org.au is a free service which searches as many planning authority websites as it can find and emails + PlanningAlerts is a free service which searches as many planning authority websites as it can find and emails you details of applications near you. The aim of this to enable shared scrutiny of what is being built (and knocked down) in peoples' communities. %p - PlanningAlerts.org.au is brought to you by the charity the + PlanningAlerts is brought to you by the charity the OpenAustralia Foundation. It was adapted for Australia by Matthew Landauer and Katherine Szuminska, and is based on the UK site PlanningAlerts.com, built by Richard Pope, Mikel Maron, Sam Smith, Duncan Parkes, Tom Hughes and Andy Armstrong. %p - PlanningAlerts.org.au keeps getting better thanks to the contributions from the volunteers: + PlanningAlerts keeps getting better thanks to the contributions from the volunteers: - contributors = [ | {:name => "Roger Barnes", :email_md5 => "dd6c985d22e3bf6ea849e8d2e6750d76"}, | {:name => "Sam Cavenagh", :email_md5 => "64afebb884d0f21f860076f4b8a92f50"}, | diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml index 783a240b7..18307766b 100644 --- a/app/views/static/faq.html.haml +++ b/app/views/static/faq.html.haml @@ -2,7 +2,7 @@ %h3= yield :page_title %dl.faq %dt - What does PlanningAlerts.org.au do? + What does PlanningAlerts do? %dd It sends you emails of any planning and development applications we find based on the address you give us when you sign up. diff --git a/spec/mailers/comment_notifier_spec.rb b/spec/mailers/comment_notifier_spec.rb index 1abaddbec..dfe83f7ea 100644 --- a/spec/mailers/comment_notifier_spec.rb +++ b/spec/mailers/comment_notifier_spec.rb @@ -39,8 +39,8 @@ It's a good thing ============================================================================= -This comment was submitted via PlanningAlerts.org.au, a free service -run by the OpenAustralia Foundation for the public good. +This comment was submitted via PlanningAlerts, a free service run by the +OpenAustralia Foundation for the public good. See http://dev.planningalerts.org.au/applications/123 for more information http://www.openaustraliafoundation.org.au diff --git a/spec/mailers/regression/email1.txt b/spec/mailers/regression/email1.txt index 9e83c0871..0f5e01e74 100644 --- a/spec/mailers/regression/email1.txt +++ b/spec/mailers/regression/email1.txt @@ -16,7 +16,7 @@ http://dev.planningalerts.org.au/applications/2?utm_medium=email&utm_source=aler ============================================================ -PlanningAlerts.org.au is a free service run by the charity OpenAustralia Foundation. +PlanningAlerts is a free service run by the charity OpenAustralia Foundation. This service depends on donations from people like you for its survival. If you use this service please consider donating: http://www.openaustraliafoundation.org.au/donate/?utm_medium=email&utm_source=alerts diff --git a/spec/mailers/regression/email2.txt b/spec/mailers/regression/email2.txt index 44b7935e5..d35887e5b 100644 --- a/spec/mailers/regression/email2.txt +++ b/spec/mailers/regression/email2.txt @@ -25,7 +25,7 @@ http://dev.planningalerts.org.au/applications/2?utm_medium=email&utm_source=aler ============================================================ -PlanningAlerts.org.au is a free service run by the charity OpenAustralia Foundation. +PlanningAlerts is a free service run by the charity OpenAustralia Foundation. This service depends on donations from people like you for its survival. If you use this service please consider donating: http://www.openaustraliafoundation.org.au/donate/?utm_medium=email&utm_source=alerts diff --git a/spec/mailers/regression/email3.txt b/spec/mailers/regression/email3.txt index 6a941b8da..97cabd413 100644 --- a/spec/mailers/regression/email3.txt +++ b/spec/mailers/regression/email3.txt @@ -16,7 +16,7 @@ http://dev.planningalerts.org.au/applications/3?utm_medium=email&utm_source=aler ============================================================ -PlanningAlerts.org.au is a free service run by the charity OpenAustralia Foundation. +PlanningAlerts is a free service run by the charity OpenAustralia Foundation. This service depends on donations from people like you for its survival. If you use this service please consider donating: http://www.openaustraliafoundation.org.au/donate/?utm_medium=email&utm_source=alerts