Patching the navbar

nnmon/templates/base.html

@@ -58,7 +58,9 @@
 						<li role="presentation" {% block active_tab_about %}{% endblock %}><a href="{%root_url%}/about">{% trans "What is Net Neutrality?" %}</a></li>
 						<li role="presentation" {% block active_tab_start %}{% endblock %}><a href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
 						{% if user.is_authenticated %}
+						<li>
 							<p class="navbar-text">{{ user.username }}</p>
+						</li>
 						<li role="presentation" class="dropdown">
 							<a class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">{% trans "Admin Action" %} <span class="caret"></span></a>
 							<ul class="dropdown-menu">
@@ -71,7 +73,7 @@
 						{% else %}
 						<li role="presentation"><a href="{%root_url%}/admin/" id="login">{% trans "Login" %}</a></li>
 						{% endif %}
-					</ul>
+						<li>
 							<form action="{% url 'set_language' %}" method="post" class="navbar-form">{% csrf_token %}
 								<div class="input-group">
 									<select class="form-control" name="language">
@@ -89,7 +91,9 @@
 									</span>
 								</div>
 							</form>
-					<form action="/search/" method="get" class="navbar-form navbar-right">
+						</li>
+						<li>
+							<form action="/search/" method="get" class="navbar-form">
 								<div class="input-group">
 									<input type="text" class="form-control" placeholder="Quick Search...">
 									<span class="input-group-btn">
@@ -97,7 +101,8 @@
 									</span>
 								</div>
 							</form>
-
+						</li>
+					</ul>
 				</div>
 			</div>
 		</nav>