summaryrefslogtreecommitdiffstats
path: root/settings.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-14 06:32:58 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-14 06:32:58 +0100
commitc0b73d4777fad30b57de96b71656a61ad972eb9d (patch)
treedd39213e1bf8b417db4865d7733e8725d9f4fb61 /settings.py
parente9e755b5175b47a4dbb69ac114428660bb2e12a8 (diff)
downloadtroggle-c0b73d4777fad30b57de96b71656a61ad972eb9d.tar.gz
troggle-c0b73d4777fad30b57de96b71656a61ad972eb9d.tar.bz2
troggle-c0b73d4777fad30b57de96b71656a61ad972eb9d.zip
[svn]
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/settings.py b/settings.py
index 449faf4..4a6fa34 100644
--- a/settings.py
+++ b/settings.py
@@ -35,10 +35,12 @@ USE_I18N = True
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos')
-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/')
+
+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/')
APPEND_SLASH = False
SMART_APPEND_SLASH = True