summaryrefslogtreecommitdiffstats
path: root/settings.py
diff options
context:
space:
mode:
authorWookey <wookey@wookware.org>2019-04-02 00:57:54 +0100
committerWookey <wookey@wookware.org>2019-04-02 00:57:54 +0100
commitc4301cf6df56ba1bef4f2c908b949a2b45ea65dc (patch)
tree9c6bb4a4530824c8e072984a0346509298188030 /settings.py
parentde7d68b1eb70542f66092cb0048af3d096e6980c (diff)
parentbb8dbb381fe87c3a63e9586a1bf1e993b09c965b (diff)
downloadtroggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.tar.gz
troggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.tar.bz2
troggle-c4301cf6df56ba1bef4f2c908b949a2b45ea65dc.zip
Merge lots of troggle fixes
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings.py b/settings.py
index b0656ae..9770fd7 100644
--- a/settings.py
+++ b/settings.py
@@ -45,8 +45,8 @@ NOTABLECAVESHREFS = [ "161", "204", "258", "76", "107", "264" ]
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
-CAVEDESCRIPTIONS = os.path.join(EXPOWEB, "noinfo", "cave_data")
-ENTRANCEDESCRIPTIONS = os.path.join(EXPOWEB, "noinfo", "entrance_data")
+CAVEDESCRIPTIONS = os.path.join(EXPOWEB, "cave_data")
+ENTRANCEDESCRIPTIONS = os.path.join(EXPOWEB, "entrance_data")
MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')