Merge branch 'gloucester-front-end' into commercial-staging

perllib/FixMyStreet/Cobrand/FixMyStreet.pm

@@ -602,6 +602,7 @@ sub reopening_disallowed {
     return 1 if $problem->to_body_named("Merton") && $c->user_exists && (!$c->user->from_body || $c->user->from_body->get_column('name') ne "Merton Council");
     return 1 if $problem->to_body_named("Northumberland") && $c->user_exists && (!$c->user->from_body || $c->user->from_body->get_column('name') ne "Northumberland County Council");
     return 1 if $problem->to_body_named("Gloucestershire") && $c->user_exists && (!$c->user->from_body || $c->user->from_body->get_column('name') ne "Gloucestershire County Council");
+    return 1 if $problem->to_body_named("Gloucester") && $c->user_exists && (!$c->user->from_body || $c->user->from_body->get_column('name') ne "Gloucester City Council");
     return $self->next::method($problem);
 }
 

perllib/FixMyStreet/Cobrand/Gloucester.pm

@@ -46,29 +46,29 @@ sub allow_anonymous_reports { 'button' }
 =cut
 
 sub privacy_policy_url {
-    'https://www.gloucester.gov.uk/council-and-democracy/data-protection/privacy-notices/gloucester-county-council-general-privacy-statement/gloucester-county-council-general-privacy-statement/'
+    'https://www.gloucester.gov.uk/about-the-council/data-protection-and-freedom-of-information/data-protection/'
 }
 
-=item * Users can not reopen reports
+=item * Doesn't allow the reopening of reports
 
 =cut
 
-sub reopening_disallowed {
-    my ($self, $problem) = @_;
-
-    # Only staff can reopen reports.
-    my $c = $self->{c};
-    my $user = $c->user;
-    return 0 if ($c->user_exists && $user->from_body && $user->from_body->cobrand_name eq $self->council_name);
-    return 1;
-}
+sub reopening_disallowed { 1 }
 
 =item * We do not send questionnaires.
 
 =cut
 
 sub send_questionnaires { 0 }
 
+=item * Override the default text for entering a postcode or street name
+
+=cut
+
+sub enter_postcode_text {
+    return 'Enter a Gloucester postcode or street name';
+}
+
 =item * TODO: Don't show reports before the go-live date
 
 =cut

templates/web/gloucester/around/intro.html

@@ -0,0 +1,2 @@
+<h1>Report a problem on a street in your area</h1>
+<h2>You can also view other reported issues.</h2>