diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-02-24 13:03:34 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-02-24 13:03:34 +0000 |
| commit | 4ad5b684333bfb995160cd6bf00308d9f3839d4a (patch) | |
| tree | f5683df0d04d8decad0685198e6e76980e376ef0 /templates | |
| parent | 552730f0a38f474a181f2e1550589a4823667f3c (diff) | |
| download | troggle-4ad5b684333bfb995160cd6bf00308d9f3839d4a.tar.gz troggle-4ad5b684333bfb995160cd6bf00308d9f3839d4a.tar.bz2 troggle-4ad5b684333bfb995160cd6bf00308d9f3839d4a.zip | |
Make things more compatiable with newer python
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/flatpage.html | 2 | ||||
| -rw-r--r-- | templates/frontpage.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/base.html b/templates/base.html index 20a22ef..372a251 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,7 +16,7 @@ <body onLoad="contentHeight();"> <div id="header"> - <h1>CUCC Expeditions to Austria: 1976 - 2016</h1> + <h1>CUCC Expeditions to Austria: 1976 - 2018</h1> <div id="editLinks"> {% block loginInfo %} <a href="{{settings.EXPOWEB_URL}}">Website home</a> | {% if user.username %} @@ -40,9 +40,9 @@ <a href="{% url "survexcavessingle" 204 %}">204</a> | <a href="{% url "survexcavessingle" 258 %}">258</a> | <a href="{% url "survexcavessingle" 264 %}">264</a> | - <a href="{% url "expedition" 2015 %}">Expo2015</a> | <a href="{% url "expedition" 2016 %}">Expo2016</a> | <a href="{% url "expedition" 2017 %}">Expo2017</a> | + <a href="{% url "expedition" 2018 %}">Expo2018</a> | <a href="/admin/">Django admin</a> </div> @@ -90,7 +90,7 @@ <li><a id="caversLink" href="{% url "personindex" %}">cavers</a></li> <li><a href="#">expeditions</a> <ul class="sub_menu"> - <li><a id="expeditionsLink" href="{{ Expedition.objects.latest.get_absolute_url }}">newest</a></li> + <li><a id="expeditionsLink" href="{{ expedition.objects.latest.get_absolute_url }}">newest</a></li> <li><a id="expeditionsLink" href="{% url "expeditions" %}">list all</a></li> </ul> </li> diff --git a/templates/flatpage.html b/templates/flatpage.html index 73be1b2..ebe5b1b 100644 --- a/templates/flatpage.html +++ b/templates/flatpage.html @@ -7,7 +7,7 @@ {% if editable %} <a href="{% url "editflatpage" path %}">Edit</a> {% endif %} - {%else %} + {% else %} {% if not has_menu %} {% include "menu.html" %} {% endif %} diff --git a/templates/frontpage.html b/templates/frontpage.html index bad3ce5..f07722a 100644 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -42,7 +42,7 @@ This is Troggle, the information portal for Cambridge University Caving Club's E </p> <p class="indent"> -Here you will find information about the {{expedition.objects.count}} expeditions the club has undertaken since 1976. Browse survey information, photos, and description wikis for {{cave.objects.count}} caves, {{subcave.objects.count}} areas within those caves, and {{extantqms.count}} going leads yet to be explored. We have {{photo.objects.count}} photos and {{logbookentry.objects.count}} logbook entries. +Here you will find information about the {{expedition.objects.count}} expeditions the club has undertaken since 1976. Browse survey information, photos, and description wikis for {{Cave.objects.count}} caves, {{subcave.objects.count}} areas within those caves, and {{extantqms.count}} going leads yet to be explored. We have {{Photo.objects.count}} photos and {{Logbookentry.objects.count}} logbook entries. </p> <p class="indent"> |