xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Link to expowebsite

Browse Source
This commit is contained in:
Martin Green 2011-05-02 00:53:44 +01:00
parent 254f028575
commit fe221f40e7
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
localsettingsserver.py
View File

@ -14,6 +14,7 @@ EXPOWEB = '/home/expo/expoweb/'
SURVEYS = '/home/expo/' SURVEYS = '/home/expo/'
SURVEY_SCANS = '/home/expo/expoimages/' SURVEY_SCANS = '/home/expo/expoimages/'
FILES = '/home/expo/expoimages' FILES = '/home/expo/expoimages'
EXPOWEB_URL = 'http://expo.survex.com/'
SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/' SURVEYS_URL = 'http://troggle.cavingexpedition.com/survey_scans/'

2
localsettingsubuntu.py
View File

@ -11,6 +11,8 @@ PYTHON_PATH = '/home/goatchurch/expoweb/troggle/'
SURVEX_DATA = '/home/goatchurch/tunnel/cucc/loser/' SURVEX_DATA = '/home/goatchurch/tunnel/cucc/loser/'
SURVEYS = '/home/goatchurch/tunnel/cucc/surveys' SURVEYS = '/home/goatchurch/tunnel/cucc/surveys'
EXPOWEB_URL = 'http://expo.survex.com/'
CAVERN = 'cavern' CAVERN = 'cavern'
EXPOWEB = '/home/goatchurch/expoweb/' EXPOWEB = '/home/goatchurch/expoweb/'
SURVEYS_URL = '' SURVEYS_URL = ''

4
localsettingswindows.py
View File

@ -11,6 +11,8 @@ EXPOWEB = 'C:\\Expo\\expoweb\\'
SURVEYS = 'E:\\surveys\\' SURVEYS = 'E:\\surveys\\'
SURVEY_SCANS = 'E:\\surveys\\surveyscans' SURVEY_SCANS = 'E:\\surveys\\surveyscans'
EXPOWEB_URL = 'http://expo.survex.com/'
LOGFILE = EXPOWEB+'troggle\\parsing_log.txt' LOGFILE = EXPOWEB+'troggle\\parsing_log.txt'
PHOTOS = 'C:\\Expo\\expoweb\\photos' PHOTOS = 'C:\\Expo\\expoweb\\photos'
@ -49,4 +51,4 @@ TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
) )

6
templates/base.html
View File

@ -18,6 +18,7 @@
<div id="header"> <div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1> <h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
<div id="editLinks"> {% block loginInfo %} <div id="editLinks"> {% block loginInfo %}
<a href="{{ settings.EXPOWEB_URL }}">ExpoWeb</a> |
<a href="{{ settings.URL_ROOT }}">Home</a> | <a href="{{ settings.URL_ROOT }}">Home</a> |
{% if user.username %} {% if user.username %}
You are logged in as {{ user.username }} You are logged in as {{ user.username }}
@ -38,8 +39,9 @@
<a href="{% url survexcavessingle 161 %}">161</a> | <a href="{% url survexcavessingle 161 %}">161</a> |
<a href="{% url survexcavessingle 204 %}">204</a> | <a href="{% url survexcavessingle 204 %}">204</a> |
<a href="{% url survexcavessingle 258 %}">258</a> | <a href="{% url survexcavessingle 258 %}">258</a> |
<a href="{% url expedition 2008 %}">Expo2008</a> | <a href="{% url expedition 2008 %}">Expo2009</a> |
<a href="{% url expedition 2009 %}">Expo2009</a> | <a href="{% url expedition 2009 %}">Expo2010</a> |
<a href="{% url expedition 2009 %}">Expo2011</a> |
<a href="/admin">Django admin</a> <a href="/admin">Django admin</a>
</div> </div>