summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html24
-rw-r--r--templates/index.html10
-rw-r--r--templates/survey.html6
3 files changed, 25 insertions, 15 deletions
diff --git a/templates/base.html b/templates/base.html
index 0e81b51..d189ae6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,7 +3,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
-<title>{% block title %}{% endblock %}</title>
+
+<title>{% block title %}THE TITLE{% endblock %}</title>
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
{% block javascript %}{% endblock %}
@@ -29,13 +30,18 @@
{% endblock %} </div>
-<div id="currentLocation"> <br>
- {% block currentLocation %}
- Welcome to the website of the Cambridge University Caving Club's expeditions to Austria.
- {% endblock %} </div>
-<div class="content"> {% block content %}
- {% endblock %} </div>
+
+<div id="content">
+{% block content %}
+ REPLACE : The content
+{% endblock %}
+</div>
+
+<div id="footer">
{% block footer %}
-<p>{% endblock %}</p>
+ THE FOOTER
+{% endblock %}
+</div>
</body>
-</html> \ No newline at end of file
+</html>
+
diff --git a/templates/index.html b/templates/index.html
index 4b2d530..0a19187 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,8 +5,12 @@
{% block content %}
+<h2>The unfinished front page</h2>
+<p>Some handy links into the less incomplete parts of this webpage</p>
+
+<ul>
+ <li><a href="{% url personindex %}">List osf people</a></li>
+ <li><a href="/statistics">Statistics of what's loaded in the database</a></li>
+</ul>
-{% endblock %}
-{% block currentLocation %}
-Welcome to the website of the Cambridge University Caving Club's expeditions to Austria.
{% endblock %}
diff --git a/templates/survey.html b/templates/survey.html
index ce62715..0cce748 100644
--- a/templates/survey.html
+++ b/templates/survey.html
@@ -51,14 +51,14 @@
{% endblock %}
<body class="twoColHybLtHdr">
-{% block currentLocation %}
+<div id="currentLocation">
CUCC Expo virtual survey binder:
{% if current_survey %}
{{current_survey}}
{% else %}
{{current_year }}
{% endif %}
-{% endblock %}
+</div>
{% block nav %}
<div id="sidebar1">
@@ -185,4 +185,4 @@
</div>
<br class="clearfloat" />
</div>
-{% endblock %} \ No newline at end of file
+{% endblock %}