Merge remote-tracking branch 'origin/fiksgatami-update'

13 files changed, 131 insertions, 193 deletions

diff --git a/templates/web/base/index.html b/templates/web/base/index.html
index 5b2b73cfe..cea0f832a 100644
--- a/templates/web/base/index.html
+++ b/templates/web/base/index.html
@@ -14,8 +14,6 @@
     [% END %]
 </p>
 
-[% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %]
-
 [% PROCESS 'around/postcode_form.html' %]
 
 <div id="front_intro">
diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html
index 986db3967..bd0921e0b 100644
--- a/templates/web/fiksgatami/footer.html
+++ b/templates/web/fiksgatami/footer.html
@@ -1,22 +1,36 @@
-</div></div>
+                    [% IF pagefooter %]
+                    <footer role="content-info">
+                        [% INCLUDE 'front/footer-marketing.html' %]
+                    </footer>
+                    [% END %]
+                </div><!-- .content role=main -->
+            </div><!-- .container -->
+        </div><!-- .table-cell -->
 
-<h2 class="v">[% loc('Navigation') %]</h2>
-<ul id="navigation">
-<li><a href="/">[% loc("Report a problem") %]</a></li>
-<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li>
-<li><a href="/reports">[% loc("All reports") %]</a></li>
-<li><a href="[% c.uri_for('/alert', {pc =>  pc}) | html %]">[% loc("Local alerts") %]</a></li>
-<li><a href="/faq">[% loc("Help") %]</a></li>
-<li><a href="/contact">[% loc("Contact") %]</a></li>
-</ul>
+        <div class="nav-wrapper">
+            <div class="nav-wrapper-2">
+                <div id="main-nav" role="navigation">
+                    <ul id="mysoc-menu">
+                        <li><a href="http://www.nuug.no/">Foreningen NUUG</a></li>
+                    </ul>
 
-<div id="logo" align="center"><a href="http://www.nuug.no/">Foreningen NUUG</a></div> 
-
-<p id="footer">
-    [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>') %] | <a href="http://github.com/mysociety/fixmystreet">[% loc('Source code') %]</a>
-</p>
-
-[% INCLUDE 'debug_footer.html' %]
+                    <ul id="main-menu">
+                        <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 == '/faq' %]span[% ELSE %]a href="/faq"[% END
+                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
 
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+    </div> <!-- .wrapper -->
 </body>
 </html>
diff --git a/templates/web/fiksgatami/front/footer-marketing.html b/templates/web/fiksgatami/front/footer-marketing.html
new file mode 100644
index 000000000..6069c8793
--- /dev/null
+++ b/templates/web/fiksgatami/front/footer-marketing.html
@@ -0,0 +1,19 @@
+                        <div class="tablewrapper bordered">
+                            <div id="footer-mobileapps">
+                                <p>
+                                    <a href="http://wiki.nuug.no/grupper/fiksgatami/android">Last ned FiksGataMi-app for din Android-telefon.</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>
+                                        <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
diff --git a/templates/web/fiksgatami/front/news.html b/templates/web/fiksgatami/front/news.html
deleted file mode 100644
index 8ebee90f8..000000000
--- a/templates/web/fiksgatami/front/news.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%
-    news = [
-        { date = '2011-04-26', text = '<a href="' _ c.config.ANDROID_URL _ '">Last ned FiksGataMi-app for din Android-telefon.</a>' },
-        { date = '2011-04-23', text = 'FiksGataMi sender n&aring; veisaker ogs&aring; til vegvesenet slik at kommuner ikke trenger sende saker videre.' },
-    ]
-%]
-[% FOREACH item IN news %]
-    <p align="center" style="margin-bottom:0">
-        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
-    </p>
-[% END %]
-
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index e2ea1f684..db3ba546e 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -1,30 +1,59 @@
 <!doctype html>
-<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]>   <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]>   <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]>   <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
     <head>
+        <meta name="viewport" content="initial-scale=1.0">
 
-        <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-        <link rel="stylesheet" type="text/css" href="[% version('/cobrands/fiksgatami/css.css') %]">
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+        <meta name="HandHeldFriendly" content="true">
+        <meta name="mobileoptimized" content="0">
+
+        [% INCLUDE 'header_opengraph.html' %]
+
+[% SET start = c.config.ADMIN_BASE_URL IF admin %]
+
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+        [% extra_css %]
+        <!--[if (lt IE 9) & (!IEMobile)]>
+            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+        <![endif]-->
+
+        <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+        <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
+        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FiksGataMi' %]
+        [% extra_js %]
+
+        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
 
-    [% INCLUDE 'common_header_tags.html', site_title = 'FiksGataMi' %]
     </head>
-    <body>
+    [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
+    <body class="[% bodyclass | html IF bodyclass %]">
+
+    <div class="wrapper">
+        <div class="table-cell">
+            <header id="site-header" role="banner">
+                <div class="container">
+                    [% INCLUDE 'header_logo.html' %]
+                    <a href="#main-nav" id="nav-link">Main Navigation</a>
+                </div>
+            </header>
 
-        [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %]
-            [%- loc('Fix<span id="my">My</span>Street') %]
-        [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
+          [% IF c.user_exists %]
+            <div id="user-meta">
+                <p>
+                    [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
+                    <a href="/auth/sign_out">[% loc('sign out') %]</a>
+                </p>
+            </div>
+          [% END %]
 
-        <ul id="meta">
-            [% IF c.user_exists %]
-                <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
-                <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
-            [% ELSE %]
-                <li>&nbsp;</li>
-            [% END %]
-        </ul>
+            [% pre_container_extra %]
 
-        <div id="wrapper"><div id="mysociety">
+            <div class="container">
+                <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
 
-    [% INCLUDE 'debug_header.html' %]
+        <!-- [% INCLUDE 'debug_header.html' %] -->
diff --git a/templates/web/fiksgatami/nn/contact/address.html b/templates/web/fiksgatami/nn/contact/address.html
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/web/fiksgatami/nn/contact/address.html
+++ /dev/null
diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html
index b61cab9ff..3d17e37fb 100644
--- a/templates/web/fiksgatami/nn/footer.html
+++ b/templates/web/fiksgatami/nn/footer.html
@@ -1,22 +1,36 @@
-</div></div>
+                    [% IF pagefooter %]
+                    <footer role="content-info">
+                        [% INCLUDE 'front/footer-marketing.html' %]
+                    </footer>
+                    [% END %]
+                </div><!-- .content role=main -->
+            </div><!-- .container -->
+        </div><!-- .table-cell -->
 
-<h2 class="v">[% loc('Navigation') %]</h2>
-<ul id="navigation">
-<li><a href="/">[% loc("Report a problem") %]</a></li>
-<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li>
-<li><a href="/reports">[% loc("All reports") %]</a></li>
-<li><a href="[% c.uri_for('/alert', {pc =>  pc}) | html %]">[% loc("Local alerts") %]</a></li>
-<li><a href="/faq">[% loc("Help") %]</a></li>
-<li><a href="/contact">[% loc("Contact") %]</a></li>
-</ul>
+        <div class="nav-wrapper">
+            <div class="nav-wrapper-2">
+                <div id="main-nav" role="navigation">
+                    <ul id="mysoc-menu">
+                        <li><a href="http://www.nuug.no/">Foreininga NUUG</a></li>
+                    </ul>
 
-<div id="logo" align="center"><a href="http://www.nuug.no/">Foreininga NUUG</a></div> 
-
-<p id="footer">
-    [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>') %] | <a href="http://github.com/mysociety/fixmystreet">[% loc('Source code') %]</a>
-</p>
-
-[% INCLUDE 'debug_footer.html' %]
+                    <ul id="main-menu">
+                        <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 == '/faq' %]span[% ELSE %]a href="/faq"[% END
+                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
 
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+    </div> <!-- .wrapper -->
 </body>
 </html>
diff --git a/templates/web/fiksgatami/nn/front/news.html b/templates/web/fiksgatami/nn/front/news.html
deleted file mode 100644
index e7f3184a9..000000000
--- a/templates/web/fiksgatami/nn/front/news.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[%
-    news = [
-        { date = '2011-04-26', text = '<a href="' _ c.config.ANDROID_URL _ '">Last ned FiksGataMi-app til Android-telefonen din.</a>' },
-        { date = '2011-04-23', text = 'Last ned FiksGataMi-app til Android-telefonen din. FiksGataMi sender no vegsaker òg til vegvesenet slik at kommunar ikkje treng senda saker vidare.' },
-    ]
-%]
-[% FOREACH item IN news %]
-    <p align="center" style="margin-bottom:0">
-        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
-    </p>
-[% END %]
-
diff --git a/templates/web/fiksgatami/nn/header.html b/templates/web/fiksgatami/nn/header.html
deleted file mode 100644
index 5449eff81..000000000
--- a/templates/web/fiksgatami/nn/header.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
-    <head>
-
-        <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-        <link rel="stylesheet" type="text/css" href="[% version('/cobrands/fiksgatami/css.css') %]">
-
-    [% INCLUDE 'common_header_tags.html' %]
-    </head>
-    <body>
-
-        [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %]
-            [%- loc('Fix<span id="my">My</span>Street') %]
-        [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
-
-        <ul id="meta">
-            [% IF c.user_exists %]
-                <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
-                <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
-            [% ELSE %]
-                <li>&nbsp;</li>
-            [% END %]
-        </ul>
-
-        <div id="wrapper"><div id="mysociety">
-
-    [% INCLUDE 'debug_header.html' %]
diff --git a/templates/web/fiksgatami/nn/reports/index.html b/templates/web/fiksgatami/nn/reports/index.html
deleted file mode 100755
index 05296ba76..000000000
--- a/templates/web/fiksgatami/nn/reports/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Summary reports') %]
-
-<p>
-[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %]
-</p>
-
-<table cellpadding="3" cellspacing="1" border="0">
-<tr>
-<th>[% loc('Name') %]</th>
-<th>[% loc('New problems') %]</th>
-<th>[% loc('Older problems') %]</th>
-<th>[% loc('Old problems,<br>state unknown') %]</th>
-<th>[% loc('Recently fixed') %]</th>
-<th>[% loc('Older fixed') %]</th>
-</tr>
-
-[% FOREACH body IN bodies %]
-[% NEXT IF body.id == 301 %]
-<tr align="center"
-[%- IF loop.count % 2 %] class="a"
-[%- END -%]
->
-<td align="left"><a href="[% body.url(c) %]">[% body.name %]</a></td>
-<td>[% open.${body.id}.new or 0 %]</td>
-<td>[% open.${body.id}.older or 0 %]</td>
-<td>[% open.${body.id}.unknown or 0 %]</td>
-<td>[% fixed.${body.id}.new or 0 %]</td>
-<td>[% fixed.${body.id}.old or 0 %]</td>
-</tr>
-[% END %]
-</table>
-
-[% INCLUDE 'footer.html' %]
-
diff --git a/templates/web/fiksgatami/reports/index.html b/templates/web/fiksgatami/reports/index.html
deleted file mode 100755
index 3235b96c4..000000000
--- a/templates/web/fiksgatami/reports/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Summary reports') %]
-
-<p>
-[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %]
-</p>
-
-<table cellpadding="3" cellspacing="1" border="0">
-<tr>
-<th>[% loc('Name') %]</th>
-<th>[% loc('New problems') %]</th>
-<th>[% loc('Older problems') %]</th>
-<th>[% loc('Old problems,<br>state unknown') %]</th>
-<th>[% loc('Recently fixed') %]</th>
-<th>[% loc('Older fixed') %]</th>
-</tr>
-
-[% FOREACH body IN bodies %]
-<tr align="center"
-[%- IF loop.count % 2 %] class="a"
-[%- END -%]
->
-<td align="left"><a href="[% body.url(c) %]">[% body.name %]</a></td>
-<td>[% open.${body.id}.new or 0 %]</td>
-<td>[% open.${body.id}.older or 0 %]</td>
-<td>[% open.${body.id}.unknown or 0 %]</td>
-<td>[% fixed.${body.id}.new or 0 %]</td>
-<td>[% fixed.${body.id}.old or 0 %]</td>
-</tr>
-[% END %]
-</table>
-
-[% INCLUDE 'footer.html' %]
-
diff --git a/templates/web/fixmystreet/front/news.html b/templates/web/fixmystreet/front/news.html
deleted file mode 100644
index 2285ab8d0..000000000
--- a/templates/web/fixmystreet/front/news.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[%#
-    news = [
-        { date = '2008-12-11', text = '<a href="">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' },
-    ]
-%]
-[% FOREACH item IN news %]
-    <p align="center" style="margin-bottom:0">
-        <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p>
-    </p>
-[% END %]
-
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index a20c35e51..f92518022 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -39,8 +39,4 @@ kinds of problems like missed bins use our
     [% INCLUDE 'front/recent.html' %]
 </div>
 
-
-<!-- [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] -->
-
-
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]