From 8f66837f6fb5b74ba3166ae6e31328f8a9e68d96 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Sun, 24 Feb 2019 13:03:34 +0000 Subject: 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 --- templates/base.html | 6 +++--- templates/flatpage.html | 2 +- templates/frontpage.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'templates') 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 @@

CUCC Expeditions to Austria: 1976 - 2016

CUCC Expeditions to Austria: 1976 - 2018

{% block loginInfo %} Website home | {% if user.username %} @@ -40,9 +40,9 @@ 204 | 258 | 264 | - Expo2015 | Expo2016 | Expo2017 | + Expo2018 | Django admin

@@ -90,7 +90,7 @@

cavers

expeditions

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 %} Edit {% 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

-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.

-- cgit v1.2.3