Use same way of displaying toggle as Google/Zurich, so it works on e.…

…g. report pages.
mysociety · Jul 9, 2020 · d23452c · d23452c
1 parent 8d95a97
commit d23452c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
@@ -66,7 +66,6 @@
     [% END %]
 
         <p class="sub-map-links" id='sub_map_links'>
-            [% map_toggle_link | safe %]
             [% map_sub_links | safe %]
             [% IF c.req.params.no_pins %]
                 <a id='hide_pins_link' rel='nofollow' href="[% c.uri_with( { no_pins => 0 } ) %]">[% loc('Show pins') %]</a>

diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
@@ -1,8 +1,16 @@
-[% map_toggle_link = BLOCK %]
+[% map_sub_links = BLOCK %]
     [% IF c.req.params.aerial %]
         <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
     [% ELSE %]
         <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
     [% END %]
 [% END %]
-[% map_html = INCLUDE maps/openlayers.html %]
+
+[% map_html = BLOCK %]
+[% INCLUDE maps/openlayers.html %]
+[% UNLESS around_page %]
+<p class="sub-map-links" id="sub_map_links">
+     [% map_sub_links | safe %]
+</p>
+[% END %]
+[% END %]
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
@@ -1,10 +1,16 @@
-[% map_toggle_link = BLOCK %]
+[% map_sub_links = BLOCK %]
     [% IF c.req.params.aerial %]
         <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
     [% ELSE %]
         <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
     [% END %]
 [% END %]
-[%
-map_html = INCLUDE maps/openlayers.html include_key = 1
-%]
+
+[% map_html = BLOCK %]
+[% INCLUDE maps/openlayers.html include_key = 1 %]
+[% UNLESS around_page %]
+<p class="sub-map-links" id="sub_map_links">
+     [% map_sub_links | safe %]
+</p>
+[% END %]
+[% END %]
diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html
@@ -31,11 +31,6 @@
 
   [% IF report.used_map %]
     [% map_html | safe %]
-
-    <p class="sub-map-links" id="sub_map_links">
-        [% map_toggle_link | safe %]
-    </p>
-
     </div>
     <div id="map_sidebar">
         <div id="side-form">