diff options
| -rwxr-xr-x | bin/make_emptyhomes_po | 1 | ||||
| -rw-r--r-- | perllib/CrossSell.pm | 4 | ||||
| -rw-r--r-- | templates/emails/empty property-confirm | 6 | ||||
| -rw-r--r-- | templates/emails/questionnaire-eha-26weeks | 23 | ||||
| -rw-r--r-- | templates/emails/questionnaire-eha-4weeks | 23 | ||||
| -rw-r--r-- | templates/emails/submit-eha | 25 | ||||
| -rw-r--r-- | templates/website/emptyhomes-header | 60 |
7 files changed, 78 insertions, 64 deletions
diff --git a/bin/make_emptyhomes_po b/bin/make_emptyhomes_po index 3090b9511..462af7485 100755 --- a/bin/make_emptyhomes_po +++ b/bin/make_emptyhomes_po @@ -68,6 +68,7 @@ while(<MAINPO>) { $buffer =~ s/Recently put back into use empty properties/Recent empty properties put back into use/; $buffer =~ s/New empty properties/New empty property reports/; $buffer =~ s/Older empty properties/Older empty property reports/; + $buffer =~ s/Report, view, or discuss local empty properties/Report and view empty properties/; $buffer =~ s/\(like graffiti.*\)/ /; $buffer =~ s/(Please enter your full name).*? -/$1 -/; diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm index db1afeb21..2e0fefab2 100644 --- a/perllib/CrossSell.pm +++ b/perllib/CrossSell.pm @@ -9,7 +9,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: CrossSell.pm,v 1.13 2008-10-07 16:27:34 matthew Exp $ +# $Id: CrossSell.pm,v 1.14 2008-10-08 16:57:35 matthew Exp $ # Config parameters site needs set to call these functions: # OPTION_AUTH_SHARED_SECRET @@ -147,6 +147,8 @@ EOF sub display_advert ($$;$%) { my ($q, $email, $name, %data) = @_; + return '' unless $q->{site} eq 'fixmystreet'; + if (defined $data{council} && $data{council} eq '2326') { my ($out, $ad) = display_hfyc_cheltenham_advert($email, $name); if ($out) { diff --git a/templates/emails/empty property-confirm b/templates/emails/empty property-confirm index 001afb355..8e3dc3057 100644 --- a/templates/emails/empty property-confirm +++ b/templates/emails/empty property-confirm @@ -1,9 +1,9 @@ -Subject: Confirm your empty property +Subject: Confirm your empty property report Hi <?=$values['name']?>, Please click on the link below to confirm the empty property -you just added to the site: +report you just added to the site: <?=$values['url']?> @@ -17,4 +17,4 @@ And details: <?=$values['detail']?> Yours, -The Empty Homes Agency team +The Empty Homes Agency diff --git a/templates/emails/questionnaire-eha-26weeks b/templates/emails/questionnaire-eha-26weeks new file mode 100644 index 000000000..f10e8461b --- /dev/null +++ b/templates/emails/questionnaire-eha-26weeks @@ -0,0 +1,23 @@ +Subject: Questionnaire about your empty property report + +Hi <?=$values['name']?>, + +Four weeks ago, you reported an empty home on ReportEmptyHomes.com with the +details provided at the end of this email. To keep our site up to date and +relevant, I'd be grateful if you could fill in this short questionnaire to tell +us what has happened: + + <?=$values['url']?> + +Please do not reply to this email; there is a public comment +box on the questionnaire. + +Yours, +The Empty Homes Agency + +Your report was as follows: + +<?=$values['title']?> + +<?=$values['detail']?> + diff --git a/templates/emails/questionnaire-eha-4weeks b/templates/emails/questionnaire-eha-4weeks new file mode 100644 index 000000000..a17238452 --- /dev/null +++ b/templates/emails/questionnaire-eha-4weeks @@ -0,0 +1,23 @@ +Subject: Questionnaire about your empty property report + +Hi <?=$values['name']?>, + +Six months ago, you reported an empty home on ReportEmptyHomes.com with the +details provided at the end of this email. To keep our site up to date and +relevant, I'd be grateful if you could fill in this short questionnaire to tell +us what has happened: + + <?=$values['url']?> + +Please do not reply to this email; there is a public comment +box on the questionnaire. + +Yours, +The Empty Homes Agency + +Your report was as follows: + +<?=$values['title']?> + +<?=$values['detail']?> + diff --git a/templates/emails/submit-eha b/templates/emails/submit-eha index d871406e6..4eb923d85 100644 --- a/templates/emails/submit-eha +++ b/templates/emails/submit-eha @@ -1,15 +1,27 @@ Subject: Empty property report -Dear Empty Homes Agency, +Dear Empty Property Officer, -A user of the empty property reporting website has submitted the -following report of an empty property. +This is a new referral of an empty property in your area made by a user of the +website ReportEmptyHomes.com. The website user has been told that the case has +been referred to you. I would be grateful if you could do whatever you can to +help get this property back into use. I will contact the user in a month and +again in six months and ask them what has happened to the property. -<?=$values['fuzzy']?>, or to provide an update on the report, -please visit the following link: +I'd encourage you to tell us what you have done, and when the property comes +back into use, by filling in an update against the property referral on the +website: <?=$values['url']?> +This gives useful feedback to website users and helps them understand what +action you are taking. I will offer advice to the user on other action they +might take if the property isn't successfully dealt with. + +If you would like help or advice on getting empty properties back into use +there is lots of useful information on the Empty Homes Agency's website +www.EmptyHomes.com - if you have further questions please give us a call. + <?=$values['has_photo']?>---------- Name: <?=$values['name']?> @@ -25,5 +37,6 @@ Details: <?=$values['detail']?> Replies to this email will go to the user who submitted the report, if you would like to ask for any further information. -[ This message was sent via the EHA empty property reporting website. ] +Yours, +The Empty Homes Agency diff --git a/templates/website/emptyhomes-header b/templates/website/emptyhomes-header index 75213e273..7682d0280 100644 --- a/templates/website/emptyhomes-header +++ b/templates/website/emptyhomes-header @@ -19,65 +19,17 @@ <div id="header"> <div id="logo"><img src="http://www.emptyhomes.com/siteimages/logo%20col%20300dpi%20copy.jpg" alt="Empty Homes Agency" width="350" height="91"></div> -<div id="search"> -<form method="get" action="http://www.google.com/custom"> -<input name="domains" value="www.emptyhomes.com" type="hidden"> -<p id="searchbox"><input name="q" style="width: 200px;" maxlength="255" value="" type="text"><input name="sa" value="Search" type="submit"></p> -<p> -<input name="sitesearch" value="" checked="checked" type="radio"> -<small>Web -<input name="sitesearch" value="www.emptyhomes.com" type="radio"> -www.emptyhomes.com</small></p> -<input name="client" value="pub-5676236325709660" type="hidden"> -<input name="forid" value="1" type="hidden"> -<input name="ie" value="UTF-8" type="hidden"> -<input name="oe" value="UTF-8" type="hidden"> -<input name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1;" type="hidden"> -<input name="hl" value="en" type="hidden"> - -</form> -</div> </div> <div id="smallnav"> -<a href="http://www.emptyhomes.com/">Home</a> | <a href="http://www.emptyhomes.com/contact_us.html">Contact Us</a> | <a href="http://www.emptyhomes.com/sitemap.html">Site Map</a> | <a href="http://www.emptyhomes.com/disclaimer.html">Disclaimer</a> </div> -<div id="main"><div id="left"> -<ul> -<li><a href="http://www.emptyhomes.com/aboutus/whatwedo/what_we_do.html">What We Do </a></li> -<li><a href="http://www.emptyhomes.com/rescue/buying_empties.html">Rescue An Empty Property</a> -<ol> - <li><a href="http://www.emptyhomes.com/rescue/buying_empties.html">Buying Empty Homes</a></li> - <li><a href="http://www.emptyhomes.com/rescue/owning_an_empty.html">Owning Empty Homes</a></li> - <li><a href="http://www.emptyhomes.com/rescue/campaigning_on_empties.html">Campaigning On Empty Homes</a></li> - <li><a href="/">Report an Empty Home</a> <ul> - <li><a href="/reports">All reports</a></li> - <li><a href="/alert">Local alerts</a></li> - <li><a href="/faq">Help</a></li> + <li><a href="/">Report a property</a> + <li><a href="/reports">Reports</a></li> + <li><a href="/alert">Get local reports</a></li> + <li><a href="/faq">FAQs</a></li> + <li><a href="/about">About us</a></li> </ul> - </li> -</ol></li> -<li><a href="http://www.emptyhomes.com/resources/papers_publications/publications.html">Papers & Publications </a></li> -</ul> - -<!-- -<div id="toptitle">See Also</div> -<div id="topbox"> -<ul> -<li><a href="http://www.emptyhomes.com/aboutus/hotline.html">London Empty Property Hotline</a></li> -</ul> -</div> -<div id="bottomtitle">Useful Links </div> -<div id="bottombox"> -<ul> -<li><a href="http://www.emptyhomes.com/resources/useful_contacts.html">Useful Contacts</a></li> -</ul> -</div> ---> - -</div> - -<div id="right"> </div> +<div id="main"> <div id="middle"> |