diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-01-16 18:11:00 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-01-16 18:11:00 +0000 |
| commit | 60a19ef31281df06372938f3acf26465850f457b (patch) | |
| tree | b1cb34f96958b496099af8b2901f12ac8ccb558b | |
| parent | b570f6531bb33141add046ce68e3c25491ebad60 (diff) | |
Move logged in notice to top right.
| -rw-r--r-- | templates/web/zurich/footer.html | 7 | ||||
| -rw-r--r-- | templates/web/zurich/header.html | 11 | ||||
| -rw-r--r-- | web/cobrands/zurich/layout.scss | 21 |
3 files changed, 28 insertions, 11 deletions
diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index 2e4717360..499923b1c 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -5,6 +5,12 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + </p><p><a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] <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>[% @@ -13,6 +19,7 @@ %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> </ul> + [% END %] </div> </div> </div> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index fdc4f1800..d47a05a0d 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -43,17 +43,6 @@ </div> </header> - <div id="user-meta"> - [% IF c.user_exists %] - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> - [% END %] - </div> - [% pre_container_extra %] <div class="container"> diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index b6e8337e1..cfd945034 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -47,6 +47,27 @@ body.mappage { } } +.nav-wrapper-2 p:first-child { + font-weight: bold; + margin-top: 0.75em; +} +.nav-wrapper-2 p { + line-height: 1.2; + color: white; + clear: right; + float: right; + margin: 0 1em 0 0; + font-size: 85%; + a { + color: white; + font-size: 85%; + } + a:hover { + color: white; + } +} + +/* TODO Change the main-nav to be what is wanted */ #main-nav { ul#main-menu { li { |