diff options
22 files changed, 44 insertions, 49 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 3d9f0a511..6ccc801ce 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -319,6 +319,16 @@ sub send_email_cron { unpack('h*', random_bytes(5, 1)) ); + $params->{_parameters_}->{signature} = ''; + #$params->{_parameters_}->{signature} = $c->view('Email')->render( + # $c, 'signature.txt', { + # additional_template_paths => [ + # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker, $c->stash->{lang_code} )->stringify, + # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker )->stringify, + # ] + # } + #); + my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) }; if ( FixMyStreet->test_mode ) { diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 37ff1ae76..daaaca499 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -595,8 +595,9 @@ sub setup_categories_and_councils : Private { } if (@category_options) { - @category_options = - ( _('-- Pick a category --'), @category_options, _('Other') ); + @category_options = ( _('-- Pick a category --'), @category_options ); + push @category_options, _('Other') + unless $first_council->{id} == 2482; $category_label = _('Category'); } } diff --git a/templates/email/bromley/questionnaire.txt b/templates/email/bromley/questionnaire.txt index 7cdc10131..4328479e1 100644 --- a/templates/email/bromley/questionnaire.txt +++ b/templates/email/bromley/questionnaire.txt @@ -11,9 +11,7 @@ updating the status of your problem: This email has been sent automatically from an unmonitored mailbox, please do not reply. -Customer Service Centre -London Borough of Bromley -Email: csc@bromley.gov.uk +[% INCLUDE 'signature.txt' %] Your problem was as follows: diff --git a/templates/email/bromley/signature.txt b/templates/email/bromley/signature.txt new file mode 100644 index 000000000..776ba3527 --- /dev/null +++ b/templates/email/bromley/signature.txt @@ -0,0 +1,3 @@ +Customer Service Centre +London Borough of Bromley +Email: csc@bromley.gov.uk diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt index fae3f2963..89ca7864e 100644 --- a/templates/email/default/alert-confirm.txt +++ b/templates/email/default/alert-confirm.txt @@ -10,5 +10,4 @@ asked to subscribe to on FixMyStreet: If you can't click the link, please copy and paste it to the address bar of your web browser. -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt index 8c41aaf5e..3696c87d4 100644 --- a/templates/email/default/alert-problem-area.txt +++ b/templates/email/default/alert-problem-area.txt @@ -5,8 +5,7 @@ The following new problems have been added within <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems in <?=$values['area_name']?>, please follow this link: diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt index 572e057a6..5544a2043 100644 --- a/templates/email/default/alert-problem-council.txt +++ b/templates/email/default/alert-problem-council.txt @@ -4,8 +4,7 @@ The following new problems have been reported to <?=$values['area_name']?>: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems reported to <?=$values['area_name']?>, please follow this link: diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt index 0bf8483a7..0c88dab5a 100644 --- a/templates/email/default/alert-problem-nearby.txt +++ b/templates/email/default/alert-problem-nearby.txt @@ -4,8 +4,7 @@ The following nearby problems have been added: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are nearby problems, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt index efcf15993..9793bcdac 100644 --- a/templates/email/default/alert-problem-ward.txt +++ b/templates/email/default/alert-problem-ward.txt @@ -5,8 +5,7 @@ within <?=$values['ward_name']?>: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?>, diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt index 8369b8e28..01e184e0a 100644 --- a/templates/email/default/alert-problem.txt +++ b/templates/email/default/alert-problem.txt @@ -4,8 +4,7 @@ The following new problems have been added: <?=$values['data']?> -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new problems, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt index ac0ddd50a..1140de1fa 100644 --- a/templates/email/default/alert-update.txt +++ b/templates/email/default/alert-update.txt @@ -11,8 +11,7 @@ To view or reply to these updates, please visit the following URL: You cannot contact anyone by replying to this email. -Yours, -The FixMyStreet team +<?=$values['signature']?> To stop receiving emails when there are new updates on this problem, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index d24f1cc4f..608d99ee9 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -5,6 +5,5 @@ able to view your problem reports and manage them more easily. [% c.uri_for_action( 'auth/token', token ) %] -Yours, -The FixMyStreet.com team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt index 279d76ea0..82bc0cf0e 100644 --- a/templates/email/default/partial.txt +++ b/templates/email/default/partial.txt @@ -10,5 +10,4 @@ please visit the following URL: Thanks! -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index 58c1c75d1..194b4c30f 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -16,5 +16,4 @@ Your problem had the title: And details: [% report.detail %] -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt index 7ff184c41..88d4cc1b5 100644 --- a/templates/email/default/questionnaire.txt +++ b/templates/email/default/questionnaire.txt @@ -13,8 +13,7 @@ updating the status of your problem: Please do not reply to this email; there is a public comment box on the questionnaire. -Yours, -The FixMyStreet team +<?=$values['signature']?> Your problem was as follows: diff --git a/templates/email/default/reply-autoresponse b/templates/email/default/reply-autoresponse index 672c1f3c9..cdd7288ed 100644 --- a/templates/email/default/reply-autoresponse +++ b/templates/email/default/reply-autoresponse @@ -19,5 +19,4 @@ unsubscribe link at the bottom of the email. If you have a question or comment about the site, please send your email to team@fixmystreet.com -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/email/default/signature.txt b/templates/email/default/signature.txt new file mode 100644 index 000000000..69ee38767 --- /dev/null +++ b/templates/email/default/signature.txt @@ -0,0 +1,2 @@ +Yours, +The FixMyStreet team diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt index 4b3e20968..7936af568 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/default/submit-brent.txt @@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?> Replies to this email will go to the user who submitted the problem. -Yours, -The FixMyStreet team +<?=$values['signature']?> This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 20fa17096..d40c5f055 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?> Replies to this email will go to the user who submitted the problem. -Yours, -The FixMyStreet team +<?=$values['signature']?> This message was sent via FixMyStreet, a project of UKCOD, registered charity number 1076346. If there is a more appropriate email address for messages about diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt index c7571e76c..2ed152fde 100644 --- a/templates/email/default/update-confirm.txt +++ b/templates/email/default/update-confirm.txt @@ -14,5 +14,4 @@ Your update reads: [% update.text %] -Yours, -The FixMyStreet team +[% INCLUDE 'signature.txt' %] diff --git a/templates/web/bromley/tokens/confirm_problem.html b/templates/web/bromley/tokens/confirm_problem.html deleted file mode 100644 index d002cc262..000000000 --- a/templates/web/bromley/tokens/confirm_problem.html +++ /dev/null @@ -1,13 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Confirmation') %] - -<h1>[% loc('Confirmation') %]</h1> - -<p class="confirmed"> -Thank you. You have successfully confirmed your report -and this will now be investigated by the council. -You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on this site</a>. -</p> - -<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html index 756958380..1e3c6c535 100644 --- a/templates/web/default/tokens/confirm_problem.html +++ b/templates/web/default/tokens/confirm_problem.html @@ -1,8 +1,16 @@ -[% INCLUDE 'header.html', title => loc('Confirmation') %] +[% INCLUDE 'header.html', title = loc('Confirmation') %] <h1>[% loc('Confirmation') %]</h1> <p class="confirmed"> +[% IF c.cobrand.is_council %] +Thank you. You have successfully confirmed your report +and this will now be investigated by the council. +You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on this site</a>. +</p> + +<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. +[% ELSE %] [% loc('You have successfully confirmed your problem'); @@ -15,6 +23,7 @@ c.uri_for( '/report', problem.id ) ); %] +[% END %] </p> [% display_crosssell_advert( problem.user.email, problem.name ) %] |