From bc6f2e1286edea48074766116a36fa35905f28a4 Mon Sep 17 00:00:00 2001 From: Zak Timson Date: Mon, 4 Sep 2017 13:32:21 -0400 Subject: [PATCH] Revert "Added HTML editor" This reverts commit a8a4c8d --- OACPL/settings.base.py | 1 - OACPL/urls.py | 5 ++--- newsletters/templates/newsletters.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/OACPL/settings.base.py b/OACPL/settings.base.py index 51c244e..1904b2f 100644 --- a/OACPL/settings.base.py +++ b/OACPL/settings.base.py @@ -40,7 +40,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'forum.apps.ForumConfig', - 'froala_editor', 'main.apps.MainConfig', 'newsletters.apps.NewslettersConfig' ] diff --git a/OACPL/urls.py b/OACPL/urls.py index b62233c..554f489 100644 --- a/OACPL/urls.py +++ b/OACPL/urls.py @@ -1,7 +1,7 @@ import os from django.conf import settings -from django.conf.urls import include, url +from django.conf.urls import url from django.contrib import admin from django.contrib.auth.decorators import login_required from django.views.static import serve @@ -21,9 +21,8 @@ urlpatterns = [ url(r'^admin/logout', main.views.logout, name='logout'), url(r'^admin/', admin.site.urls, name='admin'), url(r'^attorney/(?P\d+)', charter_members.views.index, name='attorney'), - url(r'^froala_editor/', include('froala_editor.urls')), url(r'^media/secure/(?P.*)$', protected_serve, {'document_root': os.path.join(settings.MEDIA_ROOT, 'secure')}, name='secure media'), url(r'^media/(?P.*)$', serve, {'document_root': settings.MEDIA_ROOT}, name='media'), url(r'^newsletter/subscribe', newsletters.views.subscribe, name='subscribe'), - url(r'^newsletter/', newsletters.views.newsletters, name='newsletters'), + url(r'^newsletter/', newsletters.views.newsletters, name='newsletters') ] diff --git a/newsletters/templates/newsletters.html b/newsletters/templates/newsletters.html index dacd87a..3474985 100644 --- a/newsletters/templates/newsletters.html +++ b/newsletters/templates/newsletters.html @@ -26,7 +26,7 @@
- {{ newsletter.body | safe }} + {{ newsletter.body }}