diff options
| m--------- | commonlib | 0 | ||||
| -rwxr-xr-x | templates/website/faq.html | 7 | ||||
| -rwxr-xr-x | web/alert.cgi | 4 | ||||
| -rwxr-xr-x | web/index.cgi | 18 |
4 files changed, 18 insertions, 11 deletions
diff --git a/commonlib b/commonlib -Subproject 3de0fb3a8ba82110e2d4fc01d6e11455a9b0296 +Subproject b1db274c894f3ddce98632dc21f1d5649d749d8 diff --git a/templates/website/faq.html b/templates/website/faq.html index aac68d327..62cb72def 100755 --- a/templates/website/faq.html +++ b/templates/website/faq.html @@ -128,6 +128,13 @@ unless we are obliged to by law. Your name will not be published anywhere unless problem you’ve reported, and send you a questionnaire email four weeks after you submit a problem, asking for a status update; we’ll only ever send you emails in relation to your problem.</dd> + <dt>What's this about the Guardian?</dt> + <dd>mySociety and the Guardian are working together to provide local versions of +FixMyStreet in Leeds, Edinburgh and Cardiff as part of the Guardian Local project. If you submit a problem or +provide an update in one of those cities, administrators from both mySociety and the Guardian will be able to see your +details. They will never use them for anything other than to help administer FixMyStreet, in accordance with this privacy +policy, and the Guardian's <a href="http://users.guardian.co.uk/help/article/0,,933905,00.html">privacy policy</a>. + </dd> </dl> <h2>Organisation Questions</h2> <dl> diff --git a/web/alert.cgi b/web/alert.cgi index 61a6fe7c2..59b6607a4 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -40,6 +40,10 @@ sub main { Thank you for trying to confirm your alert. We seem to have an error ourselves though, so <a href="%s">please let us know what went on</a> and we'll look into it. EOF + my %vars = (error => $out); + my $cobrand_page = Page::template_include('error', $q, Page::template_root($q), %vars); + $out = $cobrand_page if $cobrand_page; + } } elsif ($q->param('rss')) { $out = alert_rss($q); diff --git a/web/index.cgi b/web/index.cgi index d4141c1f5..66680e603 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -751,17 +751,7 @@ EOF $vars{photo_field} = $photo_input; } - if ($q->{site} eq 'scambs') { - $vars{text_notes} = <<EOF; -<p>Please note:</p> -<ul> -<li>Please be polite, concise and to the point.</li> -<li>Please do not be abusive.</li> -<li>Writing your message entirely in block capitals makes it hard to read, -as does a lack of punctuation.</li> -</ul> -EOF - } elsif ($q->{site} ne 'emptyhomes') { + if ($q->{site} ne 'emptyhomes') { $vars{text_notes} = <<EOF; <p>Please note:</p> <ul> @@ -775,6 +765,12 @@ as does a lack of punctuation.</li> problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.</li> +<li> +FixMyStreet and the Guardian are providing this service in +partnership in <a href="faq#privacy">certain cities</a>. In those cities, both have access to +any information submitted, including names and email addresses, and will use it only to ensure the +smooth running of the service, in accordance with their privacy policies. +</li> </ul> EOF } |