forked from expo/troggle
[svn] Smart url joining
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8311 by aaron @ 3/27/2009 4:11 PM
This commit is contained in:
parent
72bd959b2a
commit
558a005836
10
settings.py
10
settings.py
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user