diff options
author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-10-21 21:49:39 +0200 |
---|---|---|
committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-10-21 21:49:39 +0200 |
commit | 294979824c2eb651168c66f58e1d759a2ff56ada (patch) | |
tree | 4732e025c5cb166eb76286aa013214d855a17978 /mediagoblin/templates | |
parent | 9e443248aad8de07710f46aab05008107122b5ff (diff) | |
download | mediagoblin-294979824c2eb651168c66f58e1d759a2ff56ada.tar.lz mediagoblin-294979824c2eb651168c66f58e1d759a2ff56ada.tar.xz mediagoblin-294979824c2eb651168c66f58e1d759a2ff56ada.zip |
Replace dropdown in top right with regular links
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 5620debd..ef99242f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -52,23 +52,17 @@ {% block mediagoblin_header_title %}{% endblock %} <div class="header_right"> {% if request.user %} + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) + {% if request.user and request.user.status == 'active' %} + <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a> + {% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user=request.user.username) }}" + user=request.user.username) }}" class="button_action_highlight"> - {% trans %}Verify your email!{% endtrans %}</a> + {% trans %}Verify your email!{% endtrans %}</a> {% endif %} - <div class="dropdown"> - {{ request.user.username }} ▾ - <div class="dropdown_items"> - {% if request.user and request.user.status == 'active' %} - <a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}+ Add media{% endtrans %}</a> - {% endif %} - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{% trans %}View your profile{% endtrans %}</a> - <a class="button_action" href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> - </div> - </div> {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> {% trans %}Log in{% endtrans %}</a> |