More stats!

templates/base.html

@@ -2,16 +2,16 @@
 {% load staticfiles %}
 <html>
 <head>
-    <title>{%block title%}BBS{%endblock%}</title>
+    <title>{% block title %}BBS{% endblock %}</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="x-django-static-url" content="{% static "" %}">
     <link rel="stylesheet" href="{% static "dist/styles/screen.css" %}" type="text/css" media="screen, projection">
-    {%block headinc %}{%endblock%}
+    {% block headinc %}{% endblock %}
 </head>
 <body>
     <header id="header">
-    {%block header%}
+    {% block header %}
         <nav class="navbar navbar-inverse" role="navigation">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -38,11 +38,11 @@
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                            {% if request.user.is_authenticated %}<li class="{% block active_profile %}{% endblock %}"><a href="{% url 'profile' %}"><i class="glyphicon glyphicon-user"></i> Profil</a></li>{% endif %}
+                            {% if user.is_authenticated %}<li class="{% block active_profile %}{% endblock %}"><a href="{% url 'profile' %}"><i class="glyphicon glyphicon-user"></i> Profil</a></li>{% endif %}
                             <li class="{% block active_create_user %}{% endblock %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
-                            {% if request.user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}
-                            {% if request.user.is_superuser %}<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
-                            {% if request.user.is_superuser %}<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
+                            {% if user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}
+                            {% if user.is_superuser %}<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
+                            {% if user.is_superuser %}<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
                             <li class="divider"></li>
                             <li><a href="{% url 'logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
                         </ul>
@@ -51,25 +51,25 @@
                 </ul>
             </div><!-- /.navbar-collapse -->
         </nav>
-    {%endblock%}
+    {% endblock %}
     </header>
     <div id="container" class="container">
-        {%block content%}
-        {%endblock%}
+        {% block content %}
+        {% endblock %}
         <div id="footer" class="row">
             <div class="col-md-12">
-                {%block footer %}
+                {% block footer %}
                 <div class="credits">
                     Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://edb.neuf.no/">EDB-gjengen i KAK</a><br/>
                      <a href="http://edb.neuf.no/"><img src="{% static "dist/images/edb_brick.png" %}" alt="EDB" /></a>
                 </div>
-                {%endblock%}
+                {% endblock %}
             </div>
         </div>
     </div>
 
     <script type="text/javascript" src="{% static "dist/js/app.min.js" %}"></script>
-    <script>
+    <!--<script>
     if('serviceWorker' in navigator) {
         navigator.serviceWorker.register('/service-worker.js', { scope: '/' })
         .then(function(registration) {
@@ -80,7 +80,7 @@
             console.log("Service Worker Ready");
         });
     }
-    </script>
-    {%block tailinc %}{%endblock%}
+    </script>-->
+    {% block tailinc %}{% endblock %}
 </body>
 </html>