diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:11:40 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:11:40 +0100 |
| commit | 558a005836fe0384a592f2d161333e1aa486a60a (patch) | |
| tree | 3419bf2731e19022029da9db7134d373880f7b04 /settings.py | |
| parent | 72bd959b2ae6934c9b2a50a27e898fff2223ea1f (diff) | |
| download | troggle-558a005836fe0384a592f2d161333e1aa486a60a.tar.gz troggle-558a005836fe0384a592f2d161333e1aa486a60a.tar.bz2 troggle-558a005836fe0384a592f2d161333e1aa486a60a.zip | |
[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
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/settings.py b/settings.py index 8e8a67e..5c1d48b 100644 --- a/settings.py +++ b/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 |