Don't output footer navigation on map page.

It's invisible anyway and pushes content bottom up a bit.

9 files changed, 20 insertions, 14 deletions

diff --git a/templates/web/base/around/around_index.html b/templates/web/base/around/around_index.html
index 087abf65f..3b2714643 100644
--- a/templates/web/base/around/around_index.html
+++ b/templates/web/base/around/around_index.html
@@ -1,4 +1,7 @@
-[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %]
+[%
+    SET bodyclass = 'mappage';
+    INCLUDE 'header.html', title => loc('Reporting a problem')
+%]
 
 <form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
     <div id="side-form">
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index c8c6935de..182c1249e 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -29,10 +29,10 @@
 
     PROCESS "maps/${map.type}.html";
 
+    SET bodyclass = 'mappage';
     SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes';
     INCLUDE 'header.html',
         title  => loc('Viewing a location')
-        bodyclass => 'mappage',
         robots => 'noindex,nofollow';
 
     allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_body);
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index 33b2cc6a4..f3ad3f2fe 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -1,6 +1,7 @@
 [%
+    SET bodyclass = 'mappage';
     PROCESS "maps/${map.type}.html" IF problems.size;
-    INCLUDE 'header.html', title = loc('Your Reports'), bodyclass = 'mappage'
+    INCLUDE 'header.html', title = loc('Your Reports')
 %]
 
 [% IF problems.size %]
diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html
index 9c8c41c35..0c95c80ef 100755
--- a/templates/web/base/reports/body.html
+++ b/templates/web/base/reports/body.html
@@ -18,10 +18,10 @@
 
 [%
     PROCESS "maps/${map.type}.html";
+    SET bodyclass = 'mappage';
     INCLUDE 'header.html',
-    title = tprintf(loc('%s - Summary reports'), name)
-    bodyclass = 'mappage'
-    rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ]
+        title = tprintf(loc('%s - Summary reports'), name)
+        rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ]
 %]
 
 [% map_html %]
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
index 18d3f1539..71e87ddfb 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -5,7 +5,7 @@
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' %]
+            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
                 [% INCLUDE 'footer-nav.html' %]
             [% END %]
         </div><!-- .table-cell -->
diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html
index db162a7ba..3944c2b1c 100644
--- a/templates/web/fixmystreet/my/my.html
+++ b/templates/web/fixmystreet/my/my.html
@@ -1,6 +1,7 @@
 [%
+    SET bodyclass = 'mappage';
     PROCESS "maps/${map.type}.html" IF problems.size;
-    INCLUDE 'header.html', title = loc('Your Reports'), bodyclass = 'mappage'
+    INCLUDE 'header.html', title = loc('Your Reports');
 %]
 
 [% IF problems.size %]
diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html
index 0c0e8af7f..69381dc03 100644
--- a/templates/web/fixmystreet/questionnaire/index.html
+++ b/templates/web/fixmystreet/questionnaire/index.html
@@ -1,7 +1,8 @@
 [%
+    SET bodyclass = 'mappage';
     PROCESS "report/photo-js.html";
     PROCESS "maps/${map.type}.html";
-    INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage'
+    INCLUDE 'header.html', title = loc('Questionnaire');
 %]
 
 [% map_html %]
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index b75ef92bc..2b150f768 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -1,4 +1,5 @@
 [% 
+    SET bodyclass = 'mappage';
     PROCESS "report/photo-js.html";
     PROCESS "maps/${map.type}.html";
 
@@ -6,8 +7,7 @@
     INCLUDE 'header.html'
         title = problem_title
         rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ]
-        robots = 'index, nofollow'
-        bodyclass = 'mappage';
+        robots = 'index, nofollow';
 %]
 
 [% map_html %]
diff --git a/templates/web/fixmystreet/report/new/fill_in_details.html b/templates/web/fixmystreet/report/new/fill_in_details.html
index fa783ab64..8cf0dfdd9 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details.html
@@ -1,8 +1,8 @@
 [%
-    SET class = '';
-    SET class = 'mappage' IF report.used_map;
+    SET bodyclass = '';
+    SET bodyclass = 'mappage' IF report.used_map;
     PROCESS "maps/${map.type}.html" IF report.used_map;
-    INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => class
+    INCLUDE 'header.html', title => loc('Reporting a problem');
 %]
 
 [% IF report.used_map %]