From ccd80e74f880b665e888ddfad23a852c9bb063cb Mon Sep 17 00:00:00 2001
From: wookey <devnull@localhost>
Date: Sun, 23 Jun 2013 03:19:41 +0100
Subject: [PATCH] Change template headers to show 2012/2013 as shortcuts

---
 templates/base.html        | 7 +++----
 templates/expowebbase.html | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index b1e51e3..83db9bf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,7 +18,7 @@
 <div id="header"> 
   <h1>CUCC Expeditions to Austria: 1976 - 2012</h1>
   <div id="editLinks"> {% block loginInfo %}
-    <a href="{{settings.EXPOWEB_URL}}">Expoweb</a> |
+    <a href="{{settings.EXPOWEB_URL}}">Website home</a> |
     {% if user.username %}
     You are logged in as {{ user.username }} 
     	{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
@@ -38,9 +38,8 @@
     <a href="{% url survexcavessingle 161 %}">161</a> | 
     <a href="{% url survexcavessingle 204 %}">204</a> | 
     <a href="{% url survexcavessingle 258 %}">258</a> | 
-    <a href="{% url expedition 2009 %}">Expo2009</a> | 
-    <a href="{% url expedition 2010 %}">Expo2010</a> | 
-    <a href="{% url expedition 2011 %}">Expo2011</a> | 
+    <a href="{% url expedition 2012 %}">Expo2012</a> | 
+    <a href="{% url expedition 2013 %}">Expo2013</a> | 
  
     <a href="/admin/">Django admin</a>
 </div>
diff --git a/templates/expowebbase.html b/templates/expowebbase.html
index 128ce54..5d5b424 100644
--- a/templates/expowebbase.html
+++ b/templates/expowebbase.html
@@ -10,7 +10,7 @@
 <body>
 <div id="mainmenu">
 <ul>
-<li><a href="/index.htm">Expo web home</a></li>
+<li><a href="/index.htm">Expo website home</a></li>
 <li><a href="/intro.html">Introduction</a></li>
 <li><a href="/infodx.htm">Main index</a></li>
 <li><a href="/indxal.htm">Cave index</a></li>
@@ -22,9 +22,8 @@
 <li><a href="{% url survexcavessingle 161 %}">161</a></li>
 <li><a href="{% url survexcavessingle 204 %}">204</a></li>
 <li><a href="{% url survexcavessingle 258 %}">258</a></li>
-<li><a href="{% url expedition 2009 %}">Expo2009</a></li>
-<li><a href="{% url expedition 2010 %}">Expo2010</a></li>
-<li><a href="{% url expedition 2011 %}">Expo2011</a></li>
+<li><a href="{% url expedition 2012 %}">Expo2012</a></li>
+<li><a href="{% url expedition 2013 %}">Expo2013</a></li>
 <li><a href="/admin">Django admin</a></li>
 </ul>
 {% endif %}
