Minor template fixes

rh76 · Aug 18, 2014 · ad19082 · ad19082
1 parent 2e9de15
commit ad19082
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/templates/_nav.html b/templates/_nav.html
@@ -1,15 +1,19 @@
 <nav>
 	{% if security.registerable or security.recoverable or security.confirmabled %}
 		<ul class="nav nav-account">
-			<li><a href="{{ url_for_security('login') }}">Login</a></li>
-			{% if security.registerable %}
-			<li><a href="{{ url_for_security('register') }}">Register</a></li>
-			{% endif %}
-			{% if security.recoverable %}
-			<li><a href="{{ url_for_security('forgot_password') }}">Forgot password</a></li>
-			{% endif %}
-			{% if security.confirmable %}
-			<li><a href="{{ url_for_security('send_confirmation') }}">Confirm account</a></li>
+			{% if current_user.is_authenticated() %}
+				<li><a href="{{ url_for_security('logout') }}">Logout</a></li>
+			{% else %}
+				<li><a href="{{ url_for_security('login') }}">Login</a></li>
+				{% if security.registerable %}
+				<li><a href="{{ url_for_security('register') }}">Register</a></li>
+				{% endif %}
+				{% if security.recoverable %}
+				<li><a href="{{ url_for_security('forgot_password') }}">Forgot password</a></li>
+				{% endif %}
+				{% if security.confirmable %}
+				<li><a href="{{ url_for_security('send_confirmation') }}">Confirm account</a></li>
+				{% endif %}
 			{% endif %}
 		</ul>
 	{% endif %}

diff --git a/templates/layout.html b/templates/layout.html
@@ -9,8 +9,6 @@
 	<body>
 		{% include "_nav.html" %}
 
-		{{security.current_user}}
-
 		<section class="content">
 			{% block content %}{% endblock %}
 		</section>

diff --git a/test.py b/test.py
@@ -16,17 +16,13 @@ def setUp(self):
 		app.config['TESTING'] = True
 		app.config['DEBUG'] = True
 		self.client = app.test_client()
-		self._ctx = app.test_request_context()
-		self._ctx.push()
 
 		with app.app_context():
 			init_app()
 			user_datastore.create_user(email='test', password='test')
 			db.session.commit()
 
 	def tearDown(self):
-		if self._ctx is not None:
-			self._ctx.pop()
 		with app.app_context():
 			db.session.remove()
 			db.drop_all()