diff --git a/reviewboard/templates/base.html b/reviewboard/templates/base.html index d9dbe0f916a71d711f9334304d9b1fcfc1052633..7f0232990232132cfd452be875ec36e4a2254537 100644 --- a/reviewboard/templates/base.html +++ b/reviewboard/templates/base.html @@ -1,7 +1,7 @@ -{% load compressed djblets_deco djblets_extensions djblets_utils gravatars %} -{% load i18n rb_extensions staticfiles %} +{% load compressed djblets_deco djblets_extensions djblets_utils i18n %} +{% load staticfiles %} @@ -52,72 +52,19 @@ {% endblock %}

-{% block headerbar %} -

-{% include "base/branding.html" %} -

- {% trans "Support" %} ▾ -
- {% trans "Documentation" %}
- {% trans "Get Support" %}
-
- {% gravatar user 32 %} {{user.username}} ▾ -
- {% trans "My account" %}
- {% trans "Admin" %}
- {% trans "Log out" %}
-
{% trans "Log in" %}
{% trans "Register" %}

-

-{% if siteconfig.settings.search_enable %} - -{% endif %} -

-
-

-{% template_hook_point "base-before-navbar" %} - -{% block navbar %} +{% block headerbar %} +{% include "base/headerbar.html" %} +{% template_hook_point "base-before-navbar" %}

- -{% endblock %} -{% template_hook_point "base-after-navbar" %} -{% block navbar_post %}{% endblock %} +{% block navbar %} +{% include "base/navbar.html" %} +{% endblock %} +{% template_hook_point "base-after-navbar" %} +{% block navbar_post %}{% endblock %}

{% endblock %} +

+{% include "base/branding.html" %} +

+ {% trans "Support" %} ▾ +
- {% trans "Documentation" %}
- {% trans "Get Support" %}
+
+ {% gravatar user 32 %} {{request.user.username}} ▾ +
+
{% trans "Log in" %}
{% trans "Register" %}

+ +

+{% if siteconfig.settings.search_enable %} + +{% endif %} +

+ +
+ +{% if request.user.is_authenticated or not siteconfig.settings.auth_require_sitewide_login %} +{% if request.user.is_authenticated %} +

{% trans "My Dashboard" %}

+

{% trans "New Review Request" %}

+{% endif %} +

{% trans "All Review Requests" %}

+

{% trans "Users" %}

+

{% trans "Groups" %}

+{% navigation_bar_hooks %} +{% endif %} +