From: Jef van Schendel Date: Sun, 2 Dec 2012 01:19:20 +0000 (+0100) Subject: Several edits to header dropdown: X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3afe739c410bb64b29ee4b1c8da4894cbabf00ca;p=mediagoblin.git Several edits to header dropdown: - Style the up/down arrow as a button - Remove the Actions header - Remove redundant original "Add media" button - Style "Add media" and "Create new collection" links as buttons --- diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 0717e7ba..fe383334 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -53,12 +53,9 @@ {% block mediagoblin_header_title %}{% endblock %}
{% if request.user %} - {{ request.user.username }}{% trans %}'s account{% endtrans %} - ({% trans %}log out{% endtrans %}) {% if request.user and request.user.status == 'active' %} - {% trans %}Add media{% endtrans %} -
-
+
+
{% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #}
{% if request.user.status == 'active' %}
-

{% trans %}Actions{% endtrans %}

+
{{ request.user.username }}{% trans %}'s account{% endtrans %} + ({% trans %}log out{% endtrans %})