# HG changeset patch
# User Branko Majic <branko@majic.rs>
# Date 2013-03-17 14:37:22
# Node ID 18ff99706db578c90a62122404182ca1ef3d3f36
# Parent  683a733d3e9ca4cca4376b173a91bdf2901e8d73

Configured the log-out URL/view. Added the username/log-in/log-out buttons to page header.

diff --git a/conntrackt/templates/conntrackt/template.html b/conntrackt/templates/conntrackt/template.html
--- a/conntrackt/templates/conntrackt/template.html
+++ b/conntrackt/templates/conntrackt/template.html
@@ -33,6 +33,14 @@
               <li class="{% active_link 'index' %}"><a href="{% url index %}"><i class="icon-home icon-white"></i> Main Page</a></li>
               <li class="{% active_link 'admin' %}"><a href="{% url admin:index %}"><i class="icon-wrench icon-white"></i> Administration</a></li>
             </ul>
+            <ul class="nav pull-right">
+              {% if user.is_anonymous %}
+              <li>{% html_link '<i class="icon-user icon-white"></i> Log-in' 'login' get="next="|add:request.path %}</li> %}
+              {% else %}
+              <li><a href=""><i class="icon-user icon-white"></i> {{user}}</a></li>
+              <li>{% html_link '<i class="icon-off icon-white"></i> Log-out' "logout" get="next="|add:request.path %}</li>
+              {% endif %}
+            </ul>
               {% endblock %}
           </div>
         </div>
diff --git a/conntrackt/urls.py b/conntrackt/urls.py
--- a/conntrackt/urls.py
+++ b/conntrackt/urls.py
@@ -2,7 +2,7 @@
 from django.conf.urls import patterns, url
 
 # For logging-in the users
-from django.contrib.auth.views import login
+from django.contrib.auth.views import login, logout
 
 # For plain generic views
 from conntrackt.models import Entity
@@ -27,7 +27,8 @@ urlpatterns = patterns(
     url(r'^project/(?P<project_id>\d+)/iptables/$', get_project_iptables, name="project_iptables"),
     # View for rendering zip file with iptables rules for all entities in a project for a specific location.
     url(r'^project/(?P<project_id>\d+)/location/(?P<location_id>\d+)/iptables/$', get_project_iptables, name="project_location_iptables"),
-    # View for logging-in the users.
-    url(r'^login/$', login, {'template_name': 'conntrackt/login.html'}),
+    # Views for logging-in/out the users.
+    url(r'^login/$', login, {'template_name': 'conntrackt/login.html'}, name = "login"),
+    url(r'^logout/$', logout, name = "logout"),
 )