From 43e52e654bd03732974bf82c3df46deec274acd1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 16 May 2018 15:28:22 +0100 Subject: [Bromley] Set default show name to zero. --- perllib/FixMyStreet/Cobrand/Bromley.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index 2f47225a7..c52e871e3 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -16,6 +16,8 @@ sub base_url { return 'https://fix.bromley.gov.uk'; } +sub default_show_name { 0 } + sub disambiguate_location { my $self = shift; my $string = shift; -- cgit v1.2.3 From 8c63b0efc05a47d5d8f53fa56eac8e20069b1bbe Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 16 May 2018 15:31:54 +0100 Subject: [Bromley] Data sharing message in confirm email. --- templates/email/bromley/_problem-confirm_extra.html | 6 ++++++ templates/email/bromley/_problem-confirm_extra.txt | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 templates/email/bromley/_problem-confirm_extra.html create mode 100644 templates/email/bromley/_problem-confirm_extra.txt diff --git a/templates/email/bromley/_problem-confirm_extra.html b/templates/email/bromley/_problem-confirm_extra.html new file mode 100644 index 000000000..92605f8d2 --- /dev/null +++ b/templates/email/bromley/_problem-confirm_extra.html @@ -0,0 +1,6 @@ +

+

+By clicking validate you consent that for the purposes of investigating and +resolving the reported issue, your provided information can be shared with the +council, their contractors, partners or other organisations deemed to have +responsibility or bearing on the issue. diff --git a/templates/email/bromley/_problem-confirm_extra.txt b/templates/email/bromley/_problem-confirm_extra.txt new file mode 100644 index 000000000..1cb494de2 --- /dev/null +++ b/templates/email/bromley/_problem-confirm_extra.txt @@ -0,0 +1,4 @@ +By clicking validate you consent that for the purposes of investigating and +resolving the reported issue, your provided information can be shared with the +council, their contractors, partners or other organisations deemed to have +responsibility or bearing on the issue. -- cgit v1.2.3 From 19e292fc8b14bca8916c3e9589f2be6b4924f464 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 21 May 2018 17:41:25 +0100 Subject: Make sure site_name/signature consistent in emails --- perllib/FixMyStreet/App.pm | 2 ++ templates/email/bathnes/other-updated.txt | 2 +- templates/email/buckinghamshire/other-reported.txt | 2 +- templates/email/default/alert-confirm.txt | 10 +++++----- templates/email/default/change_email.txt | 2 +- templates/email/default/login.txt | 2 +- templates/email/default/other-reported.txt | 2 +- templates/email/default/other-updated.txt | 2 +- templates/email/default/partial.txt | 6 +++--- templates/email/default/problem-confirm-not-sending.txt | 2 +- templates/email/default/problem-confirm.txt | 2 +- templates/email/default/problem-moderated.txt | 2 +- templates/email/default/update-confirm.txt | 6 +++--- templates/email/fixamingata/alert-confirm.txt | 2 +- templates/email/fixamingata/change_email.txt | 2 +- templates/email/fixamingata/login.txt | 2 +- templates/email/fixamingata/other-reported.txt | 2 +- templates/email/fixamingata/other-updated.txt | 2 +- templates/email/fixamingata/partial.txt | 2 +- templates/email/fixamingata/problem-confirm-not-sending.txt | 4 ++-- templates/email/fixamingata/problem-confirm.txt | 4 ++-- templates/email/fixamingata/problem-moderated.txt | 2 +- templates/email/fixamingata/update-confirm.txt | 4 ++-- templates/email/fixmystreet.com/other-reported.txt | 2 +- 24 files changed, 36 insertions(+), 34 deletions(-) diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 590daa170..82fcce508 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -370,6 +370,8 @@ sub construct_email { %$extra_stash_values, additional_template_paths => \@include_path, }; + $vars->{site_name} = Utils::trim_text($c->view('Email')->render($c, 'site-name.txt', $vars)); + $vars->{signature} = $c->view('Email')->render($c, 'signature.txt', $vars); return if FixMyStreet::Email::is_abuser($c->model('DB')->schema, $vars->{to}); diff --git a/templates/email/bathnes/other-updated.txt b/templates/email/bathnes/other-updated.txt index 70290cf1e..57d5f44cf 100644 --- a/templates/email/bathnes/other-updated.txt +++ b/templates/email/bathnes/other-updated.txt @@ -13,7 +13,7 @@ Your update reads: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt index 8f5a3654f..50a879d79 100644 --- a/templates/email/buckinghamshire/other-reported.txt +++ b/templates/email/buckinghamshire/other-reported.txt @@ -23,7 +23,7 @@ And details: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt index 886b04b00..74fe7e64e 100644 --- a/templates/email/default/alert-confirm.txt +++ b/templates/email/default/alert-confirm.txt @@ -1,6 +1,6 @@ -Subject: Confirm your [% INCLUDE 'site-name.txt' | trim %] alert +Subject: Confirm your [% site_name %] alert -Please click on the link below to confirm your [% INCLUDE 'site-name.txt' | trim %] alert. +Please click on the link below to confirm your [% site_name %] alert. [% token_url %] @@ -8,11 +8,11 @@ If you can't click the link, copy and paste it to the address bar of your web browser. This confirms that you'd like to receive an email when someone makes a -[% INCLUDE 'site-name.txt' | trim %] report within your chosen area. +[% site_name %] report within your chosen area. -Email alerts are a free service from [% INCLUDE 'site-name.txt' | trim %]. +Email alerts are a free service from [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/change_email.txt b/templates/email/default/change_email.txt index 8db6b105e..3d3328b8f 100644 --- a/templates/email/default/change_email.txt +++ b/templates/email/default/change_email.txt @@ -5,7 +5,7 @@ email address on [% site_name %]. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index 9a57c4fd9..61920daf7 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -7,7 +7,7 @@ Please click on the link below to confirm your email address. Once you've done this, you'll be able to view and manage all reports and updates you've made on [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt index b626e56d9..559b0933b 100644 --- a/templates/email/default/other-reported.txt +++ b/templates/email/default/other-reported.txt @@ -21,7 +21,7 @@ And details: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/other-updated.txt b/templates/email/default/other-updated.txt index 21ea68863..5b5195f80 100644 --- a/templates/email/default/other-updated.txt +++ b/templates/email/default/other-updated.txt @@ -12,7 +12,7 @@ Your update reads: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt index fb5e17c10..ea405f0b4 100644 --- a/templates/email/default/partial.txt +++ b/templates/email/default/partial.txt @@ -1,8 +1,8 @@ -Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %] +Subject: Confirm your report on [% site_name %] Hello [% report.name || report.email %], -To confirm the report you have uploaded to [% INCLUDE 'site-name.txt' | trim %] +To confirm the report you have uploaded to [% site_name %] via [% report.service %], and to check or add any details, please visit the following URL: @@ -10,7 +10,7 @@ following URL: Thanks! -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-confirm-not-sending.txt b/templates/email/default/problem-confirm-not-sending.txt index d27b47677..06e84e6d5 100644 --- a/templates/email/default/problem-confirm-not-sending.txt +++ b/templates/email/default/problem-confirm-not-sending.txt @@ -25,7 +25,7 @@ Thank you for supporting [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index e9e7378d1..693d7a131 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -29,7 +29,7 @@ Thank you for submitting a report through [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/problem-moderated.txt b/templates/email/default/problem-moderated.txt index f69004be2..7c1c3b5c2 100644 --- a/templates/email/default/problem-moderated.txt +++ b/templates/email/default/problem-moderated.txt @@ -31,7 +31,7 @@ the team at [% report_complain_uri %] Thank you for submitting a report through [% site_name %]. -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt index 039a3bb39..669645f0a 100644 --- a/templates/email/default/update-confirm.txt +++ b/templates/email/default/update-confirm.txt @@ -1,8 +1,8 @@ -Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %] +Subject: Confirm your update on [% site_name %] Hello [% update.name %], -Please click on the link below to confirm your update on [% INCLUDE 'site-name.txt' | trim %]: +Please click on the link below to confirm your update on [% site_name %]: [% token_url %] @@ -15,7 +15,7 @@ Your update reads: [% INCLUDE 'update-confirm-donotsend.txt' %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/fixamingata/alert-confirm.txt b/templates/email/fixamingata/alert-confirm.txt index 8f17765b6..4ada66e9d 100644 --- a/templates/email/fixamingata/alert-confirm.txt +++ b/templates/email/fixamingata/alert-confirm.txt @@ -10,4 +10,4 @@ just valde att prenumerera till på FixaMinGata: Om du inte kan klicka på länken kan du kopiera den och klistra in den i adressfältet på din webbläsare. -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/change_email.txt b/templates/email/fixamingata/change_email.txt index c83c9bd3f..e59565aaf 100644 --- a/templates/email/fixamingata/change_email.txt +++ b/templates/email/fixamingata/change_email.txt @@ -5,6 +5,6 @@ e-postadress på [% site_name %]. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/login.txt b/templates/email/fixamingata/login.txt index e3d8f9f27..4aa5b9785 100644 --- a/templates/email/fixamingata/login.txt +++ b/templates/email/fixamingata/login.txt @@ -8,5 +8,5 @@ webbsidan. [% c.uri_for_action( 'auth/token', token ) %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/other-reported.txt b/templates/email/fixamingata/other-reported.txt index f530f788e..2c50c765c 100644 --- a/templates/email/fixamingata/other-reported.txt +++ b/templates/email/fixamingata/other-reported.txt @@ -21,6 +21,6 @@ Och detaljerna: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/other-updated.txt b/templates/email/fixamingata/other-updated.txt index 2010511e9..a5d9c6288 100644 --- a/templates/email/fixamingata/other-updated.txt +++ b/templates/email/fixamingata/other-updated.txt @@ -10,6 +10,6 @@ Din uppdatering: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/partial.txt b/templates/email/fixamingata/partial.txt index f29b6b914..b93942324 100644 --- a/templates/email/fixamingata/partial.txt +++ b/templates/email/fixamingata/partial.txt @@ -9,4 +9,4 @@ via [% report.service %] måste du klicka på: Tack! -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/problem-confirm-not-sending.txt b/templates/email/fixamingata/problem-confirm-not-sending.txt index 0ec162063..d631eac75 100644 --- a/templates/email/fixamingata/problem-confirm-not-sending.txt +++ b/templates/email/fixamingata/problem-confirm-not-sending.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din rapport på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din rapport på [% site_name %] Hej [% report.name %], @@ -17,6 +17,6 @@ Du har angivit följande information om problemet: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/problem-confirm.txt b/templates/email/fixamingata/problem-confirm.txt index 8d020ce5d..3db8c0b7e 100644 --- a/templates/email/fixamingata/problem-confirm.txt +++ b/templates/email/fixamingata/problem-confirm.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din rapport på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din rapport på [% site_name %] Hej [% report.name %], @@ -16,4 +16,4 @@ Du har angivit följande information om problemet: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixamingata/problem-moderated.txt b/templates/email/fixamingata/problem-moderated.txt index ad03ba421..010a0949c 100644 --- a/templates/email/fixamingata/problem-moderated.txt +++ b/templates/email/fixamingata/problem-moderated.txt @@ -28,6 +28,6 @@ Du kan se rapporten på [% report_uri %] Om du inte tycker att rapporten skulle ha blivit modererad kan du kontakta FixaMinGata:s support på [% report_complain_uri %] -[% INCLUDE 'signature.txt' %] +[% signature %] Det går inte att svara på detta mail. diff --git a/templates/email/fixamingata/update-confirm.txt b/templates/email/fixamingata/update-confirm.txt index 6670bd0ea..314870396 100644 --- a/templates/email/fixamingata/update-confirm.txt +++ b/templates/email/fixamingata/update-confirm.txt @@ -1,4 +1,4 @@ -Subject: Bekräfta din uppdatering på [% INCLUDE 'site-name.txt' | trim %] +Subject: Bekräfta din uppdatering på [% site_name %] Hej [% update.name %], @@ -14,4 +14,4 @@ Din uppdatering var: [% update.text %] -[% INCLUDE 'signature.txt' %] +[% signature %] diff --git a/templates/email/fixmystreet.com/other-reported.txt b/templates/email/fixmystreet.com/other-reported.txt index be3cc18f2..1dc8d0b44 100644 --- a/templates/email/fixmystreet.com/other-reported.txt +++ b/templates/email/fixmystreet.com/other-reported.txt @@ -23,7 +23,7 @@ And details: [% report.detail %] -[% INCLUDE 'signature.txt' %] +[% signature %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. -- cgit v1.2.3