merge permissions (ie admin page) into trunk

2 files changed, 20 insertions, 0 deletions

diff --git a/apioforum/templates/admin/admin_page.html b/apioforum/templates/admin/admin_page.html
new file mode 100644
index 0000000..f48c6c0
--- /dev/null
+++ b/apioforum/templates/admin/admin_page.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% block header %}
+<h1>{% block title %}admin page{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+<h2>admins</h2>
+<ul>
+    {% for admin in admins %}
+    <li>{{admin.username}}</li>
+    {% endfor %}
+</ul>
+<p>this page will have more things on it later, probably</p>
+{% endblock %}
+
diff --git a/apioforum/templates/base.html b/apioforum/templates/base.html
index 5121b85..bf3748f 100644
--- a/apioforum/templates/base.html
+++ b/apioforum/templates/base.html
@@ -20,6 +20,11 @@
 
 				{% if g.user %}
 				<p>{{ g.user }}</p>
+
+				{% if is_admin %}
+				<p><a href="{{url_for('admin.admin_page')}}">admin</a></p>
+				{% endif %}
+    				
 				<p>
 					<a href="{{ url_for('auth.logout',next=path_for_next) }}">
 						logout