ztimson/oacpl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Vanilla text areas

Browse Source
This commit is contained in:
Zakary Timson
2018-01-02 17:27:59 -05:00
parent 40319f2a2e
commit 66cdd590c3
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OACPL/settings.base.py
View File

@@ -42,8 +42,6 @@ INSTALLED_APPS = [
'bootstrap_admin', 'bootstrap_admin',
'case_law', 'case_law',
'charter_members.apps.CharterMembersConfig', 'charter_members.apps.CharterMembersConfig',
'ckeditor',
'ckeditor_uploader',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',

3
OACPL/urls.py
View File

@@ -28,7 +28,6 @@ urlpatterns = [
url(r'^admin/', admin.site.urls, name='admin'), url(r'^admin/', admin.site.urls, name='admin'),
url(r'^attorney/(?P<id>\d+)', charter_members.views.index, name='attorney'), url(r'^attorney/(?P<id>\d+)', charter_members.views.index, name='attorney'),
url(r'^caselaw/', case_law.views.browser, name='caselaw'), url(r'^caselaw/', case_law.views.browser, name='caselaw'),
url(r'^ckeditor/', include('ckeditor_uploader.urls')),
url(r'^contact/', main.views.contact, name='contact'), url(r'^contact/', main.views.contact, name='contact'),
url(r'^experts/(?P<id>\d+)', expert_witnesses.views.viewer, name='expert'), url(r'^experts/(?P<id>\d+)', expert_witnesses.views.viewer, name='expert'),
url(r'^experts/', expert_witnesses.views.browser, name='experts'), url(r'^experts/', expert_witnesses.views.browser, name='experts'),
@@ -40,5 +39,5 @@ urlpatterns = [
url(r'^media/secure/(?P<path>.*)$', protected_serve, {'document_root': os.path.join(settings.MEDIA_ROOT, 'secure')}, name='secure media'), url(r'^media/secure/(?P<path>.*)$', protected_serve, {'document_root': os.path.join(settings.MEDIA_ROOT, 'secure')}, name='secure media'),
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}, name='media'), url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}, name='media'),
url(r'^newsletter/subscribe', newsletters.views.subscribe, name='subscribe'), 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')
] ]

6
forum/models.py
View File

@@ -1,8 +1,6 @@
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from ckeditor_uploader.fields import RichTextUploadingField
class Thread(models.Model): class Thread(models.Model):
topic = models.CharField(max_length=255) topic = models.CharField(max_length=255)
@@ -14,7 +12,7 @@ class Thread(models.Model):
class Post(models.Model): class Post(models.Model):
topic = models.ForeignKey(Thread) topic = models.ForeignKey(Thread)
title = models.CharField(max_length=255) title = models.CharField(max_length=255)
question = RichTextUploadingField() question = models.TextField()
creator = models.ForeignKey(User) creator = models.ForeignKey(User)
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
@@ -24,7 +22,7 @@ class Post(models.Model):
class Comment(models.Model): class Comment(models.Model):
post = models.ForeignKey(Post) post = models.ForeignKey(Post)
reply = RichTextUploadingField() reply = models.TextField()
creator = models.ForeignKey(User) creator = models.ForeignKey(User)
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)

4
newsletters/models.py
View File

@@ -2,11 +2,9 @@ from django.db import models
from django.contrib.auth.admin import User from django.contrib.auth.admin import User
from django.utils import timezone from django.utils import timezone
from ckeditor_uploader.fields import RichTextUploadingField
class Newsletter(models.Model): class Newsletter(models.Model):
body = RichTextUploadingField() body = models.TextField()
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
creator = models.ForeignKey(User) creator = models.ForeignKey(User)
publish = models.DateTimeField(default=timezone.now) publish = models.DateTimeField(default=timezone.now)

1
requirements.txt
View File

@@ -2,4 +2,3 @@ bootstrap-admin==0.3.7.1
Django==1.11.5 Django==1.11.5
Pillow==4.2.1 Pillow==4.2.1
requests==2.11.1 requests==2.11.1
django-ckeditor==5.3.0