Add TinyMCE

diff --git a/djsite/settings.py b/djsite/settings.py
index d81d8bc83b706b537a3167b21f03008a149760a1..f8a06058a40bfdae467122d72b49b110c328ddc6 100644 (file)
--- a/djsite/settings.py
+++ b/djsite/settings.py
@@ -37,6 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'tinymce',
     'quotes',
 )
 
@@ -101,3 +102,11 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
 STATIC_URL = '/static/'
+
+TINYMCE_DEFAULT_CONFIG = {
+#    'theme_advanced_buttons1' : ['bold', 'underline', 'italic', 'separator', 'insertdate', 'inserttime'],
+    'theme_advanced_buttons1' : 'undo,redo,cut,copy,paste,|,bold,italic,underline,strikethrough,fontsizeselect,removeformat,|,bullist,numlist,|,link,unlink',
+    'theme_advanced_buttons2' : 'tablecontrols,table,row_props,cell_props,delete_col,delete_row,col_after,col_before,row_after,row_before,split_cells,merge_cells',
+    'theme_advanced_buttons3' : "",
+    'plugins': 'table',
+}

diff --git a/djsite/urls.py b/djsite/urls.py
index 761ea477a5e7367c142bc7b69a96ff0801302b31..3ffc7fc3ead6c0fc2bc47494fc1d2819be687c24 100644 (file)
--- a/djsite/urls.py
+++ b/djsite/urls.py
@@ -18,5 +18,6 @@ from django.contrib import admin
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^tinymce/', include('tinymce.urls')),
     url(r'^quotes/', include('quotes.urls', namespace='quotes')),
 ]

diff --git a/quotes/models.py b/quotes/models.py
index 9c65abc3c42862939534360a08ba0456ed98b8a9..cdae648e21960c540bc2dbab1b9b8334ffdf9344 100644 (file)
--- a/quotes/models.py
+++ b/quotes/models.py
@@ -1,7 +1,7 @@
 from django.db import models
+from tinymce import models as tinymce_models
 
 # Create your models here.
-
 class Tag(models.Model):
     tag = models.CharField(max_length=100)
     def __unicode__(self):
@@ -10,12 +10,12 @@ class Tag(models.Model):
 class Author(models.Model):
     name = models.CharField(max_length=100,
                             help_text="Name of the author")
-    notes = models.TextField(blank=True, help_text= \
-                             "Notes about the author; may be left blank. Will \
-                              not be HTML-escaped.")
+    notes = tinymce_models.HTMLField(blank=True, help_text= \
+                "Notes about the author; may be left blank. Will \
+                not be HTML-escaped.",)
     pvt_notes = models.TextField(blank=True, help_text= \
                                  "Notes about the author; not displayed on \
-                                  the public interface")
+                                  the public interface",)
     tags = models.ManyToManyField(Tag, blank=True)
 
     birth_date = models.DateField(blank=True, null=True,
@@ -62,7 +62,7 @@ class Work(models.Model):
                                  "Notes about the work; not displayed on \
                                   the public interface")
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s: %s (%s)" % (self.author.name, self.name, self.date)
 
 class Quote(models.Model):