diff options
| author | Martin Green <martin.speleo@gmail.com> | 2011-08-08 10:04:59 +0100 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2011-08-08 10:04:59 +0100 |
| commit | c66ecc4d7fd4436a34700f7c1d4a2d879e8aabc0 (patch) | |
| tree | 60744b25a5b287c224b1cb279a763ec5ca751ec0 | |
| parent | 13fe89af9fe03382b25079f159c2bff27df32c0d (diff) | |
| download | troggle-c66ecc4d7fd4436a34700f7c1d4a2d879e8aabc0.tar.gz troggle-c66ecc4d7fd4436a34700f7c1d4a2d879e8aabc0.tar.bz2 troggle-c66ecc4d7fd4436a34700f7c1d4a2d879e8aabc0.zip | |
Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage.
| -rw-r--r-- | flatpages/views.py | 2 | ||||
| -rw-r--r-- | templates/flatpage.html | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/flatpages/views.py b/flatpages/views.py index 1a445ea..a080437 100644 --- 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: diff --git a/templates/flatpage.html b/templates/flatpage.html index 42b8481..fddc69a 100644 --- 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> |