From 5853daba890651698c9a0261ab7ed7909fe5d8f7 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Sun, 15 Apr 2018 16:36:23 +0100 Subject: [PATCH] New vars needed to make django 1.7 and tinymce work --- localsettingspotatohut.py | 3 +++ localsettingsserver.py | 3 +++ localsettingsubuntu.py | 3 +++ localsettingswindows.py | 3 +++ 4 files changed, 12 insertions(+) diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index a9c39d5..5346415 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -41,6 +41,9 @@ EXPOWEB_URL = 'http://expo/' SURVEYS_URL = 'http://expo/survey_scans/' MEDIA_URL = '/' + DIR_ROOT + 'site_media/' +STATIC_URL = URL_ROOT +STATIC_ROOT = DIR_ROOT + MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' diff --git a/localsettingsserver.py b/localsettingsserver.py index 6edb968..b0cd49d 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -43,6 +43,9 @@ EXPOWEB_URL = 'http://expo.survex.com/' SURVEYS_URL = 'http://expo.survex.com/survey_scans/' MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/' +STATIC_URL = URL_ROOT +STATIC_ROOT = DIR_ROOT + MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index 9779555..c50a374 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -48,6 +48,9 @@ MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/' +STATIC_URL = URL_ROOT +STATIC_ROOT = DIR_ROOT + JSLIB_URL = URL_ROOT + 'javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' diff --git a/localsettingswindows.py b/localsettingswindows.py index bb689e6..110bd36 100644 --- a/localsettingswindows.py +++ b/localsettingswindows.py @@ -38,6 +38,9 @@ PYTHON_PATH = 'C:\\expoweb\\troggle\\' MEDIA_ROOT = 'C:/Expo/expoweb/troggle/media/' MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/' +STATIC_URL = URL_ROOT +STATIC_ROOT = DIR_ROOT + #FILES = "http://framos.lawoftheland.co.uk/troggle/survey_files/" EMAIL_HOST = "smtp.gmail.com"