2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 01:01:53 +00:00

=Make a common base for expoweb pages. Ignore any header information in expoweb except titles.

This commit is contained in:
Martin Green 2011-08-08 10:58:50 +01:00
parent c66ecc4d7f
commit e85c386375
5 changed files with 24 additions and 16 deletions

View File

@ -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))

View File

@ -1,9 +1,7 @@
{% autoescape off %}
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{{ form.title }}</title>
<link rel="stylesheet" type="text/css" href="css/main2.css" />
</head>
<body>
{{ form.html }}

View File

@ -1,12 +1,14 @@
{% extends "base.html" %}
{% extends "expobase.html" %}
{% block title %}Edit {{ path }}{% endblock %}
{% block head %}
{% block extrahead %}
{% load csrffaker %}
<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
{% endblock %}
{% block content %}
{% block body %}
<h1>Edit {{ path }}</h1>
<form action="" method="post">{% csrf_token %}
{{form.as_p}}
<p><input type="submit" value="Submit" /></p>
{% include "menu.html" %}
</form>
{% endblock %}

13
templates/expobase.html Normal file
View File

@ -0,0 +1,13 @@
{% autoescape off %}
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{% block title %}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="css/main2.css" />
{% block extrahead %}{% endblock %}
</head>
<body {% block bodyattrs %}{% endblock %}>
{% block body %}{% endblock %}
</body>
</html>
{% endautoescape %}

View File

@ -1,12 +1,7 @@
<html>
<head>
{{ head|safe }}
</head>
<body{% if homepage %} id="homepage"{% endif %}>
{% extends "expobase.html" %}
{% block title %}{{ title }}{% endblock %}
{% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %}
{% block body %}
{{ body|safe }}
{% if homepage %}{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %}{%else %}{% include "menu.html" %}{% endif %}
</body>
</html>
{% endblock %}