Add tinymce and quiz to deps and example

diff --git a/example/settings.py b/example/settings.py
index b840468a1111803005f0e6d179b31a518caa115b..57793c4733f7f7bc759268c1575956c58d048b3a 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -148,11 +148,16 @@ INSTALLED_APPS = (
     'timezones',
     'jqchat',
 #    'follow',
-     'googletools',
-     # 'telecaster',
-     'extra_views',
-     'captcha',
-     'django_user_agents',
+    'googletools',
+    # 'telecaster',
+    'extra_views',
+    'captcha',
+    'django_user_agents',
+    'tinymce',
+    'multichoice',
+    'true_false',
+    'essay',
+    'quiz',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -231,3 +236,12 @@ CACHES = {
 # Name of cache backend to cache user agents. If it not specified default
 # cache alias will be used. Set to `None` to disable caching.
 USER_AGENTS_CACHE = 'default'
+
+AUTH_USER_MODEL = 'auth.User'
+
+TINYMCE_DEFAULT_CONFIG = {
+            'plugins': "table,spellchecker<Plug>PeepOpenaste,searchreplace",
+            'theme': "advanced",
+            'cleanup_on_startup': True,
+            'custom_undo_redo_levels': 10,
+}

diff --git a/requirements.txt b/requirements.txt
index 080308b064f123216a678d2aff97c0a2b52978b2..9a76a5b1cfcab7878745e4e4a5c57fe2243b11c0 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,3 +17,5 @@ django-nvd3
 django-user-agents
 xhtml2pdf
 html5lib==0.95
+django-tinymce==1.5.4
+django-quiz