aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/CrossSell.pm46
-rw-r--r--perllib/FixMyStreet/Map/FMS.pm8
-rw-r--r--web/css/core.css1
-rw-r--r--web/css/core.scss1
-rw-r--r--web/js/map-bing-ol.js8
5 files changed, 38 insertions, 26 deletions
diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm
index 46c34a43b..9235d0a03 100644
--- a/perllib/CrossSell.pm
+++ b/perllib/CrossSell.pm
@@ -62,7 +62,7 @@ sub display_random_twfy_alerts_advert {
<input type="hidden" name="site" value="fms">
<input style="font-size:150%" type="submit" value="#;
$text =~ s#\[/button\]#"></p>#;
- return '<div id="advert_thin" style="text-align:center">' . $text . '</div>';
+ return '<div id="advert_thin">' . $text . '</div>';
}
sub display_hfyc_cheltenham_advert {
@@ -113,7 +113,7 @@ EOF
sub display_democracyclub {
my (%input) = @_;
return <<EOF;
-<div id="advert_thin" style="text-align:center">
+<div id="advert_thin">
<h2 style="margin-bottom:0">Help make the next election the most accountable ever</h2> <p style="font-size:120%;margin-top:0.5em;"><a href="http://www.democracyclub.org.uk/">Join Democracy Club</a> and have fun keeping an eye on your election candidates. <a href="http://www.democracyclub.org.uk/">Sign me up</a>!
</div>
EOF
@@ -169,13 +169,13 @@ sub display_advert ($$;$%) {
return '' unless $c->cobrand->is_default;
- if (defined $data{council} && $data{council} eq '2326') {
- my ($out, $ad) = display_hfyc_cheltenham_advert($email, $name);
- if ($out) {
- $c->stash->{scratch} = "advert=$ad";
- return $out;
- }
- }
+ #if (defined $data{council} && $data{council} eq '2326') {
+ # my ($out, $ad) = display_hfyc_cheltenham_advert($email, $name);
+ # if ($out) {
+ # $c->stash->{scratch} = "advert=$ad";
+ # return $out;
+ # }
+ #}
#if ($data{lat}) {
# my $out = display_gny_groups($data{lon}, $data{lat});
@@ -189,15 +189,25 @@ sub display_advert ($$;$%) {
#$c->stash->{scratch} = 'advert=demclub0';
#return display_democracyclub();
+ return <<EOF;
+<div id="advert_thin">
+<p>Do you have an issue that&rsquo;s too big for FixMyStreet?
+It could be time to petition your council. Try our new site:
+<h2 style="margin-top:0; font-size: 150%">
+<a href="http://www.petitionyourcouncil.com/">PetitionYourCouncil</a></p>
+</h2>
+</div>
+EOF
+
#unless (defined $data{done_tms} && $data{done_tms}==1) {
- $c->stash->{scratch} = 'advert=news';
- my $auth_signature = '';
- unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) {
- $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET'));
- }
- return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">'
- . display_news_form(email => $email, name => $name, signed_email => $auth_signature)
- . '</div>';
+ #$c->stash->{scratch} = 'advert=news';
+ #my $auth_signature = '';
+ #unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) {
+ # $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET'));
+ #}
+ #return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">'
+ # . display_news_form(email => $email, name => $name, signed_email => $auth_signature)
+ # . '</div>';
#}
my @adverts = (
@@ -230,7 +240,7 @@ sub display_advert ($$;$%) {
$c->stash->{scratch} = 'advert=pb';
return <<EOF;
-<div id="advert_thin" style="text-align:center">
+<div id="advert_thin">
<h2 style="font-size: 150%">
If you're interested in improving your local area,
<a href="http://www.pledgebank.com/">use PledgeBank</a> to
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 8db27085b..2e40bfde3 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -48,10 +48,10 @@ sub map_tiles {
];
} else {
return [
- "http://ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?g=587&productSet=mmOS",
- "http://ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y-1, $z) . ".png?g=587&productSet=mmOS",
- "http://ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y, $z) . ".png?g=587&productSet=mmOS",
- "http://ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y, $z) . ".png?g=587&productSet=mmOS",
+ "http://ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?g=701&productSet=mmOS",
+ "http://ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y-1, $z) . ".png?g=701&productSet=mmOS",
+ "http://ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y, $z) . ".png?g=701&productSet=mmOS",
+ "http://ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y, $z) . ".png?g=701&productSet=mmOS",
];
}
}
diff --git a/web/css/core.css b/web/css/core.css
index 85c16a9ae..bbf3ac381 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -43,6 +43,7 @@
#mysociety #advert_thin {
width: 50%;
margin: 1em auto;
+ text-align: center;
border-top: dotted 1px #999999;
}
#mysociety #advert_hfymp {
diff --git a/web/css/core.scss b/web/css/core.scss
index 5e24b5702..9221206ff 100644
--- a/web/css/core.scss
+++ b/web/css/core.scss
@@ -66,6 +66,7 @@ $map_width: 500px;
#advert_thin {
width: 50%;
margin: 1em auto;
+ text-align: center;
border-top: dotted 1px #999999;
}
#advert_hfymp {
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 406524883..6b4a92c4d 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -63,10 +63,10 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
];
} else {
var url = [
- "http://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS",
- "http://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS",
- "http://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS",
- "http://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=587&productSet=mmOS"
+ "http://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS",
+ "http://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS",
+ "http://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS",
+ "http://ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=701&productSet=mmOS"
];
}
var s = '' + x + y + z;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:42:54 +0000