[svn r8311] Smart url joining

This commit is contained in:
aaron 2009-03-27 17:11:41 +01:00
parent 4ce8ca0a5e
commit e614e86d85

View File

@ -1,6 +1,6 @@
from localsettings import *
import os
import urllib
import urlparse
# Django settings for troggle project.
DEBUG = True
@ -35,10 +35,10 @@ USE_I18N = True
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
MEDIA_URL = URL_ROOT+'site_media/'
SURVEYS_URL = URL_ROOT+'/survey_scans/'
PHOTOS_URL = URL_ROOT+'/photos/'
SVX_URL = 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