Bootstrap v3, edge case fixes

templates/nav.html

@@ -1,26 +1,25 @@
-        <nav class="navbar navbar-inverse">
-            <div class="navbar-inner">
-                <div class="container">
-                    <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-                    <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </a>
-                    <a href="/" class="brand">Biceps Bar System - BBS</a>
-                    <div class="nav-collapse">
-                        <ul class="nav">
-                            {% if active %}
-                                <li class="{% if active = "register" %}active{% endif %}"><a href="/register"><i class="icon-home icon-white"></i> Kjøp drikke</a></li>
-                                <li class="{% if active = "deposit" %}active{% endif %}"><a href="/deposit">Sett inn penger</a></li>
-                                <li class="{% if active = "log" %}active{% endif %}"><a href="/log"> Vis logg</a></li>
-                                <li class="{% if active = "stats" %}active{% endif %}"><a href="/stats"> Vis statistikk</a></li>
-                                {% if request.user.is_superuser %}
-                                <li><a href="/admin">Administrasjon</a></li>
-                                {% endif %}
-                            {% endif %}
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </nav>
+<nav class="navbar navbar-inverse" role="navigation">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="/">Biceps Bar System - BBS</a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+        <ul class="nav navbar-nav">
+            <li class="{% if active = "register" %}active{% endif %}"><a href="/register"><i class="glyphicon glyphicon-home white"></i> Kjøp drikke</a></li>
+            <li class="{% if active = "deposit" %}active{% endif %}"><a href="/deposit">Sett inn penger</a></li>
+            <li class="{% if active = "log" %}active{% endif %}"><a href="/log"> Vis logg</a></li>
+            <li class="{% if active = "stats" %}active{% endif %}"><a href="/stats"> Vis statistikk</a></li>
+            {% if request.user.is_superuser %}
+            <li><a href="/admin">Administrasjon</a></li>
+            {% endif %}
+        </ul>
+    </div><!-- /.navbar-collapse -->
+</nav>