From 8d87945107d1f258663ca170ea2e78864f4680d1 Mon Sep 17 00:00:00 2001
From: "Brian S. Stephan" <bss@incorporeal.org>
Date: Sat, 11 Feb 2017 17:22:46 -0600
Subject: [PATCH] reorder, properly navbar login/register stuff

fixes bss/dr.botzo#19
---
 templates/base.html | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 283c7cf..6a5cddc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -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>