branch merge

1 files changed, 6 insertions, 4 deletions

diff --git a/templates/editflatpage.html b/templates/editflatpage.html
index 85a5bcc..4768078 100644
--- a/templates/editflatpage.html
+++ b/templates/editflatpage.html
@@ -1,12 +1,14 @@
-{% extends "base.html" %}
+{% extends "expobase.html" %}
 {% block title %}Edit {{ path }}{% endblock %}
-{% block head %}
+{% block extrahead %}
 {% load csrffaker %} 
 <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
 {% endblock %}
-{% block content %}
+{% block body %}
+<h1>Edit {{ path }}</h1>
 <form action="" method="post">{% csrf_token %}
-{{form}}
+{{form.as_p}}
 <p><input type="submit" value="Submit" /></p>
 </form>
+{% include "menu.html" %}
 {% endblock %}