diff options
| -rw-r--r-- | templates/web/fixmystreet/footer.html | 62 | ||||
| -rw-r--r-- | templates/web/fixmystreet/header.html | 38 |
2 files changed, 54 insertions, 46 deletions
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 089eb1cb7..f7513e1d6 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,31 +1,37 @@ - </div><!-- #mysociety .container --> - - <div id="navigation" class="container" role="navigation"> - <div class="spacer"></div> - <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-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><!-- .content role=main --> + </div><!-- .container --> + + </div> <!-- .wrapper --> + + + + + <div class="nav-wrapper"> + <div class="header"> + <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <li><a 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> + + <ul id="main-menu"> + <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> + </div> + </div> </div> -</div></div></div><!-- wrappers --> - -<div id="footer"> +<!-- <div id="footer"> <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a> <br>Mobile apps: @@ -43,9 +49,9 @@ [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %] </p> -</div> +</div> --> -[% INCLUDE 'debug_footer.html' %] +<!-- [% INCLUDE 'debug_footer.html' %] --> </body> </html> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index ff08116a9..f40f541bd 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -29,21 +29,23 @@ </head> <body> -<div id="wrapper"><div id="wrapper2"><div id="wrapper3"> - - [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END - %]<img src="/cobrands/fixmystreet/fms-logo-flat.png" width=327 height=62 alt="[% loc('FixMyStreet') %]"> - [%- 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 class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> - [% ELSE %] - <li> </li> - [% END %] - </ul> - - <div id="mysociety" class="container" role="main"> - - [% INCLUDE 'debug_header.html' %] + <div class="wrapper"> + + <header id="header" role="banner"> + <div class="container"> + <a href="/" id="site-logo">FixMyStreet</a> + </div> + </header> + + <div class="container"> + <div class="content" role="main"> + <ul id="user-meta"> + [% IF c.user_exists %] + <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] + <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + [% ELSE %] + <li> </li> + [% END %] + </ul> + + <!-- [% INCLUDE 'debug_header.html' %] --> |