diff options
| -rw-r--r-- | localsettings.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/localsettings.py b/localsettings.py index 96998cd..0ed5ff1 100644 --- a/localsettings.py +++ b/localsettings.py @@ -143,14 +143,15 @@ SCANS_ROOT = EXPOFILES / "surveyscans" PHOTOS_ROOT = EXPOFILES / "photos" #EXPOFILES = urllib.parse.urljoin(REPOS_ROOT_PATH, 'expofiles/') -PHOTOS_URL = urllib.parse.urljoin(URL_ROOT, '/photos/') +PHOTOS_URL = Path(URL_ROOT, "/photos/") +#PHOTOS_URL = urllib.parse.urljoin(URL_ROOT, '/photos/') # MEDIA_URL is used by urls.py in a regex. See urls.py & core/views_surveys.py MEDIA_URL = '/site_media/' -STATIC_URL = urllib.parse.urljoin(URL_ROOT , '/static/') # used by Django admin pages. Do not delete. -JSLIB_URL = urllib.parse.urljoin(URL_ROOT , '/javascript/') # always fails, try to revive it ? +STATIC_URL = Path(URL_ROOT, "/static/") # used by Django admin pages. Do not delete. +JSLIB_URL = Path(URL_ROOT, "/javascript/") # used for CaveViewer JS utility # STATIC_ROOT removed after merging content into MEDIA_ROOT. See urls.py & core/views/surveys.py #TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed |