Merge pull request #227 from liangliangyy/dev

替换markdown编辑器 close #216 close #224

DjangoBlog/settings.py

@@ -44,7 +44,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.sitemaps',
-    'pagedown',
+    'mdeditor',
     'haystack',
     'blog',
     'accounts',
@@ -284,3 +284,7 @@ COMPRESS_CSS_FILTERS = [
 COMPRESS_JS_FILTERS = [
     'compressor.filters.jsmin.JSMinFilter'
 ]
+
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
+MEDIA_URL = '/media/'

DjangoBlog/urls.py

@@ -22,6 +22,7 @@ from django.views.decorators.cache import cache_page
 from django.conf import settings
 from django.conf.urls.static import static
 from DjangoBlog.admin_site import admin_site
+from django.urls import include, path
 
 sitemaps = {
 
@@ -38,7 +39,7 @@ handle403 = 'blog.views.permission_denied_view'
 urlpatterns = [
                   url(r'^admin/', admin_site.urls),
                   url(r'', include('blog.urls', namespace='blog')),
-
+                  url(r'mdeditor/', include('mdeditor.urls')),
                   url(r'', include('comments.urls', namespace='comment')),
                   url(r'', include('accounts.urls', namespace='account')),
                   url(r'', include('oauth.urls', namespace='oauth')),

blog/admin.py

@@ -1,7 +1,6 @@
 from django.contrib import admin
 # Register your models here.
 from .models import Article, Category, Tag, Links, SideBar, BlogSettings
-from pagedown.widgets import AdminPagedownWidget
 from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
@@ -27,7 +26,7 @@ class ArticleListFilter(admin.SimpleListFilter):
 
 
 class ArticleForm(forms.ModelForm):
-    body = forms.CharField(widget=AdminPagedownWidget())
+    # body = forms.CharField(widget=AdminPagedownWidget())
 
     class Meta:
         model = Article

blog/models.py

@@ -11,6 +11,7 @@ from DjangoBlog.utils import get_current_site
 from DjangoBlog.utils import cache_decorator, cache
 from django.utils.functional import cached_property
 from django.utils.timezone import now
+from mdeditor.fields import MDTextField
 
 logger = logging.getLogger(__name__)
 
@@ -67,7 +68,7 @@ class Article(BaseModel):
         ('p', '页面'),
     )
     title = models.CharField('标题', max_length=200, unique=True)
-    body = models.TextField('正文')
+    body = MDTextField('正文')
     pub_time = models.DateTimeField('发布时间', blank=True, null=True)
     status = models.CharField('文章状态', max_length=1, choices=STATUS_CHOICES, default='p')
     comment_status = models.CharField('评论状态', max_length=1, choices=COMMENT_STATUS, default='o')

requirements.txt

@@ -1,23 +1,23 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
-astroid==2.1.0
+astroid==2.2.5
 bottle==0.12.16
-certifi==2018.11.29
-cffi==1.11.5
+certifi==2019.3.9
+cffi==1.12.2
 chardet==3.0.4
 coverage==4.5.2
-cryptography==2.5
+cryptography==2.6.1
 Django==2.1.7
-django-appconf==1.0.2
+django-appconf==1.0.3
 django-autoslug==1.9.4
 django-compressor==2.2
 django-debug-toolbar==1.11
 django-haystack==2.8.1
 django-ipware==2.1.0
-django-pagedown==1.0.6
+django-mdeditor==0.1.13
 django-uuslug==1.1.8
 idna==2.8
-isort==4.3.4
+isort==4.3.14
 jieba==0.39
 jsonpickle==1.1
 lazy-object-proxy==1.3.1
@@ -29,22 +29,24 @@ packaging==19.0
 Pillow==5.4.1
 pycparser==2.19
 Pygments==2.3.1
-pylint==2.2.2
+pylint==2.3.1
 PyMySQL==0.9.3
 pyparsing==2.3.1
 python-memcached==1.59
-python-slugify==2.0.1
+python-slugify==3.0.0
 pytz==2018.9
 raven==6.10.0
 rcssmin==1.0.6
 requests==2.21.0
-rjsmin==1.0.12
+rjsmin==1.1.0
 six==1.12.0
 sqlparse==0.2.4
+text-unidecode==1.2
+typed-ast==1.3.1
 Unidecode==1.0.23
 urllib3==1.24.1
 webencodings==0.5.1
-WeRoBot==1.7.0
+WeRoBot==1.8.0
 Whoosh==2.7.4
 wrapt==1.11.1
 xmltodict==0.12.0

travis_test/requirements.txt

@@ -1,23 +1,23 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
-astroid==2.1.0
+astroid==2.2.5
 bottle==0.12.16
-certifi==2018.11.29
-cffi==1.11.5
+certifi==2019.3.9
+cffi==1.12.2
 chardet==3.0.4
 coverage==4.5.2
-cryptography==2.5
+cryptography==2.6.1
 Django==2.1.7
-django-appconf==1.0.2
+django-appconf==1.0.3
 django-autoslug==1.9.4
 django-compressor==2.2
 django-debug-toolbar==1.11
 django-haystack==2.8.1
 django-ipware==2.1.0
-django-pagedown==1.0.6
+django-mdeditor==0.1.13
 django-uuslug==1.1.8
 idna==2.8
-isort==4.3.4
+isort==4.3.14
 jieba==0.39
 jsonpickle==1.1
 lazy-object-proxy==1.3.1
@@ -29,21 +29,23 @@ packaging==19.0
 Pillow==5.4.1
 pycparser==2.19
 Pygments==2.3.1
-pylint==2.2.2
+pylint==2.3.1
 PyMySQL==0.9.3
 pyparsing==2.3.1
-python-slugify==2.0.1
+python-slugify==3.0.0
 pytz==2018.9
 raven==6.10.0
 rcssmin==1.0.6
 requests==2.21.0
-rjsmin==1.0.12
+rjsmin==1.1.0
 six==1.12.0
 sqlparse==0.2.4
+text-unidecode==1.2
+typed-ast==1.3.1
 Unidecode==1.0.23
 urllib3==1.24.1
 webencodings==0.5.1
-WeRoBot==1.7.0
+WeRoBot==1.8.0
 Whoosh==2.7.4
 wrapt==1.11.1
 xmltodict==0.12.0

travis_test/travis_settings.py

@@ -32,8 +32,10 @@ TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
 ALLOWED_HOSTS = ['www.lylinux.net', '127.0.0.1', 'example.com']
 # Application definition
 
+
 INSTALLED_APPS = [
-    'django.contrib.admin',
+    # 'django.contrib.admin',
+    'django.contrib.admin.apps.SimpleAdminConfig',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -41,7 +43,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.sitemaps',
-    'pagedown',
+    'mdeditor',
     'haystack',
     'blog',
     'accounts',