aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md2
-rwxr-xr-xbin/open311-populate-service-list4
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Problem.pm6
-rw-r--r--perllib/FixMyStreet/Script/Reports.pm1
-rw-r--r--perllib/Open311/PopulateServiceList.pm3
-rw-r--r--t/app/model/problem.t13
-rw-r--r--t/app/sendreport/inspection_required.t15
-rw-r--r--t/cobrand/bromley.t3
-rw-r--r--t/cobrand/fixamingata.t3
-rw-r--r--t/cobrand/zurich.t3
-rw-r--r--t/sendreport/open311.t3
-rw-r--r--templates/web/oxfordshire/header.html6
-rw-r--r--templates/web/oxfordshire/tracking_code.html17
-rw-r--r--templates/web/warwickshire/around/intro.html2
-rw-r--r--templates/web/warwickshire/footer.html2
-rw-r--r--templates/web/warwickshire/warwickshire_masthead.html72
-rw-r--r--web/cobrands/warwickshire/vendor/gamma/print.css4
-rw-r--r--web/cobrands/warwickshire/vendor/gamma/style.css20
-rw-r--r--web/js/map-OpenLayers.js3
19 files changed, 91 insertions, 91 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f37ca7088..1b9283bcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
* Unreleased
- Front end improvements:
- Include "SameSite=Lax" with all cookies.
+ - Zoom out as much as necessary on body map page, even on mobile. #1958
- Bugfixes:
- Fix bug specifying category in URL on /around. #1950
- Fix bug with multiple select-multiples on a page. #1951
@@ -14,6 +15,7 @@
- Fix JavaScript error on /my calculating bounds #1954
- Change text on /reports to match lower down (fix translation).
- Ensure all reports graph can't dip downward. #1956
+ - Fix error sending `requires_inspection` reports. #1961
- UK:
- Lazy load images in the footer.
diff --git a/bin/open311-populate-service-list b/bin/open311-populate-service-list
index 8cb41a47b..9c05055c6 100755
--- a/bin/open311-populate-service-list
+++ b/bin/open311-populate-service-list
@@ -23,8 +23,8 @@ my ($opt, $usage) = describe_options(
print($usage->text), exit if $opt->help;
my $bodies = FixMyStreet::DB->resultset('Body')->search( {
- # Until Oxfordshire does, and Bristol stops erroring
- name => { -not_in => [ 'Oxfordshire County Council', 'Bristol City Council' ] },
+ # Until Oxfordshire does
+ name => { -not_in => [ 'Oxfordshire County Council' ] },
send_method => 'Open311'
} );
my $verbose = 0;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index ae45351c4..3f083c073 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -232,12 +232,6 @@ sub categories_summary {
return \%categories;
}
-sub send_reports {
- my ( $rs, $site_override ) = @_;
- require FixMyStreet::Script::Reports;
- return FixMyStreet::Script::Reports::send($site_override);
-}
-
sub include_comment_counts {
my $rs = shift;
my $order_by = $rs->{attrs}{order_by};
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 04ad1c893..aca894d03 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -45,6 +45,7 @@ sub send(;$) {
while (my $row = $unsent->next) {
my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new();
+ FixMyStreet::DB->schema->cobrand($cobrand);
if ($debug_mode) {
$debug_unsent_count++;
diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm
index e8d06efdf..30d888eb4 100644
--- a/perllib/Open311/PopulateServiceList.pm
+++ b/perllib/Open311/PopulateServiceList.pm
@@ -221,7 +221,8 @@ sub _add_meta_to_contact {
warn sprintf( "Empty meta data for %s at %s",
$self->_current_service->{service_code},
$self->_current_body->endpoint )
- if $self->verbose;
+ # Bristol has a habit of returning empty metadata, stop noise from that.
+ if $self->verbose and $self->_current_body->name ne 'Bristol City Council';
return;
}
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index efc9057da..27f6aed66 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -2,6 +2,7 @@ use FixMyStreet::TestMech;
use FixMyStreet;
use FixMyStreet::App;
use FixMyStreet::DB;
+use FixMyStreet::Script::Reports;
use Sub::Override;
my $problem_rs = FixMyStreet::DB->resultset('Problem');
@@ -541,7 +542,7 @@ foreach my $test ( {
} );
FixMyStreet::override_config $override, sub {
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
};
$mech->email_count_is( $test->{ email_count } );
@@ -619,7 +620,7 @@ subtest 'check can set mutiple emails as a single contact' => sub {
} );
FixMyStreet::override_config $override, sub {
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
};
$mech->email_count_is(1);
@@ -652,7 +653,7 @@ subtest 'check can turn on report sent email alerts' => sub {
send_fail_count => 0,
} );
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
$mech->email_count_is( 2 );
my @emails = $mech->get_email;
@@ -698,7 +699,7 @@ subtest 'check iOS app store test reports not sent' => sub {
send_fail_count => 0,
} );
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
$mech->email_count_is( 0 );
@@ -727,7 +728,7 @@ subtest 'check reports from abuser not sent' => sub {
send_fail_count => 0,
} );
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
$mech->email_count_is( 1 );
@@ -743,7 +744,7 @@ subtest 'check reports from abuser not sent' => sub {
my $abuse = FixMyStreet::DB->resultset('Abuse')->create( { email => $problem->user->email } );
$mech->clear_emails_ok;
- $problem_rs->send_reports();
+ FixMyStreet::Script::Reports::send();
$mech->email_count_is( 0 );
diff --git a/t/app/sendreport/inspection_required.t b/t/app/sendreport/inspection_required.t
index c8cb30592..64d6f70ee 100644
--- a/t/app/sendreport/inspection_required.t
+++ b/t/app/sendreport/inspection_required.t
@@ -1,13 +1,10 @@
use FixMyStreet;
use FixMyStreet::DB;
use FixMyStreet::TestMech;
-use FixMyStreet::SendReport::Email;
+use FixMyStreet::Script::Reports;
ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
-use_ok 'FixMyStreet::Cobrand';
-FixMyStreet::DB->schema->cobrand(FixMyStreet::Cobrand::FixMyStreet->new());
-
my $user = $mech->create_user_ok( 'user@example.com' );
my $body = $mech->create_body_ok( 2237, 'Oxfordshire County Council');
@@ -31,7 +28,7 @@ my $report = $reports[0];
subtest "Report isn't sent if uninspected" => sub {
$mech->clear_emails_ok;
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
$mech->email_count_is( 0 );
is $report->whensent, undef, "Report hasn't been sent";
@@ -42,7 +39,7 @@ subtest 'Report is sent when inspected' => sub {
$report->set_extra_metadata(inspected => 1);
$report->update;
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
$report->discard_changes;
$mech->email_count_is( 1 );
@@ -61,7 +58,7 @@ subtest 'Uninspected report is sent when made by trusted user' => sub {
});
ok $user->has_permission_to('trusted', $report->bodies_str_ids), 'User can make trusted reports';
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
$report->discard_changes;
$mech->email_count_is( 1 );
@@ -81,7 +78,7 @@ subtest "Uninspected report isn't sent when user rep is too low" => sub {
$contact->set_extra_metadata(reputation_threshold => 20);
$contact->update;
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
$report->discard_changes;
$mech->email_count_is( 0 );
@@ -92,7 +89,7 @@ subtest 'Uninspected report is sent when user rep is high enough' => sub {
$user->set_extra_metadata(reputation => 21);
$user->update;
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
$report->discard_changes;
$mech->email_count_is( 1 );
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index a64337085..a3a807bb1 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,5 +1,6 @@
use CGI::Simple;
use FixMyStreet::TestMech;
+use FixMyStreet::Script::Reports;
my $mech = FixMyStreet::TestMech->new;
# Create test data
@@ -54,7 +55,7 @@ subtest 'testing special Open311 behaviour', sub {
STAGING_FLAGS => { send_reports => 1 },
ALLOWED_COBRANDS => [ 'fixmystreet', 'bromley' ],
}, sub {
- $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
+ $test_data = FixMyStreet::Script::Reports::send();
};
$report->discard_changes;
ok $report->whensent, 'Report marked as sent';
diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t
index 133a8c950..0aa264660 100644
--- a/t/cobrand/fixamingata.t
+++ b/t/cobrand/fixamingata.t
@@ -1,5 +1,6 @@
use mySociety::Locale;
+use FixMyStreet::Script::Reports;
use FixMyStreet::TestMech;
my $mech = FixMyStreet::TestMech->new;
@@ -35,7 +36,7 @@ $mech->email_count_is(0);
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ 'fixamingata' ],
}, sub {
- FixMyStreet::DB->resultset('Problem')->send_reports();
+ FixMyStreet::Script::Reports::send();
};
my $email = $mech->get_email;
my $plain = $mech->get_text_body_from_email($email, 1);
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 7a267a1af..385f7f077 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -8,6 +8,7 @@ use LWP::Protocol::PSGI;
use Test::LongString;
use Path::Tiny;
use t::Mock::MapItZurich;
+use FixMyStreet::Script::Reports;
use FixMyStreet::TestMech;
my $mech = FixMyStreet::TestMech->new;
@@ -36,7 +37,7 @@ sub send_reports_for_zurich {
ALLOWED_COBRANDS => ['zurich']
}, sub {
# Actually send the report
- FixMyStreet::DB->resultset('Problem')->send_reports('zurich');
+ FixMyStreet::Script::Reports::send('zurich');
};
}
sub reset_report_state {
diff --git a/t/sendreport/open311.t b/t/sendreport/open311.t
index 52b1952f4..1eb5535aa 100644
--- a/t/sendreport/open311.t
+++ b/t/sendreport/open311.t
@@ -1,4 +1,5 @@
use CGI::Simple;
+use FixMyStreet::Script::Reports;
use FixMyStreet::TestMech;
my $mech = FixMyStreet::TestMech->new;
@@ -25,7 +26,7 @@ subtest 'testing Open311 behaviour', sub {
STAGING_FLAGS => { send_reports => 1 },
ALLOWED_COBRANDS => [ 'fixmystreet' ],
}, sub {
- $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
+ $test_data = FixMyStreet::Script::Reports::send();
};
$report->discard_changes;
ok $report->whensent, 'Report marked as sent';
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index fce316bf9..a1d42a777 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -19,6 +19,12 @@
[% INCLUDE 'tracking_code.html' %]
</head>
<body class="[% bodyclass | html IF bodyclass %]">
+
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NT76GJ5"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
+
<div id="oxford-wrapper">
<div id="oxford-header" class="desk-only">
<a href="https://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council</a>
diff --git a/templates/web/oxfordshire/tracking_code.html b/templates/web/oxfordshire/tracking_code.html
index 7a100f8ad..14afb5de0 100644
--- a/templates/web/oxfordshire/tracking_code.html
+++ b/templates/web/oxfordshire/tracking_code.html
@@ -1,15 +1,12 @@
[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-22094787-2']);
- _gaq.push(['_setDomainName', '.oxfordshire.gov.uk']);
- _gaq.push(['_setCustomVar',1,'level1','Roads and transport',3]);
- _gaq.push(['_setCustomVar',2,'level2','FixMyStreet',3]);
- _gaq.push(['_trackPageview']);
-
-</script>
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-NT76GJ5');</script>
+<!-- End Google Tag Manager -->
[% ELSE %]
<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" -->
diff --git a/templates/web/warwickshire/around/intro.html b/templates/web/warwickshire/around/intro.html
index 41e5088ad..03786e2e7 100644
--- a/templates/web/warwickshire/around/intro.html
+++ b/templates/web/warwickshire/around/intro.html
@@ -3,5 +3,5 @@
<p>
Please use this form for defect reporting except for Street Lighting.
<br /> For Street Lighting defects please click here:
- <a href="http://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a>
+ <a href="https://www.warwickshire.gov.uk/streetlightingfault">Reporting Street Lighting Faults</a>
</p>
diff --git a/templates/web/warwickshire/footer.html b/templates/web/warwickshire/footer.html
index d6d88535c..6f4007781 100644
--- a/templates/web/warwickshire/footer.html
+++ b/templates/web/warwickshire/footer.html
@@ -37,7 +37,7 @@
<div class="span2">
<aside class="widget widget_text" id="text-13">
<div class="textwidget">
- <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="http://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
+ <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="https://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
</div>
</aside>
</div>
diff --git a/templates/web/warwickshire/warwickshire_masthead.html b/templates/web/warwickshire/warwickshire_masthead.html
index 1c87d3e89..11afec135 100644
--- a/templates/web/warwickshire/warwickshire_masthead.html
+++ b/templates/web/warwickshire/warwickshire_masthead.html
@@ -15,13 +15,13 @@
</a>
<a href="#maincontent" id="skiptomain">Skip to main content</a>
<a alt="Warwickshire County Council logo" class="brand" href="//www.warwickshire.gov.uk/">
- <img alt="Warwickshire County Council" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;">
+ <img alt="Warwickshire County Council" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/corpwhitelogo.png" style="width:85px;">
</a>
<a alt="Gov Delivery logo" class="gdslogo" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">
- <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
+ <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
</a>
<a alt="Gov Delivery logo" class="govdelmobile pull-right" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">
- <img alt="GDSl" src="http://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
+ <img alt="GDSl" src="https://www.warwickshire.gov.uk/wp-content/themes/gamma/images/keep_me_posted_envelope_17px.png" style="width:17px;">
</a>
<a class="gdstext" href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new">Email alerts</a>
<div class="nav-collapse collapse pull-left" id="right-topbar">
@@ -64,34 +64,34 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk">Residents<b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
- <a href="http://www.warwickshire.gov.uk/">Residents - home</a>
+ <a href="//www.warwickshire.gov.uk/">Residents - home</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/environment">Environment</a>
+ <a href="//www.warwickshire.gov.uk/environment">Environment</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/health">Health</a>
+ <a href="//www.warwickshire.gov.uk/health">Health</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a>
+ <a href="//www.warwickshire.gov.uk/librariesandleisure">Libraries and leisure</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a>
+ <a href="//www.warwickshire.gov.uk/roadsandtravel">Roads and travel</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/registrations">Registrations</a>
+ <a href="//www.warwickshire.gov.uk/registrations">Registrations</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a>
+ <a href="//www.warwickshire.gov.uk/safetyandcrime">Safety and crime</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a>
+ <a href="//www.warwickshire.gov.uk/schoolsandlearning">Schools and learning</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a>
+ <a href="//www.warwickshire.gov.uk/socialcareandhealth">Social care and support</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/contactus">Customer service and contacts</a>
+ <a href="//www.warwickshire.gov.uk/contactus">Customer service and contacts</a>
</li>
</ul>
</li>
@@ -99,28 +99,28 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/business">Business <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
- <a href="http://www.warwickshire.gov.uk/business">Business - home</a>
+ <a href="//www.warwickshire.gov.uk/business">Business - home</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a>
+ <a href="//www.warwickshire.gov.uk/businesssupportorganisations">Business support organisations</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a>
+ <a href="//www.warwickshire.gov.uk/growingyourbusiness">Growing your business</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a>
+ <a href="//www.warwickshire.gov.uk/businesshealthandsafety">Health and safety for businesses</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a>
+ <a href="//www.warwickshire.gov.uk/locatingyourbusiness">Locating your business</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/otherbusinessservices">Other business services</a>
+ <a href="//www.warwickshire.gov.uk/otherbusinessservices">Other business services</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a>
+ <a href="//www.warwickshire.gov.uk/businessadvice">Regulatory business service and advice</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/startingabusiness">Starting a business</a>
+ <a href="//www.warwickshire.gov.uk/startingabusiness">Starting a business</a>
</li>
</ul>
</li>
@@ -128,40 +128,40 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="//www.warwickshire.gov.uk/corporate">The council <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
- <a href="http://www.warwickshire.gov.uk/corporate">The council - home</a>
+ <a href="//www.warwickshire.gov.uk/corporate">The council - home</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/democracy">Democracy</a>
+ <a href="//www.warwickshire.gov.uk/democracy">Democracy</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a>
+ <a href="//www.warwickshire.gov.uk/financeandsuppliers">Finance and suppliers</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a>
+ <a href="//www.warwickshire.gov.uk/jobs">Jobs</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/listsanddata">Lists, data and information</a>
+ <a href="//www.warwickshire.gov.uk/listsanddata">Lists, data and information</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/news">News</a>
+ <a href="//www.warwickshire.gov.uk/news">News</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/organisation">Organisation</a>
+ <a href="//www.warwickshire.gov.uk/organisation">Organisation</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/performance">Our performance</a>
+ <a href="//www.warwickshire.gov.uk/performance">Our performance</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/partnerships">Partnerships</a>
+ <a href="//www.warwickshire.gov.uk/partnerships">Partnerships</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/policies">Policies, standards and legislation</a>
+ <a href="//www.warwickshire.gov.uk/policies">Policies, standards and legislation</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/projects">Projects</a>
+ <a href="//www.warwickshire.gov.uk/projects">Projects</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/strategies">Strategies and priorities</a>
+ <a href="//www.warwickshire.gov.uk/strategies">Strategies and priorities</a>
</li>
</ul>
</li>
@@ -181,10 +181,10 @@
<a href="http://invest.warwickshire.gov.uk/">Invest in Warwickshire</a>
</li>
<li>
- <a href="http://www.warwickshire.gov.uk/jobs">Jobs</a>
+ <a href="//www.warwickshire.gov.uk/jobs">Jobs</a>
</li>
<li>
- <a href="http://www.livingwellwithdementia.org/">Living well with dementia</a>
+ <a href="https://dementia.warwickshire.gov.uk/">Living well with dementia</a>
</li>
<li>
<a href="http://laf.warwickshire.gov.uk/">Local Access Forum</a>
@@ -216,4 +216,4 @@
</div>
</div>
</div>
-</div> \ No newline at end of file
+</div>
diff --git a/web/cobrands/warwickshire/vendor/gamma/print.css b/web/cobrands/warwickshire/vendor/gamma/print.css
index ac40d74d3..089386cae 100644
--- a/web/cobrands/warwickshire/vendor/gamma/print.css
+++ b/web/cobrands/warwickshire/vendor/gamma/print.css
@@ -12,7 +12,7 @@
}
/* header image added DJ - 17-02-2016 */
header:before {
- content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
+ content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
}
/*header.entry-header {left:none;}*/
@@ -66,7 +66,7 @@ header:before {
}
/*footer {
- content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
+ content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
}
*/
diff --git a/web/cobrands/warwickshire/vendor/gamma/style.css b/web/cobrands/warwickshire/vendor/gamma/style.css
index a558d761f..d9090a888 100644
--- a/web/cobrands/warwickshire/vendor/gamma/style.css
+++ b/web/cobrands/warwickshire/vendor/gamma/style.css
@@ -8913,7 +8913,7 @@ border-radius:5px;
font-weight:500;
color:white;
text-decoration:none;
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
background-size:25px 20px;
background-repeat:no-repeat;
background-position: 130px 15px;
@@ -8936,7 +8936,7 @@ border-radius:5px;
font-weight:500;
color:white;
text-decoration:none;
- background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+ background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
background-size:25px 20px;
background-repeat:no-repeat;
background-position: 155px 15px;
@@ -8960,7 +8960,7 @@ border-radius:5px;
/* background: -ms-linear-gradient(left, #0F7C4B 39%,#0F8E50 100%); /* IE10+ */
/* background: linear-gradient(to right, #0F7C4B 39%,#0F8E50 100%); /* W3C */
/* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0F7C4B', endColorstr='#0F8E50',GradientType=1 );
-/* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
+/* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
background-size:25px 20px;
background-position: 130px 15px;*/
/* background-repeat:no-repeat; */
@@ -8969,7 +8969,7 @@ border-radius:5px;
.style-2 ul#super-menu li a:hover {
background: rgb(0, 85, 161);
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
background-repeat: no-repeat;
background-size:25px 20px;
background-position: 155px 15px;
@@ -8982,7 +8982,7 @@ border-radius:5px;
background-color: #F2F5F2;
background: #F2F5F2;
background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow1.png);
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
background-size: 25px 20px;
background-repeat: no-repeat;
background-position: 130px 15px;
@@ -9272,15 +9272,15 @@ border-bottom: solid 1px #FFFFFF;
/*.style-5 ul#super-menu li a:hover, .style-4 ul#super-menu li a:hover {
.style-5 ul#super-menu li a:hover {
-background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
}*/
.style-4 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
color:#666666;
}
.style-5 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
color:#666666;
}
@@ -10777,7 +10777,7 @@ h3.home-header {
#home-social {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-socialcare.png);}
#home-events {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-events.png);}
#home-council {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-council.png);}
-#home-audience {background-image:url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
+#home-audience {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
#home-a-z {background-image:none; margin-left: -1.5em;}
@@ -11543,4 +11543,4 @@ font-family:helvetica!important;
font-size:14px;
}
-} \ No newline at end of file
+}
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 1d417f68e..1238bb351 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -240,9 +240,6 @@ $.extend(fixmystreet.utils, {
strategy.deactivate();
var center = bounds.getCenterLonLat();
var z = fixmystreet.map.getZoomForExtent(bounds);
- if ( z < 13 && $('html').hasClass('mobile') ) {
- z = 13;
- }
fixmystreet.map.setCenter(center, z);
// Reactivate the strategy and make it think it's done an update
strategy.activate();
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:44:56 +0000