diff options
| -rw-r--r-- | localsettingsserver.py | 1 | ||||
| -rw-r--r-- | localsettingsubuntu.py | 2 | ||||
| -rw-r--r-- | localsettingswindows.py | 4 | ||||
| -rw-r--r-- | templates/base.html | 6 |
4 files changed, 10 insertions, 3 deletions
diff --git a/localsettingsserver.py b/localsettingsserver.py index f5ed640..208aed9 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -14,6 +14,7 @@ EXPOWEB = '/home/expo/expoweb/' SURVEYS = '/home/expo/' SURVEY_SCANS = '/home/expo/expoimages/' FILES = '/home/expo/expoimages' +EXPOWEB_URL = 'http://expo.survex.com/' SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/' diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index 3c7cce2..c8800b9 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -11,6 +11,8 @@ PYTHON_PATH = '/home/goatchurch/expoweb/troggle/' SURVEX_DATA = '/home/goatchurch/tunnel/cucc/loser/' SURVEYS = '/home/goatchurch/tunnel/cucc/surveys' +EXPOWEB_URL = 'http://expo.survex.com/' + CAVERN = 'cavern' EXPOWEB = '/home/goatchurch/expoweb/' SURVEYS_URL = '' diff --git a/localsettingswindows.py b/localsettingswindows.py index dfee0a5..717167f 100644 --- a/localsettingswindows.py +++ b/localsettingswindows.py @@ -11,6 +11,8 @@ EXPOWEB = 'C:\\Expo\\expoweb\\' SURVEYS = 'E:\\surveys\\'
SURVEY_SCANS = 'E:\\surveys\\surveyscans'
+EXPOWEB_URL = 'http://expo.survex.com/'
+
LOGFILE = EXPOWEB+'troggle\\parsing_log.txt'
PHOTOS = 'C:\\Expo\\expoweb\\photos'
@@ -49,4 +51,4 @@ TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
-) +)
diff --git a/templates/base.html b/templates/base.html index 302aa25..496616b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,6 +18,7 @@ <div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
<div id="editLinks"> {% block loginInfo %}
+ <a href="{{ settings.EXPOWEB_URL }}">ExpoWeb</a> |
<a href="{{ settings.URL_ROOT }}">Home</a> |
{% if user.username %}
You are logged in as {{ user.username }}
@@ -38,8 +39,9 @@ <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 2008 %}">Expo2008</a> |
- <a href="{% url expedition 2009 %}">Expo2009</a> |
+ <a href="{% url expedition 2008 %}">Expo2009</a> |
+ <a href="{% url expedition 2009 %}">Expo2010</a> |
+ <a href="{% url expedition 2009 %}">Expo2011</a> |
<a href="/admin">Django admin</a>
</div>
|