Remove example navbar stuff, slide administration to the right of the bar

go/go/templates/navigation.html

@@ -13,15 +13,6 @@
       <li><a href="{% url 'about' %}">About</a></li>
       {% if user.is_authenticated %}
       <li><a href="{% url 'my_links' %}">My Links</a></li>
-      {% if user.is_staff and user|is_approved %}
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration<b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="{% url 'useradmin' %}">User Moderation</a></li>
-          <li><a href="{% url 'signup' %}">Signup</a></li>
-        </ul>
-      </li>
-      {% endif %}
       {% if not user|is_registered %}
       <li><a href="{% url 'signup' %}">Register</a></li>
       {% endif %}
@@ -31,17 +22,15 @@
       {% endif %}
     </ul>
     <ul class="nav navbar-nav navbar-right">
-      <li><a href="#">Link</a></li>
+      {% if user.is_staff and user|is_approved %}
       <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration<b class="caret"></b></a>
         <ul class="dropdown-menu">
-          <li><a href="#">Action</a></li>
-          <li><a href="#">Another action</a></li>
-          <li><a href="#">Something else here</a></li>
-          <li class="divider"></li>
-          <li><a href="#">Separated link</a></li>
+          <li><a href="{% url 'useradmin' %}">User Moderation</a></li>
+          <li><a href="{% url 'signup' %}">Signup</a></li>
         </ul>
       </li>
+      {% endif %}
     </ul>
   </div>
 </div>