aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/App/Controller/Around.pm2
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm4
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm4
-rw-r--r--perllib/FixMyStreet/Map/Bing.pm4
-rw-r--r--perllib/FixMyStreet/Map/BingOL.pm4
-rw-r--r--perllib/FixMyStreet/Map/Google.pm4
-rw-r--r--perllib/FixMyStreet/Map/OSM.pm4
-rw-r--r--perllib/FixMyStreet/Map/OSM/StreetView.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm4
-rw-r--r--perllib/FixMyStreet/Map/Tilma/Original.pm4
-rwxr-xr-xtemplates/web/default/around/display_location.html3
-rw-r--r--templates/web/default/report/display.html4
-rw-r--r--templates/web/default/report/new/fill_in_details.html6
14 files changed, 17 insertions, 38 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index cbffbd080..cc7e84706 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -218,6 +218,7 @@ sub display_location : Private {
if mySociety::Config::get('COUNTRY') eq 'GB';
$map_links .= "</p>";
+ $c->stash->{map_links} = $map_links;
$c->stash->{map_html} = FixMyStreet::Map::display_map(
$c->fake_q,
@@ -225,7 +226,6 @@ sub display_location : Private {
longitude => $longitude,
type => 1,
pins => \@pins,
- post => $map_links
);
$c->stash->{map_js} = FixMyStreet::Map::header_js();
}
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 0f64c7c78..9ec187c7d 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -187,7 +187,6 @@ sub format_problem_for_display : Private {
sub generate_map_tags : Private {
my ( $self, $c ) = @_;
- my $map_links = '';
my $problem = $c->stash->{problem};
my ( $short_lat, $short_lon ) =
@@ -196,7 +195,7 @@ sub generate_map_tags : Private {
my $google_link =
$c->cobrand->base_url_for_emails() . '/report/' . $problem->id;
- $map_links =
+ $c->stash->{map_links} =
"<p id='sub_map_links'>"
. "<a href=\"http://maps.google.co.uk/maps?output=embed&amp;z=16&amp;q="
. URI::Escape::uri_escape_utf8( $problem->title . ' - ' . $google_link )
@@ -211,7 +210,6 @@ sub generate_map_tags : Private {
pins => $problem->used_map
? [ [ $problem->latitude, $problem->longitude, 'blue' ] ]
: [],
- post => $map_links
);
$c->stash->{map_js} = FixMyStreet::Map::header_js();
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 18d1efed5..5a33718da 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -621,7 +621,7 @@ sub process_report : Private {
$report->latitude( $c->stash->{latitude} );
$report->longitude( $c->stash->{longitude} );
- # Capture wether the may was used
+ # Capture whether the may was used
$report->used_map( $params{skipped} ? 0 : 1 );
# Short circuit unless the form has been submitted
@@ -918,7 +918,7 @@ sub generate_map : Private {
<input type="hidden" name="pc" value="$pc">
<input type="hidden" name="skipped" value="1">
$cobrand_form_elements
-<div id="skipped-map">
+<div>
END_MAP_HTML
}
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 335759b08..3d3f4bb09 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -28,7 +28,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -55,9 +54,6 @@ var fixmystreet = {
$params{pre}
<div id="map"></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/BingOL.pm b/perllib/FixMyStreet/Map/BingOL.pm
index 4e93243a9..41b7c1051 100644
--- a/perllib/FixMyStreet/Map/BingOL.pm
+++ b/perllib/FixMyStreet/Map/BingOL.pm
@@ -30,7 +30,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -55,9 +54,6 @@ var fixmystreet = {
$params{pre}
<div id="map"></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index 35896108b..f51cae43d 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -28,7 +28,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -53,9 +52,6 @@ var fixmystreet = {
$params{pre}
<div id="map"></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index b930a4e4d..028b48125 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -35,7 +35,6 @@ sub map_type {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
# Map centre may be overridden in the query string
$params{latitude} = Utils::truncate_coordinate($q->param('lat')+0)
@@ -96,9 +95,6 @@ var fixmystreet = {
$compass
</noscript></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 9c9a1ac8e..5cc1ed5ba 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -29,7 +29,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -54,9 +53,6 @@ var fixmystreet = {
$params{pre}
<div id="map"></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
index 9ae5829c4..785c8eafe 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm
@@ -35,7 +35,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -69,9 +68,6 @@ var fixmystreet = {
<div id="watermark"></div>
</div>
<p id="copyright">$copyright</p>
-$params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
index 7a898b55b..632e75e39 100644
--- a/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
+++ b/perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm
@@ -35,7 +35,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my @pins;
foreach my $pin (@{$params{pins}}) {
@@ -67,9 +66,6 @@ var fixmystreet = {
$params{pre}
<div id="map"></div>
<p id="copyright">$copyright</p>
- $params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index 0af6ed277..20fc79a60 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -43,7 +43,6 @@ sub header_js {
sub display_map {
my ($self, $q, %params) = @_;
$params{pre} ||= '';
- $params{post} ||= '';
my $mid_point = TILE_WIDTH; # Map is 2 TILE_WIDTHs in size, square.
if (my $mp = Cobrand::tilma_mid_point(Page::get_cobrand($q))) {
$mid_point = $mp;
@@ -139,9 +138,6 @@ EOF
$out .= <<EOF;
</div>
<p id="copyright">$copyright</p>
-$params{post}
-</div>
-<div id="side">
EOF
return $out;
}
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index 22ba7b084..61d31e5a5 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -35,6 +35,9 @@
%]
[% map_html %]
+[% map_links %]
+</div>
+<div id="side">
<h1>[% loc('Problems in this area') %]</h1>
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 564958286..60efae453 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -7,6 +7,10 @@
%]
[% map_start_html %]
+[% map_links %]
+</div>
+<div id="side">
+
[% IF banner %]
<p id="[% banner.id %]">
[% banner.text %]
diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html
index 64df0c935..5bcce220a 100644
--- a/templates/web/default/report/new/fill_in_details.html
+++ b/templates/web/default/report/new/fill_in_details.html
@@ -1,6 +1,12 @@
[% INCLUDE 'header.html', title => loc('Reporting a problem') %]
[% map_html %]
+</div>
+[% IF report.used_map %]
+<div id="side">
+[% ELSE %]
+<div id="skipped-map">
+[% END %]
<h1>[% loc('Reporting a problem') %]</h1>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 04:04:41 +0000