diff --git a/testapp/admin.py b/testapp/admin.py index 40cdd0c..d2b9cf7 100644 --- a/testapp/admin.py +++ b/testapp/admin.py @@ -1,29 +1,7 @@ from django.db import models -from django.contrib.admin import site, ModelAdmin - -from markdownx.widgets import AdminMarkdownxWidget -from markdownx.models import MarkdownxField +from django.contrib import admin +from markdownx.admin import MarkdownxModelAdmin from .models import MyModel - -class MyModelAdmin(ModelAdmin): - formfield_overrides = { - MarkdownxField: {'widget': AdminMarkdownxWidget}, - models.TextField: {'widget': AdminMarkdownxWidget}, - } - - -site.register(MyModel, MyModelAdmin) - -## -## SHORTER OPTION: -## - -# from django.contrib import admin - -# from markdownx.admin import MarkdownxModelAdmin - -# from .models import MyModel - -# admin.site.register(MyModel, MarkdownxModelAdmin) +admin.site.register(MyModel, MarkdownxModelAdmin) diff --git a/testapp/forms.py b/testapp/forms.py index b807f60..66d9f8b 100644 --- a/testapp/forms.py +++ b/testapp/forms.py @@ -1,18 +1,7 @@ from django import forms from markdownx.fields import MarkdownxFormField -from markdownx.widgets import MarkdownxWidget class MyForm(forms.Form): - markdownx_form_field1 = MarkdownxFormField( - widget=MarkdownxWidget( - attrs={'class': 'custom-class-markdownx_form_field1'} - ) - ) - - markdownx_form_field2 = MarkdownxFormField( - widget=MarkdownxWidget( - attrs={'class': 'custom-class-markdownx_form_field2'} - ) - ) + myfield = MarkdownxFormField() diff --git a/testapp/migrations/0001_initial.py b/testapp/migrations/0001_initial.py index 763bcb9..235e276 100644 --- a/testapp/migrations/0001_initial.py +++ b/testapp/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-05-04 20:21 +# Generated by Django 1.11.1 on 2017-05-11 21:12 from __future__ import unicode_literals from django.db import migrations, models @@ -18,10 +18,7 @@ class Migration(migrations.Migration): name='MyModel', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('markdownx_field1', markdownx.models.MarkdownxField()), - ('markdownx_field2', markdownx.models.MarkdownxField()), - ('textfield1', models.TextField()), - ('textfield2', models.TextField()), + ('myfield', markdownx.models.MarkdownxField()), ], ), ] diff --git a/testapp/models.py b/testapp/models.py index 111c0b8..16efc76 100644 --- a/testapp/models.py +++ b/testapp/models.py @@ -4,8 +4,4 @@ from markdownx.models import MarkdownxField class MyModel(models.Model): - markdownx_field1 = MarkdownxField() - markdownx_field2 = MarkdownxField() - - textfield1 = models.TextField() - textfield2 = models.TextField() + myfield = MarkdownxField() diff --git a/testapp/settings.py b/testapp/settings.py index ecade00..10b16c1 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -15,8 +15,9 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', - 'markdownx', 'testapp', + + 'markdownx', ) MIDDLEWARE = [ @@ -65,8 +66,6 @@ TEMPLATES = [ 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ - # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this - # list if you haven't customized them: 'django.contrib.auth.context_processors.auth', 'django.template.context_processors.debug', 'django.template.context_processors.i18n', diff --git a/testapp/templates/base.html b/testapp/templates/base.html index 762f064..c3dc2fd 100644 --- a/testapp/templates/base.html +++ b/testapp/templates/base.html @@ -1,6 +1,29 @@ - + + + + - {% block content %}{% endblock %} +
+
+
+ +
+
+
+
+ {% block content %}{% endblock %} +
+
+
diff --git a/testapp/templates/index.html b/testapp/templates/index.html index 20b26c7..8cd2258 100644 --- a/testapp/templates/index.html +++ b/testapp/templates/index.html @@ -1,8 +1,8 @@ {% extends 'base.html' %} {% block content %} - +
{% csrf_token %} + {{ form }} +
+{{ form.media }} {% endblock %} diff --git a/testapp/templates/markdownx/widget2.html b/testapp/templates/markdownx/widget2.html new file mode 100644 index 0000000..fe7f961 --- /dev/null +++ b/testapp/templates/markdownx/widget2.html @@ -0,0 +1,8 @@ +
+
+ {% include 'django/forms/widgets/textarea.html' %} +
+
+
+
+
diff --git a/testapp/templates/test_create_view.html b/testapp/templates/test_create_view.html deleted file mode 100644 index cc4d337..0000000 --- a/testapp/templates/test_create_view.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
{% csrf_token %} - {{ form.as_p }} -
-{{ form.media }} -{% endblock %} diff --git a/testapp/templates/test_form_view.html b/testapp/templates/test_form_view.html deleted file mode 100644 index cc4d337..0000000 --- a/testapp/templates/test_form_view.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
{% csrf_token %} - {{ form.as_p }} -
-{{ form.media }} -{% endblock %} diff --git a/testapp/urls.py b/testapp/urls.py index 47fcbb0..c8ba7e0 100644 --- a/testapp/urls.py +++ b/testapp/urls.py @@ -3,17 +3,11 @@ from django.conf.urls import include, url from django.conf.urls.static import static from django.contrib import admin -from testapp.views import ( - IndexTemplateView, - TestFormView, - TestCreateView, -) +from testapp.views import TestFormView urlpatterns = [ - url(r'^$', IndexTemplateView.as_view()), - url(r'^form-view/$', TestFormView.as_view(), name='form_view'), - url(r'^create-view/$', TestCreateView.as_view(), name='create_view'), + url(r'^$', TestFormView.as_view(), name='form_view'), url(r'^markdownx/', include('markdownx.urls')), url(r'^admin/', include(admin.site.urls)), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/testapp/views.py b/testapp/views.py index 844588f..09da22b 100644 --- a/testapp/views.py +++ b/testapp/views.py @@ -1,27 +1,9 @@ from django.views.generic.base import TemplateView from django.views.generic.edit import FormView, CreateView -from testapp.models import MyModel from testapp.forms import MyForm -class IndexTemplateView(TemplateView): - template_name = 'index.html' - - class TestFormView(FormView): - template_name = "test_form_view.html" + template_name = "index.html" form_class = MyForm - success_url = '/' - - -class TestCreateView(CreateView): - template_name = "test_create_view.html" - model = MyModel - success_url = '/' - fields = [ - 'markdownx_field1', - 'markdownx_field2', - 'textfield1', - 'textfield2' - ]