diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cavebase.html | 7 | ||||
| -rw-r--r-- | templates/caveindex.html | 6 | ||||
| -rw-r--r-- | templates/dataformat/flatfile.html | 2 | ||||
| -rw-r--r-- | templates/editflatpage.html | 10 | ||||
| -rw-r--r-- | templates/expobase.html | 13 | ||||
| -rw-r--r-- | templates/flatpage.html | 15 | ||||
| -rw-r--r-- | templates/menu.html | 12 | ||||
| -rw-r--r-- | templates/pagenotfound.html | 7 |
8 files changed, 49 insertions, 23 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/caveindex.html b/templates/caveindex.html index 8f16e87..42322d3 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -10,7 +10,7 @@ <h3>Notable caves</h3> <ul> {% for cave in notablecaves %} - <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> + <li> <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> {% endfor %} </ul> @@ -19,7 +19,7 @@ <ul class="searchable"> {% for cave in caves1623 %} - <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> + <li> <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> {% endfor %} </ul> @@ -29,7 +29,7 @@ <ul class="searchable"> {% for cave in caves1626 %} - <li> <a href="{{ cave.get_absolute_url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> + <li> <a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }}{% else %}{{cave.unofficial_number }}{%endif %} {{cave.official_name|safe}}</a> </li> {% endfor %} </ul> diff --git a/templates/dataformat/flatfile.html b/templates/dataformat/flatfile.html index 1ddb7a5..07d03ca 100644 --- a/templates/dataformat/flatfile.html +++ b/templates/dataformat/flatfile.html @@ -1,7 +1,7 @@ {% autoescape off %} <html> <head> -{{ head }} +<title>{{ form.title }}</title> </head> <body> {{ form.html }} diff --git a/templates/editflatpage.html b/templates/editflatpage.html index 85a5bcc..4768078 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 %} <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}} +{{form.as_p}} <p><input type="submit" value="Submit" /></p> </form> +{% include "menu.html" %} {% endblock %} diff --git a/templates/expobase.html b/templates/expobase.html new file mode 100644 index 0000000..5cadb61 --- /dev/null +++ b/templates/expobase.html @@ -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 %} 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 %} diff --git a/templates/menu.html b/templates/menu.html new file mode 100644 index 0000000..65b8544 --- /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 %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %} +</ul> +{% endif %} diff --git a/templates/pagenotfound.html b/templates/pagenotfound.html new file mode 100644 index 0000000..03569de --- /dev/null +++ b/templates/pagenotfound.html @@ -0,0 +1,7 @@ +{% extends "expobase.html" %} +{% block title %}Page not found {{ path }}{% endblock %} +{% block body %} +<h1>Page not found {{ path }}</h1> +<a href="{%url editflatpage path %}">Create this page.</a> +{% include "menu.html" %} +{% endblock %} |