version 1.0 + dropdown menu

cao_blogr/views/default.py

@@ -139,24 +139,33 @@ def settings(request):
         }
 
 
-@view_config(route_name='login',
-             renderer='cao_blogr:templates/login.jinja2')
+@view_config(route_name='login', renderer='cao_blogr:templates/login.jinja2')
 @forbidden_view_config(renderer='cao_blogr:templates/login.jinja2')
 def login(request):
     username = request.POST.get('username')
-    
+    login_url = request.route_url('login')
+
+    referrer = request.url
+    if referrer == login_url:
+        referrer = '/' # never use the login form itself as came_from
+
+    came_from = request.params.get('came_from', referrer)
+    username = request.POST.get('username')
+    userpwd = request.POST.get('password')
     if username:
         user = UserService.by_name(request, username)
-        if user and user.verify_password(request.POST.get('password')):
-            headers = remember(request, user.name)
+        if user and user.verify_password(userpwd):
+            headers = remember(request, username)
             request.session.flash("Bonjour %s, Bienvenue sur le site !" % username, 'success')
-            return HTTPFound(location=request.route_url('home'), headers=headers)
+            return HTTPFound(location=came_from, headers=headers)
         else:
             headers = forget(request)
             request.session.flash("Login et mot de passe invalides. La connexion a échoué.", "danger")
 
     return {
         'page_title': "",
+        'came_from': came_from,
+        'login_url': login_url,
         }
 
 
@@ -167,8 +176,7 @@ def logout(request):
     return HTTPFound(location=request.route_url('home'), headers=headers)
 
 
-@view_config(route_name='users',
-             renderer='cao_blogr:templates/users.jinja2', permission='manage')
+@view_config(route_name='users', renderer='cao_blogr:templates/users.jinja2', permission='manage')
 def users(request):
     # get all users
     users = UserService.all(request)