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

2011-08-08 10:04:59 +01:00 · 2011-08-08 10:04:59 +01:00 · 4c4b6ef11f
commit 4c4b6ef11f
parent d75bad22de
2 changed files with 4 additions and 2 deletions
--- a/flatpages/views.py
+++ b/flatpages/views.py
@ -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:
--- a/templates/flatpage.html
+++ b/templates/flatpage.html
@ -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>