Wagtail 2.6 upgrade (#226)

.gitignore

@@ -15,6 +15,7 @@ dist/
 __pycache__
 codered_cms.egg-info/
 coderedcms.egg-info/
+pip-wheel-metadata/
 
 # Editors
 .vscode/

coderedcms/models/page_models.py

@@ -495,7 +495,7 @@ class CoderedPage(WagtailCacheMixin, Page, metaclass=CoderedPageMeta):
                 classname='integrations'
             ))
 
-        return TabbedInterface(panels).bind_to_model(cls)
+        return TabbedInterface(panels).bind_to(model=cls)
 
     def get_struct_org_name(self):
         """

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

@@ -245,6 +245,9 @@ input[type='checkbox']::before, input[type='radio']::before {
         margin-top:0.9em;
         font-size: 0.9em;
     }
+    .nav-main .footer-submenu {
+        overflow: hidden;
+    }
     .footer .avatar {
         width: 40px;
         height: 40px;
@@ -286,4 +289,4 @@ input[type='checkbox']::before, input[type='radio']::before {
     width:85px;
     height:auto;
     padding-left:2px;
-}
+}

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

@@ -121,7 +121,8 @@ li.sequence-member .struct-block .sequence-container .sequence-member-inner {
     box-sizing: border-box;
 }
 
-.object > h2 {
+.object > h2,
+.object > .title-wrapper label {
     font-weight: 600;
 }
 
@@ -268,4 +269,4 @@ li.sequence-member li > .field .Draftail-Editor {
     font-size: 0.6em;
     padding: 0.3em 0.6em;
     text-transform: uppercase;
-}
+}

coderedcms/templates/wagtailadmin/base.forked.html

@@ -1,49 +0,0 @@
-{# This is a direct fork of wagtailadmin/base.html with the title of the logo anchor changed #}
-
-{% extends "wagtailadmin/admin_base.html" %}
-{% load wagtailadmin_tags wagtailcore_tags static i18n %}
-
-{% block furniture %}
-    <div class="nav-wrapper">
-        <div class="inner">
-            <a href="{% url 'wagtailadmin_home' %}" class="logo" title="Admin Dashboard">
-                {% block branding_logo %}
-                    {# Mobile-only logo: #}
-                    <div class="wagtail-logo-container__mobile u-hidden@sm">
-                        <img class="wagtail-logo wagtail-logo__full" src="{% static 'wagtailadmin/images/wagtail-logo.svg' %}" alt="Wagtail" width="80" />
-                    </div>
-
-                    {# Desktop logo (animated): #}
-                    {% include "wagtailadmin/shared/animated_logo.html" %}
-                {% endblock %}
-                <span class="u-hidden@sm">{% trans "Dashboard" %}</span>
-            </a>
-
-            {% menu_search %}
-            {% main_nav %}
-
-        </div>
-        <div class="explorer__wrapper" data-explorer-menu></div>
-    </div>
-
-    {% include "coderedcms/includes/codered_banner.html" %}
-
-    <div class="content-wrapper">
-        <div class="content">
-            {# Always show messages div so it can be appended to by JS #}
-            <div class="messages">
-                {% if messages %}
-                    <ul>
-                        {% for message in messages %}
-                            <li class="{% message_tags message %}">{{ message|safe }}</li>
-                        {% endfor %}
-                    </ul>
-                {% endif %}
-            </div>
-
-            <div id="nav-toggle" class="nav-toggle icon text-replace">{% trans "Menu" %}</div>
-
-            {% block content %}{% endblock %}
-        </div>
-    </div>
-{% endblock %}

coderedcms/templates/wagtailadmin/base.html

@@ -1,11 +1,11 @@
-{% extends "wagtailadmin/base.forked.html" %}
+{% extends "wagtailadmin/base.html" %}
 {% load wagtailimages_tags wagtailsettings_tags %}
 
 
 {% block branding_logo %}
     {% if settings.coderedcms.LayoutSettings.logo %}
         {% image settings.coderedcms.LayoutSettings.logo max-150x100 as logo_image %}
-        <img src="{{ logo_image.url }}" alt="Admin Dashboard"/>
+        <img src="{{ logo_image.url }}" alt="Dashboard"/>
     {% else %}
         {{block.super}}
     {% endif %}

coderedcms/templates/wagtailadmin/shared/main_nav.html

@@ -6,7 +6,7 @@
         <li class="footer" id="footer">
             <div class="account" id="account-settings" title="{% trans 'Edit your account' %}">
                 <span class="avatar square avatar-on-dark">
-                    <img src="{% avatar_url request.user size=50 %}" />
+                    <img src="{% avatar_url request.user size=50 %}" alt="" />
                 </span>
                 <em class="icon icon-arrow-up-after">{{ request.user.first_name|default:request.user.get_username }}</em>
             </div>
@@ -21,6 +21,7 @@
                 powered by <img src="{% static 'coderedcms/img/codered.png' %}" alt="CodeRed" />
               </a>
             </div>
+
         </li>
     </ul>
 </nav>

coderedcms/wagtail_flexible_forms/edit_handlers.py

@@ -8,8 +8,8 @@ from wagtail.admin.edit_handlers import EditHandler
 class FormSubmissionsPanel(EditHandler):
     template = "wagtailforms/edit_handlers/form_responses_panel.html"
 
-    def bind_to_model(self, model):
-        new = super().bind_to_model(model)
+    def bind_to(self, model=None, instance=None, request=None, form=None):
+        new = super().bind_to(model=model)
         if self.heading is None:
             new.heading = _('{} submissions').format(model.get_verbose_name())
         return new

docs/releases/v0.16.0.rst

@@ -8,6 +8,8 @@ New features
 * NEW spam protection on forms (ON by default). We have been piloting this out
   for several months and have seen a 100% success rate so far. See :doc:`/features/page_types/form_pages`.
 * NEW support for Sass via a new starter template. See :doc:`/getting_started/install`.
+* Upgraded Wagtail to version 2.6. Now supports Django versions 2.0, 2.1, and 2.2;
+  Python versions 3.5, 3.6, and 3.7.
 
 
 Bug fixes
@@ -33,3 +35,4 @@ Upgrade considerations
   This will improve local development and use behind firewalls/offline environments.
   To continue using a CDN, override ``{% block frontend_assets %}`` , ``{% block required_scripts %}`` ,
   and ``{% block frontend_scripts %}`` in your ``base.html`` file.
+* Python 3.4 support has been dropped by Wagtail.

setup.py

@@ -27,7 +27,6 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
@@ -46,13 +45,13 @@ setup(
         'beautifulsoup4>=4.5.1,<4.6.1',
         'django-eventtools==0.9.*',
         'django-bootstrap4',
-        'django>=2.0,<2.3',
+        'Django>=2.0,<2.3',
         'geocoder>=1.38.1,<2.0',
         'icalendar==4.0.*',
-        'wagtail==2.5.*',
+        'wagtail==2.6.*',
         'wagtailfontawesome>=1.1.4,<2.0',
         'wagtail-cache==0.5.*',
-        'wagtail-import-export>=0.1,<0.2'
+        'wagtail-import-export>=0.2,<0.3'
     ],
     extras_require={
         "ci": [