[Oxfordshire] Remove response days, add home page message.

3 files changed, 15 insertions, 52 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 00f099278..4b1dbc32c 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -67,6 +67,11 @@ sub problem_response_days {
     my $self = shift;
     my $p = shift;
 
+    return 'emergency' if $p->category eq 'Street lighting';
+
+    # Temporary, see https://github.com/mysociety/fixmystreetforcouncils/issues/291
+    return 0;
+
     return 10 if $p->category eq 'Bridges';
     return 10 if $p->category eq 'Carriageway Defect'; # phone if urgent
     return 10 if $p->category eq 'Debris/Spillage';
@@ -87,7 +92,6 @@ sub problem_response_days {
     return 10 if $p->category eq 'Road traffic signs';
     return 10 if $p->category eq 'Roads/highways';
     return 10 if $p->category eq 'Skips and scaffolding';
-    return 'emergency' if $p->category eq 'Street lighting';
     return 10 if $p->category eq 'Traffic lights'; # phone if urgent
     return 10 if $p->category eq 'Traffic';
     return 10 if $p->category eq 'Trees';
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index ee30e7e0b..54c6e32ea 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -185,57 +185,6 @@ subtest 'Reports are marked as inspected correctly' => sub {
     };
 };
 
-subtest 'response times messages displayed' => sub {
-    my $oxfordshire = $mech->create_body_ok(
-        2237, 'Oxfordshire County Council'
-    );
-    my $contact = $mech->create_contact_ok(
-        body_id => $oxfordshire->id,
-        category => 'Pothole',
-        email => 'pothole@example.com',
-    );
-
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ 'oxfordshire' ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->log_out_ok;
-        $mech->clear_emails_ok;
-
-        $mech->get_ok('/around');
-        $mech->submit_form_ok( {
-                with_fields => { pc => 'OX20 1SZ' }
-            },
-            "submit_location"
-        );
-
-        $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
-            "follow 'skip this step' link" );
-
-        $mech->submit_form_ok(
-            {
-                with_fields => {
-                    title         => 'Test Report',
-                    detail        => 'Test report details.',
-                    photo1        => '',
-                    username      => 'test-2@example.com',
-                    name          => 'Test User',
-                    category      => 'Pothole',
-                }
-            },
-            "submit details"
-        );
-
-        $mech->text_contains('Problems in the Pothole category are generally responded');
-        my $email = $mech->get_email;
-        ok $email, 'got and email';
-        like $mech->get_text_body_from_email, qr/Problems in the Pothole category/, 'emails contains response time message';
-        my $url = $mech->get_link_from_email($email);
-        $mech->get_ok($url);
-        $mech->text_contains('Problems in the Pothole category are generally responded')
-    };
-};
-
 END {
     done_testing();
 }
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index a1d42a777..0d3476195 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -54,6 +54,16 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 </div>
             </header>
 
+[% IF c.req.uri.path == '/' %]
+<p class="oxfordshire-preamble">
+Winter weather over the past few weeks has caused widespread damage to
+Oxfordshire’s roads. We are of course dealing with the most dangerous issues
+first but please do carry on alerting us to new ones so that we can continue to
+prioritise this work efficiently and so keep the whole county moving about its
+business as quickly as possible.
+</p>
+[% END %]
+
             [% pre_container_extra %]
 
             <div class="container">