Skip to content
Browse files

remove some duplication in the example and add admin docs

  • Loading branch information...
1 parent b1d4762 commit 48a05e34a8b53ccef7bee3898b0244a2faa1b292 @frog32 frog32 committed
Showing with 7 additions and 16 deletions.
  1. +6 −15 example/settings.py
  2. +1 −1 example/urls.py
View
21 example/settings.py
@@ -96,7 +96,6 @@
)
ROOT_URLCONF = 'example.urls'
-STATIC_URL = '/static/'
# Additional locations of static files
STATICFILES_DIRS = (
@@ -105,14 +104,6 @@
# Don't forget to use absolute paths, not relative paths.
)
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
@@ -127,7 +118,7 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
- 'django.contrib.staticfiles',
+ 'django.contrib.admindocs',
'feincms',
'feincms.module.medialibrary',
'pennyblack',
@@ -137,8 +128,8 @@
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-TINYMCE_JS_URL = MEDIA_URL + 'javascript/tiny_mce/tiny_mce.js'
-# TINYMCE_CONFIG_URL = 'admin/tiny_mce_config.html'
-# TINYMCE_CONTENT_CSS_URL = MEDIA_URL + 'stylesheets/tiny_mce.css'
-# TINYMCE_LINK_LIST_URL = '/admin/javascript/tiny_mce_links.js'
-
+FEINCMS_RICHTEXT_INIT_CONTEXT = {
+ 'TINYMCE_JS_URL': os.path.join(STATIC_URL, 'javascript/tiny_mce/tiny_mce.js'),
+ 'TINYMCE_CONTENT_CSS_URL': None,
+ 'TINYMCE_LINK_LIST_URL': None
+}
View
2 example/urls.py
@@ -6,7 +6,7 @@
urlpatterns = patterns('',
(r'^media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT}),
-
+ (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
url(r'^newsletter/', include('pennyblack.urls'), name = 'pennyblack'),

0 comments on commit 48a05e3

Please sign in to comment.
Something went wrong with that request. Please try again.