Merge remote-tracking branch 'gitorious/master'

This commit is contained in:
Jef van Schendel 2011-05-26 19:27:58 +02:00
commit c7da9c973f

View File

@ -31,7 +31,7 @@
<div class="mediagoblin_container"> <div class="mediagoblin_container">
{% block mediagoblin_logo %} {% block mediagoblin_logo %}
<a href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/icon.png') }}" class="icon" /></a> <a href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/icon.png') }}" class="icon" /></a>
{% endblock %}{% block mediagoblin_header_title %}MediaGoblin Home{% endblock %} {% endblock %}{% block mediagoblin_header_title %}GNU MediaGoblin Home{% endblock %}
<div class="mediagoblin_header_right"> <div class="mediagoblin_header_right">
{% if request.user %} {% if request.user %}
{{ request.user['username'] }}'s account {{ request.user['username'] }}'s account