xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Added flat pages for entrance and special flatpage redirects.

Browse Source 
Enetrances should probably store their urls like cavers.  Maybe the flatpages should be handled by the app Aaron installed.
This commit is contained in:
Martin Green 2011-07-11 00:13:06 +01:00
parent 4a88493afa
commit db2d954b1d
3 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flatpages/admin.py Normal file
View File

@ -0,0 +1,5 @@
from troggle.flatpages.models import Redirect, EntranceRedirect
from django.contrib import admin
admin.site.register(Redirect)
admin.site.register(EntranceRedirect)

11
flatpages/models.py
View File

@ -1,3 +1,12 @@
from django.db import models from django.db import models
from core.models import Cave, Entrance
# Create your models here. class Redirect(models.Model):
originalURL = models.CharField(max_length=200, unique=True)
newURL = models.CharField(max_length=200)
class EntranceRedirect(models.Model):
originalURL = models.CharField(max_length=200)
entrance = models.ForeignKey(Entrance)
def __unicode__(self):
return self.entrance.slug

39
flatpages/views.py
View File

@ -7,12 +7,33 @@ from django.core.urlresolvers import reverse
from django.template import Context, loader from django.template import Context, loader
import django.forms as forms import django.forms as forms
from tinymce.widgets import TinyMCE from tinymce.widgets import TinyMCE
from troggle.flatpages.models import Redirect, EntranceRedirect
from troggle.core.models import Cave
import troggle.core.views_caves
import os import os
import re import re
def flatpage(request, path): def flatpage(request, path):
print path try:
r = Redirect.objects.get(originalURL = path)
return HttpResponseRedirect(r.newURL) # Redirect after POST
except Redirect.DoesNotExist:
pass
try:
r = Cave.objects.get(url = path)
return troggle.core.views_caves.caveSlug(request, r.slug)
except Cave.DoesNotExist:
pass
try:
r = EntranceRedirect.objects.get(originalURL = path)
return troggle.core.views_caves.enranceSlug(request, r.entrance.slug)
except EntranceRedirect.DoesNotExist:
pass
if path.startswith("noinfo") and settings.PUBLIC_SITE and not request.user.is_authenticated(): if path.startswith("noinfo") and settings.PUBLIC_SITE and not request.user.is_authenticated():
return HttpResponseRedirect(reverse("auth_login") + '?next=%s' % request.path) return HttpResponseRedirect(reverse("auth_login") + '?next=%s' % request.path)
try: try:
@ -21,19 +42,31 @@ def flatpage(request, path):
raise Http404 raise Http404
if path.endswith(".htm") or path.endswith(".html"): if path.endswith(".htm") or path.endswith(".html"):
html = o.read() 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)
mwithid = re.search(r'<head>(.*)</head>.*<body id="([^"]*)">(.*)</body>', html, re.DOTALL)
if m: if m:
head, body = m.groups() head, body = m.groups()
bodyid = None
elif mwithid:
head, bodyid, body = mwithid.groups()
else: else:
return HttpResponse(html + "Page could not be split into header and body") return HttpResponse(html + "Page could not be split into header and body")
if re.search(r"iso-8859-1", html): if re.search(r"iso-8859-1", html):
body = unicode(body, "iso-8859-1") body = unicode(body, "iso-8859-1")
return render_with_context(request, 'flatpage.html', {'editable': True, 'path': path, 'head': head, 'body': body}) return render_with_context(request, 'flatpage.html', {'editable': True, 'path': path, 'head': head, 'body': body, "bodyid": bodyid})
else: else:
return HttpResponse(o.read()) return HttpResponse(o.read())
@login_required_if_public @login_required_if_public
def editflatpage(request, path): def editflatpage(request, path):
try:
r = CaveRedirect.objects.get(originalURL = path)
return troggle.core.views_caves.editCave(request, r.cave.slug)
except CaveRedirect.DoesNotExist:
pass
try: try:
filepath = os.path.normpath(settings.EXPOWEB + path) filepath = os.path.normpath(settings.EXPOWEB + path)
o = open(filepath, "r") o = open(filepath, "r")
@ -43,6 +76,8 @@ def editflatpage(request, path):
m = re.search(r"<head>(.*)</head>.*<body>(.*)</body>", html, re.DOTALL) m = re.search(r"<head>(.*)</head>.*<body>(.*)</body>", html, re.DOTALL)
if m: if m:
head, body = m.groups() head, body = m.groups()
if re.search(r"iso-8859-1", html):
body = unicode(body, "iso-8859-1")
else: else:
return HttpResponse("Page could not be split into header and body") return HttpResponse("Page could not be split into header and body")
if request.method == 'POST': # If the form has been submitted... if request.method == 'POST': # If the form has been submitted...