X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fbase.html;h=6394fa4f384221a3f120edf395c791c34c44ebff;hb=eedb6d1f3bc118ac98e713f52692a8399c6dc8e5;hp=068af79a6807c027e7ab7f21aaa01bdb91aa8c9e;hpb=fe253e31b33b82e2c6a6d17955945f698a59221d;p=mediagoblin.git diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 068af79a..6394fa4f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -16,10 +16,14 @@ # along with this program. If not, see . -#} - + + {% block title %}{{ app_config['html_title'] }}{% endblock %} @@ -31,10 +35,11 @@ src="{{ request.staticdirect('/js/extlib/jquery.js') }}"> - - + + {# For clarification, the difference between the extra_head.html template # and the head template hook is that the former should be used by @@ -49,7 +54,7 @@ {% endblock mediagoblin_head %} - {% include 'mediagoblin/bits/body-start.html' %} + {% include 'mediagoblin/bits/body_start.html' %} {% block mediagoblin_body %} {% block mediagoblin_header %}
@@ -57,26 +62,58 @@ {% block mediagoblin_header_title %}{% endblock %}
{%- if request.user %} - {% if request.user and request.user.status == 'active' %} -
▼
-
▲
- {% elif request.user and request.user.status == "needs_email_verification" %} + {% if request.user and + request.user.has_privilege('active') and + not request.user.is_banned() %} + + {% set notification_count = get_notification_count(request.user.id) %} + {% if notification_count %} + + {{ notification_count }} + {% endif %} + ▼ + ▲ + {% elif request.user and not request.user.has_privilege('active') %} {# the following link should only appear when verification is needed #} {% trans %}Verify your email!{% endtrans %} - or {% trans %}log out{% endtrans %} + or {% trans %}log out{% endtrans %} + {% elif request.user and request.user.is_banned() %} + {% trans %}log out{% endtrans %} +

+ + {%- trans %}Terms of Service{%- endtrans %} + +

{% endif %} - {%- else %} - + {%- elif auth %} + {%- trans %}Log in{% endtrans -%} {%- endif %}
- {% if request.user and request.user.status == 'active' %} + {% if request.user and request.user.has_privilege('active') %}

@@ -85,49 +122,66 @@ user_name=request.user.username -%} {{ user_name }}'s account {%- endtrans %} - · - {%- trans %}Change account settings{% endtrans -%} · - {%- trans %}Change account settings{% endtrans -%} + · + - {%- trans %}Media processing panel{% endtrans -%} - · {% trans %}Log out{% endtrans %} + {%- trans %}Media processing panel{% endtrans -%} + + · + {% trans %}Log out{% endtrans %}

- + {%- trans %}Add media{% endtrans -%} - + {%- trans %}Create new collection{% endtrans -%} - - - {% if request.user.is_admin %} - - {%- trans %}Media processing panel{% endtrans -%} - + {% if request.user.has_privilege('admin','moderator') %} +

+ Moderation powers: + + {%- trans %}Media processing panel{% endtrans -%} + + · + + {%- trans %}User management panel{% endtrans -%} + + · + + {%- trans %}Report management panel{% endtrans -%} + +

{% endif %} +

+ Terms of Service +

+ {% include 'mediagoblin/fragments/header_notifications.html' %}
{% endif %}
{% endblock %}
- {% include 'mediagoblin/bits/above-content.html' %} + {% include 'mediagoblin/bits/above_content.html' %}
{% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} + {% if csrf_token is defined %} + {% template_hook("persona_form") %} + {% endif %}
- {%- block mediagoblin_footer %} - - {%- endblock mediagoblin_footer %} + {%- include "mediagoblin/bits/base_footer.html" %}
{%- endblock mediagoblin_body %} - {% include 'mediagoblin/bits/body-end.html' %} + {% include 'mediagoblin/bits/body_end.html' %}