4 files changed, 35 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index a222b950d..12b48a99b 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -23,7 +23,7 @@ FixMyStreet::App::Controller::Report::New
 
 =head1 DESCRIPTION
 
-Create a new report, or complete a partial one .
+Create a new report, or complete a partial one.
 
 =head1 PARAMETERS
 
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 242194e01..97b4c3c8b 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -1,5 +1,36 @@
 package FixMyStreet::Cobrand::FixMyStreet;
 use base 'FixMyStreet::Cobrand::Default';
 
+# FixMyStreet should return all cobrands
+sub restriction {
+    return {};
+}
+
+sub generate_problem_banner {
+    my ( $self, $problem ) = @_;
+
+    my $banner = {};
+    if ( $problem->is_open && time() - $problem->lastupdate_local->epoch > 8 * 7 * 24 * 60 * 60 )
+    {
+        $banner->{id}   = 'unknown';
+        $banner->{text} = _('Unknown');
+    }
+    if ($problem->is_fixed) {
+        $banner->{id} = 'fixed';
+        $banner->{text} = _('Fixed');
+    }
+    if ($problem->is_closed) {
+        $banner->{id} = 'closed';
+        $banner->{text} = _('Closed');
+    }
+
+    if ( grep { $problem->state eq $_ } ( 'investigating', 'in progress', 'planned' ) ) {
+        $banner->{id} = 'progress';
+        $banner->{text} = _('In progress');
+    }
+
+    return $banner;
+}
+
 1;
 
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 9aaa8eca0..570c90c46 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -1,5 +1,5 @@
 package FixMyStreet::Cobrand::UKCouncils;
-use base 'FixMyStreet::Cobrand::FixMyStreet';
+use base 'FixMyStreet::Cobrand::Default';
 
 use strict;
 use warnings;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 185b59daa..a8cbc98f2 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -224,6 +224,7 @@ sub form_errors {
     my $mech   = shift;
     my $result = scraper {
         process 'div.form-error', 'errors[]', 'TEXT';
+        process 'p.form-error', 'errors[]', 'TEXT';
     }
     ->scrape( $mech->response );
     return $result->{errors} || [];
@@ -365,6 +366,7 @@ sub extract_problem_banner {
 
     my $result = scraper {
         process 'div#side > p.banner', id => '@id', text => 'TEXT';
+        process 'div.banner > p', id => '@id', text => 'TEXT';
     }
     ->scrape( $mech->response );