diff options
author | expo <expo@expobox.potato.hut> | 2011-09-02 03:39:20 +0200 |
---|---|---|
committer | expo <expo@expobox.potato.hut> | 2011-09-02 03:39:20 +0200 |
commit | 77dea07b400876cde999a33260793176f27aed0d (patch) | |
tree | 050a691b4238ce8122e9a96c745b5c62bc4ebef3 /templates/flatpage.html | |
parent | 77dcf7f7597dd6f946cfcb12cd8ed1773ac83b61 (diff) | |
parent | 59e7c4d5dfd38aa666f06f5104a9ceaa309818fd (diff) | |
download | troggle-77dea07b400876cde999a33260793176f27aed0d.tar.gz troggle-77dea07b400876cde999a33260793176f27aed0d.tar.bz2 troggle-77dea07b400876cde999a33260793176f27aed0d.zip |
branch merge
Diffstat (limited to 'templates/flatpage.html')
-rw-r--r-- | templates/flatpage.html | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/templates/flatpage.html b/templates/flatpage.html index 04ff1f8..47863e3 100644 --- a/templates/flatpage.html +++ b/templates/flatpage.html @@ -1,10 +1,7 @@ -<html> -<head> -{{ head|safe }} -</head> -<body{% if bodyid %} id="{{ bodyid }}"{% endif %}> +{% extends "expobase.html" %} +{% block title %}{{ title }}{% endblock %} +{% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %} +{% block body %} {{ body|safe }} -{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %} -<a href="/troggle">Troggle</a> -</body> -</html> +{% if homepage %}{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %}{%else %}{% include "menu.html" %}{% endif %} +{% endblock %} |