Permalink
Browse files

Cleaned up cms.plugins.text.settings and fixed #962, thanks to @fivet…

…hreeo for the help
  • Loading branch information...
1 parent ce90ac1 commit 74bcbacbdfd71e64dc8deda80c09c34473f848b4 Jonas Obrist committed Aug 25, 2011
Showing with 2 additions and 4 deletions.
  1. +2 −4 cms/plugins/text/settings.py
@@ -1,4 +1,5 @@
from django.conf import settings
+from cms.utils import cms_static_url
# Uses TinyMCE as editor (no inline plugins). Requires django-tinymce app.
# If false, then WYMEditor is used.
@@ -60,7 +61,4 @@
#Advantageously replaces WYM_CLASSES and WYM_STYLES
##Prepare url for wymeditor.css
-CMS_MEDIA_PATH = getattr(settings, 'CMS_MEDIA_PATH', 'cms/')
-WYM_STYLESHEET_PATH = getattr(settings, 'WYM_STYLESHEET_PATH', ''.join((settings.STATIC_URL, 'cms')) )
-WYM_STYLESHEET = getattr(settings, "WYM_STYLESHEET", '"%scss/wymeditor.css"' % WYM_STYLESHEET_PATH )
-
+WYM_STYLESHEET = getattr(settings, "WYM_STYLESHEET", '"%s"' % cms_static_url('css/wymeditor.css'))

0 comments on commit 74bcbac

Please sign in to comment.