From 359a1f45162e5c73c7a494ff307fbb9ae038f1ea Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Mon, 4 Sep 2017 12:01:57 -0400 Subject: [PATCH] Switched to tinymce --- newsletters/models.py | 4 +--- requirements.txt | 1 - templates/admin/base_site.html | 12 ++++++++++++ templates/base.html | 4 ++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/newsletters/models.py b/newsletters/models.py index 0f8e523..069e6a8 100644 --- a/newsletters/models.py +++ b/newsletters/models.py @@ -2,11 +2,9 @@ from django.db import models from django.contrib.auth.admin import User from django.utils.timezone import now -from froala_editor.fields import FroalaField - class Newsletter(models.Model): - body = FroalaField() + body = models.TextField() created = models.DateTimeField(auto_now_add=True) creator = models.ForeignKey(User) publish = models.DateTimeField(default=now()) diff --git a/requirements.txt b/requirements.txt index 91468d2..e43a349 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,3 @@ bootstrap-admin==0.3.7.1 Django==1.11.4 Pillow==4.2.1 requests==2.11.1 -django-froala-editor==2.6.5 diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index fe10ab4..3bcdafa 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -5,6 +5,18 @@ {% block extrahead %} + + +