expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 07:47:13 +00:00
Code Issues 18 Projects 3 Activity

[svn] Add: new generic object list template object_list.html, and convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py

Browse Source
This commit is contained in:
substantialnoninfringinguser
2009-05-15 03:29:19 +01:00
parent 118d132797
commit d8a215a575
6 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
settings.py
View File

@@ -1,3 +1,4 @@
from localsettings import *
import os
import urlparse
# Django settings for troggle project.
@@ -35,11 +36,10 @@ USE_I18N = True
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
if URL_ROOT:
MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')
PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/')
SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/')
MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/')
SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/')
PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/')
SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/')
APPEND_SLASH = False
SMART_APPEND_SLASH = True
@@ -86,6 +86,4 @@ INSTALLED_APPS = (
'troggle.profiles',
'troggle.expo',
'troggle.imagekit',
)
from localsettings import *
)