xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

[svn] Smart url joining

Browse Source 
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:
substantialnoninfringinguser 2009-05-13 06:11:40 +01:00
parent 72bd959b2a
commit 558a005836
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings.py
View File

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