2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00

Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage.

This commit is contained in:
Martin Green 2011-08-08 10:04:59 +01:00
parent 13fe89af9f
commit c66ecc4d7f
2 changed files with 4 additions and 2 deletions

View File

@ -56,7 +56,7 @@ def flatpage(request, path):
if path.endswith(".htm") or path.endswith(".html"):
html = o.read()
m = re.search(r"<head>(.*)</head>.*<body>(.*)</body>", html, re.DOTALL)
m = re.search(r"<head>(.*)</head>.*<body[^>]*>(.*)</body>", html, re.DOTALL)
if m:
head, body = m.groups()
else:

View File

@ -5,6 +5,8 @@
<body{% if homepage %} id="homepage"{% endif %}>
{{ body|safe }}
{% include "menu.html" %}
{% if homepage %}{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %}{%else %}{% include "menu.html" %}{% endif %}
</body>
</html>