diff options
-rw-r--r-- | flatpages/views.py | 2 | ||||
-rw-r--r-- | templates/dataformat/flatfile.html | 2 | ||||
-rw-r--r-- | templates/editflatpage.html | 8 | ||||
-rw-r--r-- | templates/expobase.html | 13 | ||||
-rw-r--r-- | templates/flatpage.html | 15 |
5 files changed, 24 insertions, 16 deletions
diff --git a/flatpages/views.py b/flatpages/views.py index a080437..6279f4d 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -72,7 +72,7 @@ def flatpage(request, path): if re.search(r"iso-8859-1", html): body = unicode(body, "iso-8859-1") body.strip - return render_with_context(request, 'flatpage.html', {'editable': True, 'path': path, 'head': head, 'body': body, 'homepage': (path == "index.htm")}) + return render_with_context(request, 'flatpage.html', {'editable': True, 'path': path, 'title': title, 'body': body, 'homepage': (path == "index.htm")}) else: return HttpResponse(o.read(), mimetype=getmimetype(path)) diff --git a/templates/dataformat/flatfile.html b/templates/dataformat/flatfile.html index 048606e..07d03ca 100644 --- a/templates/dataformat/flatfile.html +++ b/templates/dataformat/flatfile.html @@ -1,9 +1,7 @@ {% autoescape off %} <html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>{{ form.title }}</title> -<link rel="stylesheet" type="text/css" href="css/main2.css" /> </head> <body> {{ form.html }} diff --git a/templates/editflatpage.html b/templates/editflatpage.html index 67290a7..547b94d 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.as_p}} <p><input type="submit" value="Submit" /></p> +{% include "menu.html" %} </form> {% endblock %} diff --git a/templates/expobase.html b/templates/expobase.html new file mode 100644 index 0000000..0ef74c1 --- /dev/null +++ b/templates/expobase.html @@ -0,0 +1,13 @@ +{% autoescape off %} +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<title>{% block title %}{% endblock %}</title> +<link rel="stylesheet" type="text/css" href="css/main2.css" /> +{% block extrahead %}{% endblock %} +</head> +<body {% block bodyattrs %}{% endblock %}> +{% block body %}{% endblock %} +</body> +</html> +{% endautoescape %} diff --git a/templates/flatpage.html b/templates/flatpage.html index fddc69a..47863e3 100644 --- a/templates/flatpage.html +++ b/templates/flatpage.html @@ -1,12 +1,7 @@ -<html> -<head> -{{ head|safe }} -</head> -<body{% if homepage %} id="homepage"{% endif %}> +{% extends "expobase.html" %} +{% block title %}{{ title }}{% endblock %} +{% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %} +{% block body %} {{ body|safe }} - {% if homepage %}{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %}{%else %}{% include "menu.html" %}{% endif %} - - -</body> -</html> +{% endblock %} |