diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/My.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Bexley.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/report_inspect.t | 2 | ||||
| -rw-r--r-- | t/cobrand/bucks.t | 2 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.html | 5 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.txt | 5 | ||||
| -rw-r--r-- | templates/web/tfl/contact/_footer.html | 0 | ||||
| -rw-r--r-- | web/cobrands/eastherts/layout.scss | 8 |
8 files changed, 14 insertions, 16 deletions
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index efb770f70..1230bfcae 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -57,12 +57,12 @@ sub inspector_redirect : Local : Args(0) { my ( $self, $c ) = @_; my $categories = $c->user->categories_string; - my $area_ids = $c->user->area_ids; + my $area_ids = $c->user->area_ids || []; my $body = $c->user->from_body; - $c->detach('/page_error_404_not_found') unless $body && ($categories || $area_ids); + $c->detach('/page_error_404_not_found') unless $body && ($categories || @$area_ids); - if ($area_ids) { + if (@$area_ids) { my $ids_string = join ",", @$area_ids; my $areas = mySociety::MaPit::call('areas', [ $ids_string ]); $c->stash->{wards} = [ values %$areas ]; diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm index ae15900d6..5a382e262 100644 --- a/perllib/FixMyStreet/Cobrand/Bexley.pm +++ b/perllib/FixMyStreet/Cobrand/Bexley.pm @@ -241,7 +241,7 @@ sub _get_bank_holiday_json { $js = $cache_file->slurp_utf8; } else { $ua->timeout(5); - $js = get("https://www.gov.uk/$file"); + $js = LWP::Simple::get("https://www.gov.uk/$file"); # uncoverable branch false $js = decode_utf8($js) if !utf8::is_utf8($js); if ($js && !FixMyStreet->config('STAGING_SITE')) { diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t index afd8d6d17..aeb344922 100644 --- a/t/app/controller/report_inspect.t +++ b/t/app/controller/report_inspect.t @@ -82,7 +82,7 @@ FixMyStreet::override_config { for my $test ( { name => "categories only", - area_ids => undef, + area_ids => [], categories => [ $contact->id ], destination => "/reports/Oxfordshire", previous => "/my/inspector_redirect", diff --git a/t/cobrand/bucks.t b/t/cobrand/bucks.t index 49900114c..c231a5388 100644 --- a/t/cobrand/bucks.t +++ b/t/cobrand/bucks.t @@ -94,7 +94,7 @@ subtest 'flytipping off road sent to extra email' => sub { FixMyStreet::Script::Reports::send(); my @email = $mech->get_email; is $email[0]->header('To'), 'Chiltern <flytipping@chiltern>'; - like $mech->get_text_body_from_email($email[1]), qr/Please note that Buckinghamshire County Council is not responsible/; + unlike $mech->get_text_body_from_email($email[1]), qr/Please note that Buckinghamshire County Council is not responsible/; $report->discard_changes; is $report->external_id, undef, 'Report has right external ID'; }; diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html index 07a36b6f3..4108f83b0 100644 --- a/templates/email/buckinghamshire/other-reported.html +++ b/templates/email/buckinghamshire/other-reported.html @@ -12,10 +12,7 @@ INCLUDE '_email_top.html'; [% start_padded_box | safe %] <h1 style="[% h1_style %]">Your report has been logged</h1> <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p> -[% IF cobrand.is_council && !cobrand.owns_problem( report ) %] -<p style="[% p_style %]">Please note that [% cobrand.council_name %] is not responsible for this type -of report, so it will instead be sent to [% report.body %].</p> -[% ELSE %] +[% IF cobrand.owns_problem( report ) %] [% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] [% END %] <p style="margin: 20px auto; text-align: center"> diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt index 7f78617e0..1a042a60a 100644 --- a/templates/email/buckinghamshire/other-reported.txt +++ b/templates/email/buckinghamshire/other-reported.txt @@ -4,10 +4,7 @@ Hello [% report.name %], Your report to [% report.body %] has been logged on [% site_name %]. -[% IF cobrand.is_council && !cobrand.owns_problem( report ) %] -Please note that [% cobrand.council_name %] is not responsible for this type -of report, so it will instead be sent to [% report.body %]. -[% ELSE %] +[% IF cobrand.owns_problem( report ) %] [% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] [% END %] diff --git a/templates/web/tfl/contact/_footer.html b/templates/web/tfl/contact/_footer.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/tfl/contact/_footer.html diff --git a/web/cobrands/eastherts/layout.scss b/web/cobrands/eastherts/layout.scss index d54a6d968..964feb5ca 100644 --- a/web/cobrands/eastherts/layout.scss +++ b/web/cobrands/eastherts/layout.scss @@ -146,7 +146,11 @@ body.frontpage { } body.twothirdswidthpage { - .content .sticky-sidebar aside { - top: 12em; // up from 7em, because of the taller header + .content .sticky-sidebar { + z-index: 1; // rather than -1, which hides it behind .container + + aside { + top: 12em; // up from 7em, because of the taller header + } } } |