diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 995840f8..7ce71789 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -46,7 +46,7 @@ label { margin-right:10px; } -.mediagoblin_content { +.mediagoblin_container { width: 960px; margin-left: auto; margin-right: auto; diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 80a63424..e785cfcc 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -28,10 +28,11 @@ {% block mediagoblin_body %} {% block mediagoblin_header %} <div class="mediagoblin_header"> - <div class="mediagoblin_content"> + <div class="mediagoblin_container"> {% 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 %} + {% if request.user %} Welcome {{ request.user['username'] }}! -- <a href="{{ request.urlgen('mediagoblin.auth.logout') }}"> @@ -43,7 +44,7 @@ </div> </div> {% endblock %} - <div class="mediagoblin_content"> + <div class="mediagoblin_container"> {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> |