diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/footer.html | 26 | ||||
| -rw-r--r-- | templates/web/default/header.html | 6 |
2 files changed, 19 insertions, 13 deletions
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index ae2a3798a..089eb1cb7 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -1,18 +1,24 @@ </div><!-- #mysociety .container --> - <div id="top" class="container"> + <div id="navigation" class="container" role="navigation"> <div class="spacer"></div> - <ul id="top-nav" class="nav"> - <li><a href="/my">[% loc("Your reports") %]</a></li> - <li><a href="/reports">[% loc("All reports") %]</a></li> - <li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li> - <li><a href="/faq">[% loc("Help") %]</a></li> + <ul id="site-nav" class="nav"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END + %]>[% 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> - <ul id="mysociety-tab" class="nav"> - <li><a id="mysociety-logo" href="http://www.mysociety.org/">mySociety</a></li> - <li><a href="http://mysociety.org/donate/">Donate</a></li> - <li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> + <ul id="mysociety-nav" class="nav"> + <li><a id="mysociety-logo" href="http://www.mysociety.org/">mySociety</a></li>[% + %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% + %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> </ul> </div> diff --git a/templates/web/default/header.html b/templates/web/default/header.html index 898c1b9fe..556f55523 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -13,7 +13,7 @@ <link rel="stylesheet" href="[% version('/css/core.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:40em)"> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> <![endif]--> @@ -31,7 +31,7 @@ <div id="wrapper"><div id="wrapper2"><div id="wrapper3"> - [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %] + [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END %] [%- loc('Fix<span id="my">My</span>Street') %] [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] @@ -44,6 +44,6 @@ [% END %] </ul> - <div id="mysociety" class="container"> + <div id="mysociety" class="container" role="main"> [% INCLUDE 'debug_header.html' %] |