Merge branch 'master' of github.com:tixl/tixl

src/tixlcontrol/views/auth.py

@@ -4,6 +4,7 @@ from django import forms
 from django.utils.translation import ugettext as _
 from django.contrib.auth import authenticate
 from django.contrib.auth import login as auth_login
+from django.contrib.auth import logout as auth_logout
 
 
 class AuthenticationForm(BaseAuthenticationForm):
@@ -64,3 +65,8 @@ def login(request):
         form = AuthenticationForm()
     ctx['form'] = form
     return render(request, 'tixlcontrol/auth/login.html', ctx)
+
+
+def logout(request):
+    auth_logout(request)
+    return redirect('control:auth.login')

src/tixlcontrol/views/main.py

@@ -1,5 +1,6 @@
 from django.http import HttpResponse
+from django.shortcuts import render
 
 
 def index(request):
-    return HttpResponse('Coming soon.')
+    return render(request, 'tixlcontrol/base.html', {})