Merge branch 'main' into release/3

coderedcms/bin/coderedcms.py

@@ -67,9 +67,12 @@ class CreateProject(TemplateCommand):
         options["files"] = [
             "0002_initial_data.py",
             "base.py",
+            "dev.py",
             "manage.py",
+            "prod.py",
             "README.md",
             "requirements.txt",
+            "staging.py",
             "wsgi.py",
         ]
 

coderedcms/static/coderedcms/css/crx-admin.css

@@ -13,6 +13,7 @@ textarea.monospace,
 .monospace textarea {
   font-family: var(--w-font-mono);
   font-weight: normal;
+  font-weight: 1rem;
 }
 
 .input input[type='color']{

coderedcms/templates/coderedcms/formfields/datetime.html

@@ -1,4 +1,4 @@
-<input type="datetime-local" name="{{ widget.name }}" {% include "django/forms/widgets/attrs.html" %} {% if widget.value !=None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}>
+<input type="datetime-local" name="{{ widget.name }}" {% include "django/forms/widgets/attrs.html" %} {% if widget.value != None %}value="{{ widget.value|stringformat:'s' }}"{% endif %}>
 <noscript>
   <small class="form-text text-muted">Format mm/dd/yyyy 4:00 PM</small>
 </noscript>

coderedcms/wagtail_hooks.py

@@ -88,11 +88,12 @@ def crx_forms(user, editable_forms):
     and wagtail.contrib.forms.get_form_types()
     """
     from coderedcms.models import CoderedFormMixin
+    from wagtail.contrib.forms.models import FormMixin
 
     form_models = [
         model
         for model in get_page_models()
-        if issubclass(model, CoderedFormMixin)
+        if issubclass(model, (FormMixin, CoderedFormMixin))
     ]
     form_types = list(ContentType.objects.get_for_models(*form_models).values())
     editable_forms = UserPagePermissionsProxy(user).editable_pages()

docs/_static/custom.css

@@ -8,9 +8,3 @@ pre .sd {
   color: #BBBBDD;
   font-style: italic;
 }
-
-.sponsor {
-  font-size: 0.9em;
-  line-height: 1.2em;
-  text-decoration: none;
-}

docs/_templates/sponsor.html

@@ -1,13 +1,3 @@
-<a class="sponsor d-block border rounded p-1 mt-5" href="https://www.coderedcorp.com/">
-  <div class="row no-gutters">
-    <div class="col-3">
-      <img src="https://docs.coderedcorp.com/logo-square-red-128.png" class="w-100 rounded" alt=""/>
-    </div>
-    <div class="col-9">
-      <p class="p-2 m-0">
-        <strong>Get Pro Support</strong><br>
-        This project is commercially supported by CodeRed.
-      </p>
-    </div>
-  </div>
+<a href="https://www.codered.cloud/?utm_source=docs-wagtail-crx&utm_medium=banner">
+  <img src="https://docs.coderedcorp.com/crcloud-docs-ad.webp" alt="Wagtail Hosting by CodeRed" class="w-100">
 </a>

docs/releases/index.rst

@@ -27,6 +27,7 @@ Supported Versions:
 .. toctree::
     :maxdepth: 1
 
+    v3.0.1
     v3.0.0
     v2.1.4
     v2.1.3

docs/releases/v3.0.0.rst

@@ -17,7 +17,7 @@ New features
 
   * Custom User, Image, and Document models by default.
 
-  * ``ruff`` linter and formater pre-configured.
+  * ``ruff`` linter and formatter pre-configured.
 
   * ``pytest`` pre-configured.
 

docs/releases/v3.0.1.rst

@@ -0,0 +1,20 @@
+v3.0.1 release notes
+====================
+
+
+Bug fixes
+---------
+
+* Reduce size of monospace fonts in Wagtail Admin.
+
+* Show Wagtail Form submissions in addition to ``CoderedFormPage`` submissions in the Wagtail Admin.
+
+* Fix template bug with datetime fields in forms.
+
+* Fix project template boilerplate which had a few errors when starting new projects.
+
+
+Thank you!
+----------
+
+Thanks to everyone who contributed to `3.0.1 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/51?closed=1>`_.