diff options
| author | Martin Green <martin.speleo@gmail.com> | 2011-08-08 09:51:47 +0100 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2011-08-08 09:51:47 +0100 |
| commit | d75bad22de7e41a7049f6873762f0c38a62cff30 (patch) | |
| tree | 6a022f170ab9dc98d09f9d80a22b68a7e38726cb /templates | |
| parent | c039183137802dc1a00af876f77ad8f47d4cc8f4 (diff) | |
| download | troggle-d75bad22de7e41a7049f6873762f0c38a62cff30.tar.gz troggle-d75bad22de7e41a7049f6873762f0c38a62cff30.tar.bz2 troggle-d75bad22de7e41a7049f6873762f0c38a62cff30.zip | |
Allow for editing flatpage titles, and made a common uneditable list of links.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cavebase.html | 7 | ||||
| -rw-r--r-- | templates/dataformat/flatfile.html | 4 | ||||
| -rw-r--r-- | templates/editflatpage.html | 2 | ||||
| -rw-r--r-- | templates/flatpage.html | 6 | ||||
| -rw-r--r-- | templates/menu.html | 12 |
5 files changed, 20 insertions, 11 deletions
diff --git a/templates/cavebase.html b/templates/cavebase.html index 7e83151..a0ffd4d 100644 --- a/templates/cavebase.html +++ b/templates/cavebase.html @@ -16,11 +16,6 @@ </head> <body> {% block content %}{% endblock %} -{% block menu %} -<ul id="links"> -<li>Back to <a href="/index.htm">Expedition home page</a></li> -<li>Back to <a href="http://cucc.survex.com/">CUCC home page</a></li> -</ul> -{% endblock %} +{% include "menu.html" %} </body> </html> diff --git a/templates/dataformat/flatfile.html b/templates/dataformat/flatfile.html index 1ddb7a5..048606e 100644 --- a/templates/dataformat/flatfile.html +++ b/templates/dataformat/flatfile.html @@ -1,7 +1,9 @@ {% autoescape off %} <html> <head> -{{ 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 }} diff --git a/templates/editflatpage.html b/templates/editflatpage.html index 85a5bcc..67290a7 100644 --- a/templates/editflatpage.html +++ b/templates/editflatpage.html @@ -6,7 +6,7 @@ {% endblock %} {% block content %} <form action="" method="post">{% csrf_token %} -{{form}} +{{form.as_p}} <p><input type="submit" value="Submit" /></p> </form> {% endblock %} diff --git a/templates/flatpage.html b/templates/flatpage.html index 04ff1f8..42b8481 100644 --- a/templates/flatpage.html +++ b/templates/flatpage.html @@ -2,9 +2,9 @@ <head> {{ head|safe }} </head> -<body{% if bodyid %} id="{{ bodyid }}"{% endif %}> +<body{% if homepage %} id="homepage"{% endif %}> {{ body|safe }} -{% if editable %}<a href="{% url editflatpage path %}">Edit</a>{% endif %} -<a href="/troggle">Troggle</a> + +{% include "menu.html" %} </body> </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 %} +<ul id="links"> +<li><a href="/index.htm">Home</a></li> +<li><a href="/infodx.htm">Main Index</a></li> +<li><a href="/troggle">Troggle</a></li> +<li><a href="/areas.htm">Areas</a></li> +<li><a href="/indxal.htm">Caves</a></li> +<li><a href="/handbook/index.htm">Handbook</a></li> +<li><a href="/pubs.htm">Reports</a></li> +{% if editable %}<li><a href="{% url editflatpage path %}">Edit</a></li>{% endif %} +</ul> +{% endif %} |