Merge pull request #2 from ishank011/master

Logout in Dashboard

Author: shashi1920

collect/collect/__init__.pyc

@@ -8,8 +8,8 @@
 
     url(r'^admin/', include(admin.site.urls)),
     url(r'^index/$', 'collection.views.index', name='index'),
-    url(r'^login/$', 'collection.views.login_user'),
-    url(r'^logout/$', 'django.contrib.auth.views.logout'),
+    url(r'^login/$', 'collection.views.login_user', name='login_user'),
+    url(r'^logout/$', 'collection.views.logout_user', name='logout_user'),
     url(r'^programme/(?P<br>[A-Za-z]{2})/$', 'collection.views.programme_list', name='programme_list'),
     url(r'^programme/(?P<kr>[A-Za-z]{2})/(?P<pro>[A-Za-z]+)/(?P<sem>\d+)/$', 'collection.views.pro_course_list'),
     url(r'^programme/(?P<kr>[A-Za-z]{2})/(?P<pro>[A-Za-z]+)/(?P<sem>\d+)/submit/$', 'collection.views.add_teacher'),

collect/collect/settings.pyc

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
-from django.contrib.auth import authenticate, login
+from django.contrib.auth import authenticate, login, logout
 from .models import Professor
 from .models import Profile
 from .models import dept
@@ -64,6 +64,11 @@ def login_user(request):
 
     return render(request, 'registration/login.html',{'state':state})
 
+def logout_user(request):
+    if request.user.is_authenticated():
+        logout(request)
+    return render(request, 'registration/logged_out.html')
+
 
 def add_teacher(request, kr, pro,sem):
     errors=[]

collect/collect/urls.py

@@ -32,7 +32,7 @@
         <li><a href="#contact">Contact</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="#about">About</a></li>
+        <li><a href="{% url 'logout_user' %}">Logout</a></li>
       </ul>
     </div><!--/.nav-collapse -->
   </div>

collect/collect/urls.pyc

@@ -16,7 +16,9 @@
             <div class="wrap">
                 <p class="form-title">
                     Logged out!</p>
-           
+            <form action="{% url 'login_user' %}" class="login" >
+                <input type="submit" value="Log In again" class="btn btn-info">
+            </form>
 
 
 

collect/collect/wsgi.pyc

@@ -15,7 +15,7 @@
                 <div class="wrap">
                     <p class="form-error"><strong>{{ state }}</strong></p>
                 </div>
-                <form class="login" method="post" action="/login/">
+                <form class="login" method="post" action="{% url 'login_user' %}">
                 {% csrf_token %}
                 <input type="text" name="username" placeholder="Username" />
                 <input type="password" name="pass" placeholder="Password" />