diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2020-07-16 12:59:38 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2020-07-16 12:59:38 +0100 |
| commit | 2915ec9562bcb43f981d08ed2fa64a13c78a6a58 (patch) | |
| tree | d2aee4f1c266ede82b05be56472c94415575c26a | |
| parent | 8a37b57398e09ff13a7370b5119de734ecbc772a (diff) | |
Tidy up map_sub_links in templates.
| -rw-r--r-- | templates/web/base/maps/_sub_links.html | 6 | ||||
| -rw-r--r-- | templates/web/base/maps/bing.html | 2 | ||||
| -rw-r--r-- | templates/web/base/maps/fms.html | 2 | ||||
| -rw-r--r-- | templates/web/base/maps/google-ol.html | 2 | ||||
| -rw-r--r-- | templates/web/base/maps/openlayers.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/maps/zurich.html | 5 |
6 files changed, 9 insertions, 14 deletions
diff --git a/templates/web/base/maps/_sub_links.html b/templates/web/base/maps/_sub_links.html deleted file mode 100644 index d58ecf97c..000000000 --- a/templates/web/base/maps/_sub_links.html +++ /dev/null @@ -1,6 +0,0 @@ -[% INCLUDE maps/openlayers.html %] -[% UNLESS around_page %] -<p class="sub-map-links" id="sub_map_links"> - [% map_sub_links | safe %] -</p> -[% END %] diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html index 7d2c379c4..d30fc2600 100644 --- a/templates/web/base/maps/bing.html +++ b/templates/web/base/maps/bing.html @@ -6,4 +6,4 @@ [% END %] [% END %] -[% map_html = INCLUDE maps/_sub_links.html %] +[% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index 739c00b4e..2df3bd11b 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -6,4 +6,4 @@ [% END %] [% END %] -[% map_html = INCLUDE maps/_sub_links.html include_key = 1 %] +[% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index eb68ae804..9103ba42b 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -2,4 +2,4 @@ <a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> [% END %] -[% map_html = INCLUDE maps/_sub_links.html %] +[% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index f4c78767c..60d7acfde 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -46,3 +46,9 @@ <div class="olControlAttribution" style="position: absolute;">[% map.copyright | safe %]</div> [% END %] <img id="loading-indicator" class="hidden" aria-hidden="true" src="/i/loading.svg" alt="Loading..."> + +[% IF NOT around_page AND map_sub_links %] +<p class="sub-map-links" id="sub_map_links"> + [% map_sub_links | safe %] +</p> +[% END %] diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index f3a9bdc7f..8310b0758 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -5,9 +5,4 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] [% INCLUDE maps/wmts_config.html %] -[% UNLESS around_page %] -<p class="sub-map-links" id="sub_map_links"> - [% map_sub_links | safe %] -</p> -[% END %] [% END %] |