Added logout. Removed magical routing.

diff --git a/floof/config/routing.py b/floof/config/routing.py
index ff850b8..c8f9e4e 100644 (file)
--- a/floof/config/routing.py
+++ b/floof/config/routing.py
@@ -25,12 +25,10 @@ def make_map():
     map.connect('/account/login', controller='account', action='login')
     map.connect('/account/login_begin', controller='account', action='login_begin', **require_POST)
     map.connect('/account/login_finish', controller='account', action='login_finish')
     map.connect('/account/login', controller='account', action='login')
     map.connect('/account/login_begin', controller='account', action='login_begin', **require_POST)
     map.connect('/account/login_finish', controller='account', action='login_finish')

+    map.connect('/account/logout', controller='account', action='logout', **require_POST)

     map.connect('/account/register', controller='account', action='register')
     map.connect('/account/register_finish', controller='account', action='register_finish', **require_POST)
 
     map.connect('/search', controller='search', action='index')
 
     map.connect('/account/register', controller='account', action='register')
     map.connect('/account/register_finish', controller='account', action='register_finish', **require_POST)
 
     map.connect('/search', controller='search', action='index')
 

-    map.connect('/{controller}/{action}')
-    map.connect('/{controller}/{action}/{id}')
-

     return map
     return map

diff --git a/floof/controllers/account.py b/floof/controllers/account.py
index 0c53a6d..e4f39f3 100644 (file)
--- a/floof/controllers/account.py
+++ b/floof/controllers/account.py
@@ -72,6 +72,17 @@ class AccountController(BaseController):
         # XXX send me where I came from
         redirect_to('/')
 
         # XXX send me where I came from
         redirect_to('/')
 

+    def logout(self):
+        """Log user out."""
+
+        if 'user_id' in session:
+            del session['user_id']
+            session.save()
+
+        # XXX success message
+        # XXX send me where I came from
+        redirect_to('/')
+

     def register(self):
         """Logging in with an unrecognized identity URL redirects here."""
 
     def register(self):
         """Logging in with an unrecognized identity URL redirects here."""
 

diff --git a/floof/templates/base.mako b/floof/templates/base.mako
index e36f3ea..f50f56a 100644 (file)
--- a/floof/templates/base.mako
+++ b/floof/templates/base.mako
@@ -16,7 +16,9 @@ ${h.end_form()}
 
     <div id="user">
         % if c.user:
 
     <div id="user">
         % if c.user:

-        <p>Logged in as ${c.user.name}</p>
+        <form action="${url(controller='account', action='logout')}" method="POST">
+        <p>Logged in as ${c.user.name}.  ${h.submit(None, 'Log out')}</p>
+        </form>

         % else:
         <form action="${url(controller='account', action='login_begin')}" method="POST">
         <p>
         % else:
         <form action="${url(controller='account', action='login_begin')}" method="POST">
         <p>