diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-10-05 11:20:09 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-10-07 13:35:21 +0100 |
| commit | 1eccd97c82cf22bf3979378f85cbc7ec39a66807 (patch) | |
| tree | c093dff839f28bc506cb5ab5fb9bf31405ec43dc /templates/web/base/header.html | |
| parent | 2b9178d071c383f0064ce3e545afb3f4b4ffdabd (diff) | |
Combine some base/fixmystreet templates.
The aim is to combine base and fixmystreet as much as possible,
providing enough template/styling hooks for any cobrand. This
commit removes the need for separate base/fixmystreet templates
for the front page, almost all of the /around templates, the
open graph headers, and the low level item list templates.
Diffstat (limited to 'templates/web/base/header.html')
| -rw-r--r-- | templates/web/base/header.html | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 479a349f3..1d7960661 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -11,6 +11,8 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> + [% INCLUDE 'header_opengraph.html' %] + <link rel="stylesheet" href="[% version('/css/core.css') %]"> [% INCLUDE 'common_header_tags.html' %] @@ -24,14 +26,16 @@ %][% 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> + [% 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 %] + + [% pre_container_extra %] <div id="mysociety" class="container" role="main"> |