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
commitb3089fafe99d4fffc9ee96ad1a8d70d0dd242f80 (patch)
tree9c6bb4a4530824c8e072984a0346509298188030 /settings.py
parente913a56a6be2e2d90ba0c6f882416acbd8e3e2a2 (diff)
parent39c61bd526ecaff42650efcd011548aa9dac6900 (diff)
downloadtroggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.gz
troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.bz2
troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.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/')