diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-12-05 15:53:40 +0000 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-12-05 15:53:40 +0000 |
| commit | bb8a88e5cec09221143bdf9ca9db6b94d1cad2d5 (patch) | |
| tree | 0b21b0ee9c1066e384f6add887f31ae317e77950 | |
| parent | 4a739e6dfc12861967a6b78743f3f9a528d7733e (diff) | |
slot the user/logout into the header
| -rw-r--r-- | templates/web/oxfordshire/header.html | 10 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/layout.scss | 3 | ||||
| -rw-r--r-- | web/cobrands/oxfordshire/oxfordshire.scss | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index ead6858bf..6c338452a 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -40,7 +40,15 @@ <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> </span> <div style="clear:both"></div> - <span class="header">FixMyStreet</span> + <span class="header"><a href="/">FixMyStreet</a></span> + <div class="oxford-user"> + <p> + [% IF c.user_exists %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + [% END %] + </p> + </div> </div> <!-- end of oxford header --> <div id="oxford-main-menu" class="desk-only"> <ul class="tabs"> diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index 2c02ce31e..da4fbc150 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -24,7 +24,8 @@ body { } // Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav -.nav-wrapper { +// likewise with user-meta +.nav-wrapper, #user-meta { display: none; } diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index 3efb6fbdb..0429a622b 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -55,9 +55,7 @@ body { } } - - /* - .sign-in { + .oxford-user { float: right; p { padding: 0.25em; @@ -67,7 +65,6 @@ body { } } } - */ } |