X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=f650c14e328015231849ca60067925be4df6e1fd;hb=f71f48bbebffa6bb81165a9e6acaa872181a8926;hp=6490ef59f1184e08cf3dbd52b6226cbc3152d43e;hpb=df482c9a6212b2b7134e8130358d213562b9df44;p=myslice.git

diff --git a/auth/views.py b/auth/views.py
index 6490ef59..f650c14e 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -7,7 +7,7 @@ from django.http import HttpResponseRedirect
 
 from auth.backend import MyCustomBackend
 
-from myslice.viewutils import the_user
+from myslice.viewutils import topmenu_items, the_user
 from myslice.config import Config
 
 def login_user(request):
@@ -29,7 +29,8 @@ def login_user(request):
             if user.is_active:
                 login(request, user)
                 #state = "You're successfully logged in!"
-                return HttpResponseRedirect ('/login-ok')
+                return HttpResponseRedirect ('/portal/dashboard')
+                #return HttpResponseRedirect ('/login-ok')
             else:
                 env['state'] = "Your account is not active, please contact the site admin."
                 return render_to_response('view-login.html',env, context_instance=RequestContext(request))
@@ -37,21 +38,15 @@ def login_user(request):
             env['state'] = "Your username and/or password were incorrect."
             return render_to_response('view-login.html',env, context_instance=RequestContext(request))
     else:
-        state='Welcome to MySlice'
+        state='' #Welcome to MySlice'
         env['state']=state
         env['username']=the_user(request)
+        env['topmenu_items'] = topmenu_items('', request)
         return render_to_response('view-login.html',env, context_instance=RequestContext(request))
 
 # hard question : where should we redirect requests to logout if user is not logged in ?
 def logout_user (request):
-    # xxx check that we're indeed logged in
-    if not request.user.is_authenticated():
-        return HttpResponseRedirect ('/')
-    return render_to_response('view-logout.html',{'username':the_user(request)},
-                              context_instance=RequestContext(request))
-
-def do_logout_user (request):
-    # xxx check that we're indeed logged in
+    # check that we're indeed logged in
     if not request.user.is_authenticated():
         return HttpResponseRedirect ('/')
     logout(request)