Merge remote-tracking branch 'origin/master'

8 files changed, 24 insertions, 27 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index f7d885da2..4f2535437 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -27,6 +27,9 @@ sub site_title {
     my ($self) = @_;
     return "London Borough of Bromley - Report a problem in Bromley\x{2019}s streets or parks";
 }
+sub site_name {
+    return 'Bromley FixMyStreet';
+}
 
 sub disambiguate_location {
     my $self = shift;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 7a82d728d..b69bb0f99 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -351,6 +351,16 @@ Return the title to be used in page heads.
 
 sub site_title { 'FixMyStreet' }
 
+=head2 site_name
+
+Return short name for use in emails.
+
+=cut
+sub site_name {
+    my $self = shift;
+    $self->site_title;
+}
+
 =head2 map_type
 
 Return an override type of map if necessary.
diff --git a/templates/email/bromley/problem-confirm.txt b/templates/email/bromley/problem-confirm.txt
deleted file mode 100644
index 1c120845c..000000000
--- a/templates/email/bromley/problem-confirm.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Confirm your problem on FixMyStreet
-
-Hi [% report.name %],
-
-Please click on the link below to confirm the problem you just
-added to FixMyStreet:
-
-[% token_url %]
-
-If your email program does not let you click on this link,
-copy and paste it into your web browser and press return.
-
-Your problem had the title:
-[% report.title %]
-
-And details:
-[% report.detail %]
-
-Yours,  
-Bromley Council
diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt
index 89ca7864e..abf7801f5 100644
--- a/templates/email/default/alert-confirm.txt
+++ b/templates/email/default/alert-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Confirm your alert on FixMyStreet
+Subject: Confirm your alert on [% c.cobrand.site_name %]
 
 Hi,
 
 Please click on the link below to confirm the alert you just
-asked to subscribe to on FixMyStreet:
+asked to subscribe to on [% c.cobrand.site_name %]:
 
     [% token_url %]
 
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index 194b4c30f..5f5bd511a 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Confirm your problem on FixMyStreet
+Subject: Confirm your problem on [% c.cobrand.site_name %]
 
 Hi [% report.name %],
 
 Please click on the link below to confirm the problem you just
-added to FixMyStreet:
+added to [% c.cobrand.site_name %]:
 
 [% token_url %]
 
diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt
index 2ed152fde..fdcd68edb 100644
--- a/templates/email/default/update-confirm.txt
+++ b/templates/email/default/update-confirm.txt
@@ -1,4 +1,4 @@
-Subject: Confirm your update on FixMyStreet
+Subject: Confirm your update on [% c.cobrand.site_name %]
 
 Hi [% update.name %],
 
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index 7a17adbc7..2a65a3e3e 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -15,7 +15,7 @@
     [%- ELSIF update.user.from_council;
         user_name = update.user.name | html;
         council = update.user.council;
-        IF c.cobrand.moniker == 'bromley';
+        IF council == 'Bromley Council';
             council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>";
         END %]
         [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%]
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 369a0c2b2..515d5c693 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -57,7 +57,11 @@
 
     [% IF c.cobrand.moniker != 'emptyhomes' %]
     <div class="general-sidebar-notes">
-        <p>[% loc( 'Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</p>
+        <p>
+        [% IF problem.council != '2482' OR problem.send_method_used != 'Open311' %]
+            [% loc( 'Please note that updates are not sent to the council.' ) %]
+        [% END %]
+        [% loc( 'Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</p>
     </div>
     [% END %]