Update footer/FAQ question.

4 files changed, 59 insertions, 19 deletions

diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 355369009..bd9ee889f 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -114,12 +114,12 @@ submit buttons, which the map uses when reporting a problem. It’s fixed in
 latest nightly build of Safari, so will presumably be fixed in the next
 release. Until then, I’ve sadly had to disable dragging to avoid people
 dragging an empty square.</dd>
-    <dt>Why isn&rsquo;t there a zoom button on the map?</dt>
-    <dd>There isn&rsquo;t a zoom on the map as we want to keep things very local;
-    this might mean that you&rsquo;ll need to pan around to figure out where the
-    problem is if you&rsquo;re not familiar with the area. If you&rsquo;re from the
-    council then the emailed version of the problem report will contain the
-    closest road to the pin on the map.</dd>
+    <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
+    <dd>We want to keep FixMyStreet locally focused, so restrict the ability to
+    move radically between areas. The map on Your Reports will let you see all
+    the reports you&rsquo;ve made, wherever they are. If you&rsquo;re from the
+    council then the emailed version of the problem report also contains the
+    closest road and postcode to the pin on the map.</dd>
 
     <dt>This site is great – why aren&rsquo;t you better publicised?</dt>
     <dd>As a tiny charity we simply don&rsquo;t have a publicity budget, and we
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index 657d9d826..a71909539 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -12,15 +12,28 @@
 
 [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
 
-<p id="footer">
-    [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
-    | <a href="http://github.com/mysociety/fixmystreet">[% loc('Source code') %]</a>
-    | <a href="/contact">[% loc("Contact FixMyStreet") %]</a>
-</p>
+<div id="footer">
+    <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
+    | <a href="/contact">[% loc("Contact FixMyStreet") %]</a></p>
 
-[% INCLUDE 'tracking_code.html' %]
+    <p>Mobile apps:
+        <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>,
+        <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport (iPhone)</a>
+    | <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a>
+    | <a href="http://store.ovi.com/content/107557">Nokia</a>
+    </p>
 
-[% INCLUDE 'debug_footer.html' %]
+    <p class="l">[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %]
+    <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>.
+
+    <p class="r">[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %]
+    [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]
+    </p>
+</div>
+
+[%# INCLUDE 'tracking_code.html' %]
+
+[%# INCLUDE 'debug_footer.html' %]
 
 </body>
 </html>
diff --git a/web/css/_main.scss b/web/css/_main.scss
index 9063f1484..19d9b5a40 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -83,11 +83,12 @@ select, input, textarea {
     position: relative;
     margin: 0 auto;
     max-width: 60em;
+    overflow: auto;
 }
 
 /* Can't put the margin in #mysociety because of above IE craziness */
 #wrapper {
-    margin: 1em 2em 2em;
+    margin: 1em 2em;
 }
 
 #meta {
@@ -162,7 +163,20 @@ select, input, textarea {
     text-align: center;
     border-top: solid 2px $header_back;
     width: 50%;
-    margin: 2em auto 0;
-    padding: 1em;
+    margin: 1em auto 0;
+    padding: 0;
+    color: $header_darker;
+
+    .l, .r {
+        margin-top: 0;
+        text-align: left;
+        width: 45%;
+    }
+    .l {
+        float: left;
+    }
+    .r {
+        float: right;
+    }
 }
 
diff --git a/web/css/main.css b/web/css/main.css
index 5b4be5ebc..65fd5eae3 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -80,11 +80,12 @@ select, input, textarea {
   position: relative;
   margin: 0 auto;
   max-width: 60em;
+  overflow: auto;
 }
 
 /* Can't put the margin in #mysociety because of above IE craziness */
 #wrapper {
-  margin: 1em 2em 2em;
+  margin: 1em 2em;
 }
 
 #meta {
@@ -157,6 +158,18 @@ select, input, textarea {
   text-align: center;
   border-top: solid 2px #e3d595;
   width: 50%;
-  margin: 2em auto 0;
-  padding: 1em;
+  margin: 1em auto 0;
+  padding: 0;
+  color: #4e451b;
+}
+#footer .l, #footer .r {
+  margin-top: 0;
+  text-align: left;
+  width: 45%;
+}
+#footer .l {
+  float: left;
+}
+#footer .r {
+  float: right;
 }