reorder, properly navbar login/register stuff

fixes bss/dr.botzo#19
This commit is contained in:
Brian S. Stephan 2017-02-11 17:22:46 -06:00
parent dcd41516a6
commit 8d87945107
1 changed files with 14 additions and 16 deletions

View File

@ -27,6 +27,14 @@
</div>
<div class="navbar-collapse collapse" aria-expanded="false" style="height: 1px;">
{% block navbar_menu %}
<ul class="nav navbar-nav">
<li><a href="{% url 'facts_index' %}">Item Sets</a></li>
<li><a href="{% url 'karma_index' %}">Karma</a></li>
<li><a href="{% url 'markov_index' %}">Markov</a></li>
<li><a href="{% url 'races_index' %}">Races</a></li>
</ul>
{% endblock %}
<div class="navbar-right">
<ul class="nav navbar-nav">
{% if user.is_authenticated %}
@ -59,25 +67,15 @@
</ul>
</li>
{% else %}
<ul class="nav navbar-nav">
<li>
<a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a>
</li>
<li>
<a href="{% url 'registration_register' %}">Sign up</a>
</li>
</ul>
<li>
<a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a>
</li>
<li>
<a href="{% url 'registration_register' %}">Sign up</a>
</li>
{% endif %}
</ul>
</div>
{% block navbar_menu %}
<ul class="nav navbar-nav">
<li><a href="{% url 'facts_index' %}">Item Sets</a></li>
<li><a href="{% url 'karma_index' %}">Karma</a></li>
<li><a href="{% url 'markov_index' %}">Markov</a></li>
<li><a href="{% url 'races_index' %}">Races</a></li>
</ul>
{% endblock %}
</div>
</div>
</div>