[FixaMinGata] Clean-up in the templates.

Removed needless differences, or files where there weren't
really any differences between fixamingata and base.

Also made our site more like base by moving stuff we had in
footer.html to footer_extra.html and stuff we had in
front/recent.html to front/footer-marketing.html.

Should hopefully make the templates easier to maintain.

5 files changed, 30 insertions, 85 deletions

diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
deleted file mode 100644
index ad4d6c4a6..000000000
--- a/templates/web/fixamingata/footer.html
+++ /dev/null
@@ -1,33 +0,0 @@
-                    [% IF pagefooter %]
-                    <footer role="contentinfo">
-                        [% INCLUDE 'front/footer-marketing.html' %]
-                    </footer>
-                    [% END %]
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--main">
-                        <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
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% 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 == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-</body>
-
-</html>
diff --git a/templates/web/fixamingata/footer_extra.html b/templates/web/fixamingata/footer_extra.html
new file mode 100644
index 000000000..0a9ad84d1
--- /dev/null
+++ b/templates/web/fixamingata/footer_extra.html
@@ -0,0 +1,28 @@
+<footer class="fmg-footer">
+  <div class="container">
+    <div id="footer-mobileapps">
+      <!--
+          <h4></h4>
+      <p>
+      </p>
+      -->
+    </div>
+
+    <div id="footer-help">
+      <ul>
+	<li>
+          <h4>Sekretess och kakor</h4>
+          <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om Dataskyddsförordning, sekretess och kakor</a>.</p>
+	</li>
+        <li>
+          <h4>Är du en utvecklare?</h4>
+          <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %]</p>
+        </li>
+	<li>
+          <h4>Är du anställd i en kommun?</h4>
+          <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p>
+	</li>
+      </ul>
+    </div>
+  </div>
+</footer>
diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html
index a597ae85a..f8c497a22 100644
--- a/templates/web/fixamingata/front/footer-marketing.html
+++ b/templates/web/fixamingata/front/footer-marketing.html
@@ -1,26 +1,3 @@
-                        <div class="tablewrapper bordered">
-                            <div id="footer-mobileapps">
-                                <!--
-                                <h4></h4>
-                                <p>
-                                </p>
-                                -->
-                            </div>
-
-                            <div id="footer-help">
-                                <ul>
-                                   <li>
-                                      <h4>Sekretess och kakor</h4>
-                                      <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om Dataskyddsförordning, sekretess och kakor</a>.</p>
-                                   </li>
-                                    <li>
-                                        <h4>Är du en utvecklare?</h4>
-                                        <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %]</p>
-                                    </li>
-                                    <li>
-                                        <h4>Är du anställd i en kommun?</h4>
-                                        <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p>
-                                    </li>
-                                </ul>
-                            </div>
+                        <div class="tablewrapper bordered footer-marketing">
+			  <div style="padding-bottom: 32px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMinGata på Google Play" src="/cobrands/fixamingata/images/google_play_logo.png" style="height: 32px; width: 108px;"></a><a href="http://appstore.com/fixamingata"><img alt="FixaMinGata på App Store" src="/cobrands/fixamingata/images/itunes_store_logo.png" style="height: 32px; margin-left: 16px; width: 108px;"></a><a href="https://twitter.com/FixaMinGata"><img alt="FixaMinGata på Twitter" src="/cobrands/fixamingata/images/icon-twitter-black.png" style="height: 32px; margin-left: 16px; width: 32px;"></a><a href="https://www.facebook.com/FixaMinGata"><img alt="FixaMinGata på Facebook" src="/cobrands/fixamingata/images/icon-facebook-black.png" style="height: 32px; padding-left: 16px; width: 32px;"></a></div>			  
                         </div>
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
deleted file mode 100644
index 4cff9eba9..000000000
--- a/templates/web/fixamingata/front/recent.html
+++ /dev/null
@@ -1,21 +0,0 @@
-    [%
-        recent_photos = c.cobrand.recent_photos('front', 5);
-    %]
-
-    <div id="front-recently">
-        <div style="padding-bottom: 32px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMinGata på Google Play" src="/cobrands/fixamingata/images/google_play_logo.png" style="height: 32px; width: 108px;"></a><a href="http://appstore.com/fixamingata"><img alt="FixaMinGata på App Store" src="/cobrands/fixamingata/images/itunes_store_logo.png" style="height: 32px; margin-left: 16px; width: 108px;"></a><a href="https://twitter.com/FixaMinGata"><img alt="FixaMinGata på Twitter" src="/cobrands/fixamingata/images/icon-twitter-black.png" style="height: 32px; margin-left: 16px; width: 32px;"></a><a href="https://www.facebook.com/FixaMinGata"><img alt="FixaMinGata på Facebook" src="/cobrands/fixamingata/images/icon-facebook-black.png" style="height: 32px; padding-left: 16px; width: 32px;"></a></div>
-        [% IF recent_photos.size %]
-        <h2>
-            [% loc('Recently reported problems') %]
-        </h2>
-
-        <section class="full-width">
-            <ul class="item-list item-list--reports">
-            [% FOREACH problem IN recent_photos %]
-            [% INCLUDE 'report/_item.html', no_fixed = 1 %]
-            [% END %]
-            </ul>
-        </section>
-
-        [% END %]
-    </div>
diff --git a/templates/web/fixamingata/header_opengraph.html b/templates/web/fixamingata/header_opengraph.html
deleted file mode 100644
index 7d09d6009..000000000
--- a/templates/web/fixamingata/header_opengraph.html
+++ /dev/null
@@ -1,6 +0,0 @@
-        <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]">
-        <meta property="og:title" content="[% title || site_name %]">
-        <meta property="og:site_name" content="[% site_name %]">
-        [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Rapportera, visa, eller diskutera lokala problem.">[% END %]
-        <meta property="og:type" content="website">
-        [% INCLUDE 'header_opengraph_image.html' %]