Upgrade to Wagtail 2.7 (#268)

Fixes issue #267

azure-pipelines.yml

@@ -37,6 +37,8 @@ stages:
           PYTHON_VERSION: '3.6'
         py3.7:
           PYTHON_VERSION: '3.7'
+        py3.8:
+          PYTHON_VERSION: '3.8'
 
     steps:
     - task: UsePythonVersion@0
@@ -83,7 +85,7 @@ stages:
     - task: UsePythonVersion@0
       displayName: 'Use Python version'
       inputs:
-        versionSpec: '3.7'
+        versionSpec: '3.8'
         architecture: 'x64'
 
     - script: python -m pip install -e ./[ci]
@@ -123,7 +125,7 @@ stages:
     - task: UsePythonVersion@0
       displayName: 'Use Python version'
       inputs:
-        versionSpec: '3.7'
+        versionSpec: '3.8'
         architecture: 'x64'
 
     - script: python -m pip install -e ./[ci]

coderedcms/__init__.py

@@ -1,4 +1,4 @@
-release = ['0', '16', '3']
+release = ["0", "17", "0"]
 
 __version__ = "{0}.{1}.{2}".format(release[0], release[1], release[2])
 __shortversion__ = "{0}.{1}".format(release[0], release[1])

coderedcms/static/coderedcms/css/codered-admin.css

@@ -97,7 +97,7 @@ input[type='checkbox']::before, input[type='radio']::before {
 /* Display labels and fields horizontally, except .label-above */
 
 @media screen and (min-width:50em) {
-    body:not(.login) li.sequence-member .fields > li,
+    body:not(.login) .c-sf-block .fields > li,
     body:not(.login) ul.fields > li:not(.label-above) .field {
         display: flex;
         flex-direction: row;
@@ -130,7 +130,7 @@ input[type='checkbox']::before, input[type='radio']::before {
         flex-grow: 1;
         margin: 0 auto;
     }
-    li.sequence-member .struct-block .sequence-container {
+    .c-sf-block .c-sf-container__block-container {
         display:block;
         flex-grow: 1;
         margin: 0 auto;

coderedcms/static/coderedcms/css/codered-editor.css

@@ -22,27 +22,27 @@ License: https://github.com/coderedcorp/coderedcms/blob/master/LICENSE
 }
 
 
-.sequence-member input[type='text'],
-.sequence-member input[type='email'],
-.sequence-member input[type='url'],
-.sequence-member input[type='number'],
-.sequence-member input[type='date'],
-.sequence-member input[type='time'],
-.sequence-member input[type='datetime'],
-.sequence-member input[type='datetime-local'],
-.sequence-member textarea,
-.sequence-member select,
-.sequence-member .richtext,
-.sequence-member .tagit {
+.c-sf-block input[type='text'],
+.c-sf-block input[type='email'],
+.c-sf-block input[type='url'],
+.c-sf-block input[type='number'],
+.c-sf-block input[type='date'],
+.c-sf-block input[type='time'],
+.c-sf-block input[type='datetime'],
+.c-sf-block input[type='datetime-local'],
+.c-sf-block textarea,
+.c-sf-block select,
+.c-sf-block .richtext,
+.c-sf-block .tagit {
     background-color:white;
     border:1.5px solid #ddd;
 }
 
-.sequence-member input:focus,
-.sequence-member textarea:focus,
-.sequence-member select:focus,
-.sequence-member .richtext:focus,
-.sequence-member .tagit:focus {
+.c-sf-block input:focus,
+.c-sf-block textarea:focus,
+.c-sf-block select:focus,
+.c-sf-block .richtext:focus,
+.c-sf-block .tagit:focus {
     border-color:#00b0b1;
     background-color:#f2fcfc;
 }
@@ -72,30 +72,13 @@ License: https://github.com/coderedcorp/coderedcms/blob/master/LICENSE
     color:rgba(0,0,0,0.2)
 }
 
-li.sequence-member {
+.c-sf-block {
     border:none;
 }
 
-li.sequence-member li.sequence-member {
-    background-color:rgba(0,0,0,0.05);
-    border:none;
-    margin:0 0 20px 0;
-
-}
-li.sequence-member:hover {
-    background-color:rgba(0,0,0,0.05);
-    border:none;
-}
-
-li.sequence-member .sequence-member-inner,
-li.sequence-member .struct-block .sequence-container .sequence-member-inner {
-    padding:1em;
-}
 
-@media screen and (max-width:49.99em) {
-    li.sequence-member .struct-block .sequence-container {
-        width:100%;
-    }
+.c-sf-container {
+    width:100%;
 }
 
 .field.char_field.widget-draftail_rich_text_area .field-content,
@@ -142,11 +125,6 @@ li.sequence-member .struct-block .sequence-container .sequence-member-inner {
     padding-top:0;
 }
 
-li.sequence-member .struct-block .fields {
-    width:100%;
-    max-width:100%;
-}
-
 .stream-menu.stream-menu-closed .toggle {
     color:#888;
 }
@@ -200,19 +178,6 @@ li.sequence-member .struct-block .fields {
 .Draftail-Toolbar .Draftail-ToolbarGroup + .Draftail-ToolbarGroup {
     margin-left: 1em;
 }
-li.sequence-member li > .field .Draftail-Editor,
-li.sequence-member li.sequence-member .Draftail-Editor {
-    background-color: #fff !important;
-    border-radius:5px;
-    border:1.5px solid #ddd !important;
-    padding: 0.5em 1em;
-}
-li.sequence-member li.sequence-member .Draftail-Editor {
-    margin:-1em;
-}
-li.sequence-member li > .field .Draftail-Editor {
-    margin: 0;
-}
 
 .Draftail-Editor .DraftEditor-root {
     color:#000 !important;

docs/releases/v0.17.0.rst

@@ -2,12 +2,23 @@ CodeRed CMS 0.17.0 release notes
 ================================
 
 
+New features
+------------
+
+* Upgraded Wagtail to version 2.7
+* New UI of streamfield, and other changes from
+  `Wagtail 2.7 <https://docs.wagtail.io/en/stable/releases/2.7.html>`_.
+* Now supports Django 2.0, 2.1, 2.2 and Python 3.5, 3.6, 3.7, 3.8
+
+
 Bug fixes
 ---------
 
 * Fix bug where form field without a selected type would cause a 500 error.
 
+
 Upgrade considerations
 ----------------------
 
-* You will need to run ``python manage.py makemigrations website`` and ``python manage.py migrate`` after upgrading.
+* You will need to run ``python manage.py makemigrations website`` and
+  ``python manage.py migrate`` after upgrading.

setup.py

@@ -30,6 +30,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3 :: Only',
         'Framework :: Django',
         'Framework :: Django :: 2.0',
@@ -42,13 +43,13 @@ setup(
         'Topic :: Internet :: WWW/HTTP :: Site Management',
     ],
     install_requires=[
-        'beautifulsoup4>=4.5.1,<4.6.1',
+        'beautifulsoup4>=4.5.1,<4.6.1',  # should be the same as wagtail
         'django-eventtools==0.9.*',
         'django-bootstrap4',
-        'Django>=2.0,<2.3',
+        'Django>=2.0,<2.3',              # should be the same as wagtail
         'geocoder>=1.38.1,<2.0',
         'icalendar==4.0.*',
-        'wagtail==2.6.*',
+        'wagtail==2.7.*',
         'wagtailfontawesome>=1.1.4,<2.0',
         'wagtail-cache==0.5.*',
         'wagtail-import-export>=0.2,<0.3'