Merge pull request tsoporan#4 from ploosh/develop

I added stuff, bro~
scjudd · Sep 16, 2011 · 34ee4f0 · 34ee4f0
2 parents 40fbb94 + a12b27f
commit 34ee4f0
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/cyclonejet/templates/base.html b/cyclonejet/templates/base.html
@@ -4,49 +4,45 @@
 <!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-	<title>cyclonejet - {% block title %}{% endblock %}</title>
-	<meta name="description" content="">
-	<meta name="author" content="">
+    <title>cyclonejet - {% block title %}{% endblock %}</title>
+    <meta name="description" content="">
+    <meta name="author" content="">
 
-	<meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
 
-	{% block css %}
-	<link rel="stylesheet" href="css/style.css">
-	{% endblock %}
+    {% block css %}
+        <link rel="stylesheet" href="css/style.css">
+    {% endblock %}
 
-	{% block js %}
-	<script src="js/libs/modernizr-2.0.6.min.js"></script>
-	{% endblock %}
+    {% block js %}
+        <script src="js/libs/modernizr-2.0.6.min.js"></script>
+    {% endblock %}
 </head>
 
 <body>
-	<div id="container">
+    <div id="container">		
+        <header>
+            <nav>
+                <ul>
+                    <li><a href=""></a></li>	
+                    <li><a href=""></a></li>	
+                    <li><a href=""></a></li>	
+                    <li><a href=""></a></li>	
+                </ul>
+            </nav> <!-- end main nav -->
+        </header>	
+
+        <div id="main" role="main">
+            {% block content %} 
+            {% endblock %}
+        </div> <!-- end main content -->
 
-		<header>
-
-			<nav>
-				<ul>
-					<li><a href=""></a></li>	
-					<li><a href=""></a></li>	
-					<li><a href=""></a></li>	
-					<li><a href=""></a></li>	
-				</ul>
-				</nav> <!-- end main nav -->
-
-		</header>
-
-
-		<div id="main" role="main">
-			{% block content %} 
-			{% endblock %}
-		</div> <!-- end main content -->
-
-		<footer>
-		</footer>
-</div> <!-- end container -->
+        <footer>
+        </footer>
+    </div> <!-- end container -->
 
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
 <script>window.jQuery || document.write('<script src="js/libs/jquery-1.6.2.min.js"><\/script>')</script>

diff --git a/cyclonejet/views/frontend.py b/cyclonejet/views/frontend.py
@@ -40,3 +40,12 @@ def login():
             return redirect(url_for('.index'))
 
     return render_template('login.html', form=form)
+
+@frontend.route('/logout')
+def logout():
+    # clean-up all session variables (dunno if there'll be a case where we want some items stored)
+    for item in session.iteritems():
+        session[item] = None
+
+    flash("You've been logged out, see ya")
+    return render_template('index.html')