From 8142ab98cb9e0c095f628e2d413fb0cc67753073 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 29 Apr 2016 17:36:26 +0100
Subject: [fixmystreet.com] Add standard mySociety footer.

Like a number of recent council cobrands, we remove parts of the default
desktop footer and append our own responsive one in `footer_extra.html`.

This also updates the FixMyStreet app logos (for fixmystreet.com and any
other cobrands that use them) to the most recent style of Apple / Google
sanctioned badges.

Fixes #1385.
---
 templates/web/base/footer.html                     |  3 -
 templates/web/bromley/footer.html                  |  3 -
 templates/web/fixmystreet.com/footer-nav.html      | 24 ------
 templates/web/fixmystreet.com/footer_extra.html    | 87 ++++++++++++++++++++++
 .../fixmystreet.com/front/footer-marketing.html    | 15 ----
 templates/web/greenwich/footer.html                |  3 -
 templates/web/harrogate/footer.html                |  3 -
 7 files changed, 87 insertions(+), 51 deletions(-)
 delete mode 100644 templates/web/fixmystreet.com/footer-nav.html
 create mode 100644 templates/web/fixmystreet.com/footer_extra.html

(limited to 'templates')

diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 7626736a0..c10d9c008 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -5,9 +5,6 @@
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
-                [% INCLUDE 'footer-nav.html' %]
-            [% END %]
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 689871fff..6412ec03c 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -5,9 +5,6 @@
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
-                [% INCLUDE 'footer-nav.html' %]
-            [% END %]
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
diff --git a/templates/web/fixmystreet.com/footer-nav.html b/templates/web/fixmystreet.com/footer-nav.html
deleted file mode 100644
index c85d1ea1e..000000000
--- a/templates/web/fixmystreet.com/footer-nav.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div id="footer-nav">
-    <div class="tablewrapper">
-        <ul id="footer-main-nav">
-            <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
-                %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-            %]<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 == '/posters' %]span[% ELSE %]a href="/posters"[% END
-                %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="/contact"[% END
-                %]>[% loc("Contact") %]</[% c.req.uri.path == '/contact' ? 'span' : 'a' %]></li>
-        </ul>
-        <ul id="footer-help-nav">
-            <li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-            %]<li><[% 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/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html
new file mode 100644
index 000000000..d89910f90
--- /dev/null
+++ b/templates/web/fixmystreet.com/footer_extra.html
@@ -0,0 +1,87 @@
+<div class="mysoc-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+
+            <div class="col-sm-5">
+                <h2 class="mysoc-footer__site-name">FixMyStreet</h2>
+                <div class="mysoc-footer__site-description">
+                    <p>Mapping and reporting street problems to the councils responsible for fixing them &ndash; anywhere in the UK.</p>
+                </div>
+
+                <div class="fms-app-badges">
+                    <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">
+                        <img alt="FixMyStreet app on the App Store" src="[% base %]/cobrands/fixmystreet/images/itunes_store_logo.png" srcset="[% base %]/cobrands/fixmystreet/images/itunes_store_logo.png 1x, [% base %]/cobrands/fixmystreet/images/itunes_store_logo@2.png 2x" />
+                    </a>
+                    <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">
+                        <img alt="FixMyStreet Android app on Google Play" src="[% base %]/cobrands/fixmystreet/images/google_play_logo.png" srcset="[% base %]/cobrands/fixmystreet/images/google_play_logo.png 1x, [% base %]/cobrands/fixmystreet/images/google_play_logo@2.png 2x" />
+                    </a>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <nav class="mysoc-footer__links">
+                    <ul>
+                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
+                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="[% base %]/my"[% END
+                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% base %]/reports"[% END
+                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
+                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>
+                    </ul>
+                    <ul>
+                        <li><a href="https://www.fixmystreet.com/council">FixMyStreet for Councils</a></li>
+                        <li><[% IF c.req.uri.path == '/posters' %]span[% ELSE %]a href="[% base %]/posters"[% END
+                            %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="[% base %]/contact"[% END
+                            %]>[% loc("Contact") %]</[% c.req.uri.path == '/contact' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="[% base %]/faq"[% END
+                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+                        <li><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="[% base %]/privacy"[% END
+                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
+                    </ul>
+                </nav>
+            </div>
+
+            <div class="col-sm-3">
+                <div class="mysoc-footer__donate">
+                    <p>Your donations keep this site and others like it running</p>
+                    <a href="https://www.mysociety.org/donate" class="mysoc-footer__donate__button">Donate now</a>
+                </div>
+            </div>
+
+        </div>
+        <hr class="mysoc-footer__divider" role="presentation">
+        <div class="row">
+
+            <div class="col-sm-6">
+                <div class="mysoc-footer__orgs">
+                    <p class="mysoc-footer__org">
+                        Built by
+                        <a href="https://www.mysociety.org" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
+                    </p>
+                    <p class="mysoc-footer__org">
+                        Powered by
+                        <a href="http://fixmystreet.org" class="mysoc-footer__org__logo mysoc-footer__org__logo--fms-platform">FixMyStreet Platform</a>
+                    </p>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <div class="mysoc-footer__legal">
+                    <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org">mysociety.org</a>.</p>
+                </div>
+            </div>
+
+            <div class="col-sm-2">
+                <ul class="mysoc-footer__badges">
+                    <li role="presentation"><a href="https://github.com/mysociety/fixmystreet" class="mysoc-footer__badge mysoc-footer__badge--github">Github</a></li>
+                    <li role="presentation"><a href="https://twitter.com/fixmystreet/" class="mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li>
+                    <li role="presentation"><a href="https://www.facebook.com/FixMyStreet" class="mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li>
+                </ul>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html
index 717cc0bc9..74516b8be 100644
--- a/templates/web/fixmystreet.com/front/footer-marketing.html
+++ b/templates/web/fixmystreet.com/front/footer-marketing.html
@@ -1,20 +1,5 @@
                         <div class="tablewrapper bordered">
-                            <div id="footer-mobileapps">
-                                <h4>The FixMyStreet App</h4>
-                                <p>
-                                      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">
-                                      <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" />
-                                      </a>
-                                      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">
-                                      <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" />
-                                      </a>
-                                    </p>
-                                </div>
-
                             <div id="footer-help">
-                                <p>
-                                Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>
-                                </p>
                                 <ul>
                                     <li>
                                         <h4>[% loc('Are you a developer?') %]</h4>
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index fe905acb1..7ff0dd0af 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -5,9 +5,6 @@
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
-                [% INCLUDE 'footer-nav.html' %]
-            [% END %]
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html
index f262f6156..625096b32 100644
--- a/templates/web/harrogate/footer.html
+++ b/templates/web/harrogate/footer.html
@@ -5,9 +5,6 @@
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
-                [% INCLUDE 'footer-nav.html' %]
-            [% END %]
         </div><!-- .table-cell -->
 
         <div class="nav-wrapper">
-- 
cgit v1.2.3