From f527bd616abcfe3ccbcc08fbdfacdb4c4a22e5f0 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Sun, 7 Aug 2011 17:30:18 +0100 Subject: bug fix for edit link for index files --- flatpages/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index e9db223..eed5f38 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -45,7 +45,7 @@ def flatpage(request, path): except IOError: try: o = open(os.path.normpath(settings.EXPOWEB + path + "index.htm"), "rb") - path = path + "index.html" + path = path + "index.htm" except IOError: raise Http404 else: -- cgit v1.2.3 From da3efb97ceeb73efd59a3345532e65336cf3ba49 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Sun, 7 Aug 2011 19:17:27 +0100 Subject: Changed regex for finding head and body of flat pages. --- flatpages/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index eed5f38..f411bfa 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -15,7 +15,6 @@ import os import re def flatpage(request, path): - print "gggggg", path try: r = Redirect.objects.get(originalURL = path) return HttpResponseRedirect(r.newURL) # Redirect after POST @@ -103,7 +102,7 @@ def editflatpage(request, path): except IOError: raise Http404 html = o.read() - m = re.search(r"(.*).*(.*)", html, re.DOTALL) + m = re.search(r"(.*).*]*>(.*)", html, re.DOTALL) if m: head, body = m.groups() if re.search(r"iso-8859-1", html): -- cgit v1.2.3 From d75bad22de7e41a7049f6873762f0c38a62cff30 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 8 Aug 2011 09:51:47 +0100 Subject: Allow for editing flatpage titles, and made a common uneditable list of links. --- flatpages/views.py | 32 ++++++++++++++++++++++++-------- templates/cavebase.html | 7 +------ templates/dataformat/flatfile.html | 4 +++- templates/editflatpage.html | 2 +- templates/flatpage.html | 6 +++--- templates/menu.html | 12 ++++++++++++ 6 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 templates/menu.html (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index f411bfa..1a445ea 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -35,6 +35,7 @@ def flatpage(request, path): if path.startswith("noinfo") and settings.PUBLIC_SITE and not request.user.is_authenticated(): + print "flat path noinfo", path return HttpResponseRedirect(reverse("auth_login") + '?next=%s' % request.path) if path.endswith("/") or path == "": @@ -56,17 +57,22 @@ def flatpage(request, path): html = o.read() m = re.search(r"(.*).*(.*)", html, re.DOTALL) - mwithid = re.search(r'(.*).*(.*)', html, re.DOTALL) if m: head, body = m.groups() - bodyid = None - elif mwithid: - head, bodyid, body = mwithid.groups() else: return HttpResponse(html + "Page could not be split into header and body") + m = re.search(r"(.*)", head, re.DOTALL) + if m: + title, = m.groups() + else: + title = "" + linksmatch = re.match('(.*)

(.*)

+ {{ body|safe }} -{% if editable %}Edit{% endif %} -Troggle + +{% include "menu.html" %} diff --git a/templates/menu.html b/templates/menu.html new file mode 100644 index 0000000..f74aed4 --- /dev/null +++ b/templates/menu.html @@ -0,0 +1,12 @@ +{% if not homepage %} +

Home
Main Index
Troggle
Areas
Caves
Handbook
Reports
Edit

+{% endif %} -- cgit v1.2.3 From 4c4b6ef11febe13f6bb7db4510e115853aca50a5 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 8 Aug 2011 10:04:59 +0100 Subject: Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage. --- flatpages/views.py | 2 +- templates/flatpage.html | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'flatpages/views.py') 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"(.*).*(.*)", html, re.DOTALL) + m = re.search(r"(.*).*]*>(.*)", 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|safe }} -{% include "menu.html" %} +{% if homepage %}{% if editable %}Edit{% endif %}{%else %}{% include "menu.html" %}{% endif %} + + -- cgit v1.2.3 From 57ace114278533b461f57ab23b1ca9b199590381 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 8 Aug 2011 10:58:50 +0100 Subject: =Make a common base for expoweb pages. Ignore any header information in expoweb except titles. --- flatpages/views.py | 2 +- templates/dataformat/flatfile.html | 2 -- templates/editflatpage.html | 8 +++++--- templates/expobase.html | 13 +++++++++++++ templates/flatpage.html | 15 +++++---------- 5 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 templates/expobase.html (limited to 'flatpages/views.py') 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 %} - {{ form.title }} - {{ 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 %} {% endblock %} -{% block content %} +{% block body %} +

Edit {{ path }}

{% 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 %} + + + +{% block title %}{% endblock %} + +{% block extrahead %}{% endblock %} + + +{% block body %}{% endblock %} + + +{% 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 @@ - - -{{ head|safe }} - - +{% extends "expobase.html" %} +{% block title %}{{ title }}{% endblock %} +{% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %} +{% block body %} {{ body|safe }} - {% if homepage %}{% if editable %}Edit{% endif %}{%else %}{% include "menu.html" %}{% endif %} - - - - +{% endblock %} -- cgit v1.2.3 From 3205e1752ca43f956da8a2b8d96dc1a1350d3022 Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 8 Aug 2011 12:18:47 +0100 Subject: Added 'page not found do you wnat to make this page' page. Minor tweaks --- flatpages/views.py | 46 +++++++++++++++++++++++++-------------------- templates/editflatpage.html | 2 +- templates/pagenotfound.html | 7 +++++++ 3 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 templates/pagenotfound.html (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index 6279f4d..3357e64 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -47,12 +47,12 @@ def flatpage(request, path): o = open(os.path.normpath(settings.EXPOWEB + path + "index.htm"), "rb") path = path + "index.htm" except IOError: - raise Http404 + return render_with_context(request, 'pagenotfound.html', {'path': path}) else: try: o = open(os.path.normpath(settings.EXPOWEB + path), "rb") except IOError: - raise Http404 + return render_with_context(request, 'pagenotfound.html', {'path': path}) if path.endswith(".htm") or path.endswith(".html"): html = o.read() @@ -105,19 +105,22 @@ def editflatpage(request, path): try: filepath = os.path.normpath(settings.EXPOWEB + path) o = open(filepath, "r") + html = o.read() + m = re.search(r"(.*).*]*>(.*)", html, re.DOTALL) + if m: + filefound = True + head, body = m.groups() + if re.search(r"iso-8859-1", html): + linksmatch = re.match('(.*)

]*>(.*)", html, re.DOTALL) - if m: - head, body = m.groups() - if re.search(r"iso-8859-1", html): - linksmatch = re.match('(.*)

(.*)

Page not found {{ path }}

Create this page.

Date: Mon, 8 Aug 2011 12:58:02 +0100 Subject: ignorecase when finding html tags --- flatpages/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index 3357e64..05405de 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -56,17 +56,17 @@ def flatpage(request, path): if path.endswith(".htm") or path.endswith(".html"): html = o.read() - m = re.search(r"(.*).*]*>(.*)", html, re.DOTALL) + m = re.search(r"(.*).*]*>(.*)", html, re.DOTALL + re.IGNORECASE) if m: head, body = m.groups() else: return HttpResponse(html + "Page could not be split into header and body") - m = re.search(r"(.*)", head, re.DOTALL) + m = re.search(r"(.*)", head, re.DOTALL + re.IGNORECASE) if m: title, = m.groups() else: title = "" - linksmatch = re.match('(.*)

]*>(.*)", html, re.DOTALL) + m = re.search(r"(.*).*]*>(.*)", html, re.DOTALL + re.IGNORECASE) if m: filefound = True head, body = m.groups() if re.search(r"iso-8859-1", html): - linksmatch = re.match('(.*)

(.*)

Date: Mon, 8 Aug 2011 13:11:57 +0100 Subject: Bug fix --- flatpages/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'flatpages/views.py') diff --git a/flatpages/views.py b/flatpages/views.py index 05405de..f46488e 100644 --- a/flatpages/views.py +++ b/flatpages/views.py @@ -110,10 +110,10 @@ def editflatpage(request, path): if m: filefound = True head, body = m.groups() + linksmatch = re.match('(.*)', body, re.DOTALL + re.IGNORECASE) + if linksmatch: + body, = linksmatch.groups() if re.search(r"iso-8859-1", html): - linksmatch = re.match('(.*)

', body, re.DOTALL + re.IGNORECASE) - if linksmatch: - body, = linksmatch.groups() body = unicode(body, "iso-8859-1") else: return HttpResponse("Page could not be split into header and body") -- cgit v1.2.3