diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-05-26 00:15:26 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-05-26 00:15:26 +0200 |
| commit | 38aa4a4026ab328fe00a145daa90bbe1eceb5caf (patch) | |
| tree | f55eb1a6281c11cd0de68d67790fae411db9a824 | |
| parent | 207219b5614c68917e0a98250cc25f048aae7af9 (diff) | |
| download | mediagoblin-38aa4a4026ab328fe00a145daa90bbe1eceb5caf.tar.lz mediagoblin-38aa4a4026ab328fe00a145daa90bbe1eceb5caf.tar.xz mediagoblin-38aa4a4026ab328fe00a145daa90bbe1eceb5caf.zip | |
Put log in / log out in its place!
| -rw-r--r-- | mediagoblin/static/css/base.css | 4 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 7ce71789..9e5fdcce 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -52,6 +52,10 @@ label { margin-right: auto; } +.mediagoblin_header_right { + float:right; +} + .button_red, .button_green { font-family: 'Carter One', arial, serif; height: 28px; diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index e785cfcc..a0e0730d 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -32,7 +32,7 @@ {% block mediagoblin_logo %} <a href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/icon.png') }}" class="icon" /></a> {% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} - + <div class="mediagoblin_header_right"> {% if request.user %} Welcome {{ request.user['username'] }}! -- <a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> @@ -41,6 +41,7 @@ <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> Login</a> {% endif %} + </div> </div> </div> {% endblock %} |