From 56618dbe6587cfdb35017d257a9870c40b34b408 Mon Sep 17 00:00:00 2001
From: "Philip Sargent (git for windows)" <philip.sargent@gmail.com>
Date: Mon, 23 Dec 2019 19:40:44 +0000
Subject: [PATCH] fix CUCC url in template and add years to 2020
---
templates/base.html | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index 666ff7a..e30cbd5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html>
<html lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
@@ -16,7 +16,7 @@
<body onLoad="contentHeight();">
<div id="header">
- <h1>CUCC Expeditions to Austria: 1976 - 2018</h1>
+ <h1>CUCC Expeditions to Austria: 1976 - 2020</h1>
<div id="editLinks"> {% block loginInfo %}
<a href="{{settings.EXPOWEB_URL}}">Website home</a> |
{% if user.username %}
@@ -43,6 +43,8 @@
<a href="{% url "expedition" 2016 %}">Expo2016</a> |
<a href="{% url "expedition" 2017 %}">Expo2017</a> |
<a href="{% url "expedition" 2018 %}">Expo2018</a> |
+ <a href="{% url "expedition" 2019 %}">Expo2019</a> |
+ <a href="{% url "expedition" 2020 %}">Expo2020</a> |
<a href="/admin/">Django admin</a>
</div>
@@ -81,7 +83,7 @@
<li><a href="#">External links</a>
<ul class="sub_menu">
- <li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
+ <li><a id="cuccLink" href="https://camcaving.uk">CUCC website</a></li>
<li><a id="expoWebsiteLink" href="http://expo.survex.com">Expedition website</a></li>
</ul>
</li>