Fix some Django 1.11 stuff

This commit is contained in:
Nikolai R Kristiansen committed 2017-09-27 21:15:27 +02:00
1 parent c1ef6f6678
commit 8fb2389d2c
3 files changed
+17 -12

No files matched your search

+2 -2
View File
@@ -33,7 +33,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}
<li><a href="{% url 'login' %}">Logg inn</a></li>
<li><a href="{% url 'django.contrib.auth.views.login' %}">Logg inn</a></li>
{% else %}
<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>
@@ -44,7 +44,7 @@
{% 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>
<li><a href="{% url 'django.contrib.auth.views.logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
</ul>
</li>
{% endif %}