heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate some fixes from base.html to airy/base.html.

Browse Source 
When fixing our templates, we should always take a look at
the other themes and fix those too.
This commit is contained in:
Elrond 2012-12-13 15:29:36 +01:00
parent 248b7ba346
commit 42fe4f9965
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediagoblin/themes/airy/templates/mediagoblin/base.html
View File

@ -28,8 +28,6 @@
<link rel="shortcut icon" <link rel="shortcut icon"
href="{{ request.staticdirect('/images/goblin.ico') }}" /> href="{{ request.staticdirect('/images/goblin.ico') }}" />
<script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script> <script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script>
<script type="text/javascript"
src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script> <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
<![endif]--> <![endif]-->
@ -47,13 +45,18 @@
<a class="logo" <a class="logo"
href="{{ request.urlgen('index') }}"> href="{{ request.urlgen('index') }}">
<img src="{{ request.staticdirect('/images/logo.png', 'theme') }}" <img src="{{ request.staticdirect('/images/logo.png', 'theme') }}"
alt="{% trans %}MediaGoblin logo{% endtrans %}" /> alt="{% trans %}MediaGoblin logo{% endtrans %}" />
</a> </a>
{% endblock mediagoblin_logo %} {% endblock mediagoblin_logo %}
{% block mediagoblin_header_title %}{% endblock %} {% block mediagoblin_header_title %}{% endblock %}
<div class="header_right"> <div class="header_right">
{% if request.user %} {% if request.user %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} {% trans
user_url=request.urlgen('mediagoblin.user_pages.user_home',
user= request.user.username),
user_name=request.user.username -%}
<a href="{{ user_url }}">{{ user_name }}</a>'s account
{%- endtrans %}
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
{% if request.user and request.user.status == 'active' %} {% if request.user and request.user.status == 'active' %}
<a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a> <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a>
@ -65,7 +68,8 @@
{% trans %}Verify your email!{% endtrans %}</a> {% trans %}Verify your email!{% endtrans %}</a>
{% endif %} {% endif %}
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
request.base_url|urlencode }}">
{% trans %}Log in{% endtrans %}</a> {% trans %}Log in{% endtrans %}</a>
{% endif %} {% endif %}
</div> </div>