summaryrefslogtreecommitdiff
path: root/pv/settings.py
diff options
context:
space:
mode:
authorErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2014-02-28 19:00:45 (GMT)
committerErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2014-02-28 19:00:45 (GMT)
commit0c00f412dc5d8ccba552f3633993a4696e0d6b55 (patch)
treed299cb6bcb60dfc99ad70f1d8cfb100f8aea71a6 /pv/settings.py
parentabc439740a24c503b8756aa30c57281a4cf6ad31 (diff)
parentd4c75b4893bfcb28e300ff5e10dc9cd0993f8537 (diff)
Merge branch 'master' of https://github.com/nnrcschmdt/helsinki
Diffstat (limited to 'pv/settings.py')
-rw-r--r--pv/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pv/settings.py b/pv/settings.py
index 187b63b..cf1da74 100644
--- a/pv/settings.py
+++ b/pv/settings.py
@@ -35,7 +35,7 @@ LOCALE_PATHS = os.path.join(PROJECT_DIR, 'locale')
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'site_media')
MEDIA_URL = '/site_media/'
-STATIC_URL = '/django_static/'
+STATIC_URL = '/static/'
SECRET_KEY = ''
@@ -72,6 +72,7 @@ INSTALLED_APPS = (
'tinymce',
)
+TINYMCE_JS_URL = '/static/js/tiny_mce/tiny_mce.js'
TINYMCE_DEFAULT_CONFIG = {
'plugins' : 'contextmenu',
'theme': 'advanced',