From 5f9330149395ed88f320759aeee294bbde190e31 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Fri, 15 May 2009 03:29:19 +0100 Subject: [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 --- settings.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 6b878ee..e99d199 100644 --- a/settings.py +++ b/settings.py @@ -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 * \ No newline at end of file +) \ No newline at end of file -- cgit v1.2.3