sort out display on mobile

hide footer menu on mobile
add privacy link to main menu, hide on desktop

5 files changed, 46 insertions, 32 deletions

diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html
index 36c0daf91..e3dead34a 100644
--- a/templates/web/default/alert/index.html
+++ b/templates/web/default/alert/index.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %]
+[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage alertindex' %]
 
 <h1>[% loc('Local RSS feeds and email alerts') %]</h1>
 
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
index 589065a0e..f40731372 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -76,7 +76,9 @@
                         %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
+                        %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END
+                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
                     </ul>
                 </div>
             </div>
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index d106fc64f..4b7d8db84 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -240,33 +240,44 @@ body.twothirdswidthpage {
     border-image: url(images/tile-y.jpg) 30 0 repeat;
 
     .tablewrapper {
-        width: 60em;
-        margin: 0 auto;
-        background: $base_bg;
-        ul {
-            list-style: none;
-            padding: 0px;
-            margin: 0px;
-            float:left;
-            li {
-              list-style: none;
-              display: inline;
-              margin: 0px;
-              padding: 0px;
-              float:left;
-              a,
-              span {
-                  display: block;
-                  color: $nav_fg;
-                  background: none;
-                  border-bottom: none;
-                  padding: 0.75em;
-                  font-size: 0.9em;
-              }
-            }
-        }
-        #footer-help-nav {
-            float: right;
+      width: 60em;
+      margin: 0 auto;
+      background: $base_bg;
+      ul {
+        list-style: none;
+        padding: 0px;
+        margin: 0px;
+        float:left;
+        li {
+          list-style: none;
+          display: inline;
+          margin: 0px;
+          padding: 0px;
+          float:left;
+          a,
+          span {
+            display: block;
+            color: $nav_fg;
+            background: none;
+            border-bottom: none;
+            padding: 0.75em;
+            font-size: 0.9em;
+          }
         }
+      }
+      #footer-main-nav {
+        display: block;
+      }
+      #footer-help-nav {
+        float: right;
+      }
     }
 }
+
+/* hide the footer on the alert page as the interaction with the
+ * photo sidebar is awkward to fix */
+body.alertindex {
+  #footer-nav {
+    display: none;
+  }
+}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index c9d8e19d7..eb4901c1c 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -678,14 +678,13 @@ footer {
       }
       p {
         font-size:0.75em;
-		margin-bottom: 0;
+        margin-bottom: 0;
       }
     }
   }
 }
 
 
-
 /*BUTTONS*/
 
 // Default style set for buttons, inputs and .btn class. Red and green class available.
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 64b3f7848..d214b0804 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -141,6 +141,9 @@ h1 {
         background: none;  
         border-bottom: none;      
       }
+      &#top-nav-privacy {
+        display: none;
+      }
     }
     &#main-menu{
       li{
@@ -432,7 +435,6 @@ body.twothirdswidthpage {
   }
 }
 
-
 // map box (fallback for non js really as most users
 // will have fullscreen map)
 #map_box{