Merge branch 'main' into release/4

MANIFEST.in

@@ -1,4 +1,5 @@
-include LICENSE README.md
+include LICENSE.txt README.md
 graft coderedcms
 global-exclude __pycache__
 global-exclude *.py[co]
+prune **/.*_cache

azure-pipelines.yml

@@ -27,29 +27,29 @@ stages:
       vmImage: 'ubuntu-latest'
     strategy:
       matrix:
-        py3.8:
-          PYTHON_VERSION: '3.8'
-          WAGTAIL_VERSION: '6.0.*'
-          TEMPLATE: 'basic'
         py3.9:
           PYTHON_VERSION: '3.9'
-          WAGTAIL_VERSION: '6.0.*'
+          WAGTAIL_VERSION: '6.3.*'
           TEMPLATE: 'basic'
         py3.10:
           PYTHON_VERSION: '3.10'
-          WAGTAIL_VERSION: '6.0.*'
+          WAGTAIL_VERSION: '6.3.*'
           TEMPLATE: 'basic'
         py3.11:
           PYTHON_VERSION: '3.11'
-          WAGTAIL_VERSION: '6.1.*'
+          WAGTAIL_VERSION: '6.3.*'
           TEMPLATE: 'basic'
-        py3.12_basic:
+        py3.12:
           PYTHON_VERSION: '3.12'
-          WAGTAIL_VERSION: '6.1.*'
+          WAGTAIL_VERSION: '6.3.*'
           TEMPLATE: 'basic'
-        py3.12_pro:
-          PYTHON_VERSION: '3.12'
-          WAGTAIL_VERSION: '6.1.*'
+        py3.13_basic:
+          PYTHON_VERSION: '3.13'
+          WAGTAIL_VERSION: '6.3.*'
+          TEMPLATE: 'basic'
+        py3.13_pro:
+          PYTHON_VERSION: '3.13'
+          WAGTAIL_VERSION: '6.3.*'
           TEMPLATE: 'pro'
 
     steps:
@@ -102,7 +102,7 @@ stages:
     - task: UsePythonVersion@0
       displayName: 'Use Python version'
       inputs:
-        versionSpec: '3.12'
+        versionSpec: '3.13'
         architecture: 'x64'
 
     - script: python -m pip install -r requirements-ci.txt
@@ -147,7 +147,7 @@ stages:
     - task: UsePythonVersion@0
       displayName: 'Use Python version'
       inputs:
-        versionSpec: '3.12'
+        versionSpec: '3.13'
         architecture: 'x64'
 
     - script: python -m pip install -r requirements-ci.txt

coderedcms/blocks/base_blocks.py

@@ -127,6 +127,11 @@ class ButtonMixin(blocks.StructBlock):
         required=False,
         label=_("Button Size"),
     )
+    button_title = blocks.CharBlock(
+        required=False,
+        max_length=255,
+        label=_("Title"),
+    )
 
 
 class CoderedAdvSettings(blocks.StructBlock):

coderedcms/forms.py

@@ -186,7 +186,7 @@ class CoderedFormField(AbstractFormField):
         max_length=16,
         choices=FORM_FIELD_CHOICES,
         blank=False,
-        default="Single line text",
+        default="singleline",
     )
 
 

coderedcms/models/page_models.py

@@ -713,6 +713,7 @@ class CoderedArticlePage(CoderedWebPage):
         abstract = True
 
     template = "coderedcms/pages/article_page.html"
+    miniview_template = "coderedcms/pages/article_page.mini.html"
     search_template = "coderedcms/pages/article_page.search.html"
 
     related_show_default = True
@@ -856,6 +857,7 @@ class CoderedArticleIndexPage(CoderedWebPage):
         ("-date_display", "Display publish date, newest first"),
     ) + CoderedWebPage.index_order_by_choices
 
+    # DEPRECATED: Remove these show_* options in 5.0
     show_images = models.BooleanField(
         default=True,
         verbose_name=_("Show images"),
@@ -890,6 +892,10 @@ class CoderedEventPage(CoderedWebPage, BaseEvent):
         verbose_name = _("CodeRed Event")
         abstract = True
 
+    template = "coderedcms/pages/event_page.html"
+    miniview_template = "coderedcms/pages/event_page.mini.html"
+    search_template = "coderedcms/pages/event_page.search.html"
+
     calendar_color = ColorField(
         blank=True,
         help_text=_(

coderedcms/project_template/pro/custom_media/migrations/0001_initial.py

@@ -1,271 +1,84 @@
-# Generated by Django 4.2.7 on 2023-11-03 22:24
+# Generated by Django 4.2.16 on 2024-11-01 18:01
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
 import wagtail.images.models
-import wagtail.models.collections
+import wagtail.models.media
 import wagtail.search.index
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [
-        ("taggit", "0005_auto_20220424_2025"),
-        ("wagtailcore", "0083_workflowcontenttype"),
+        ('taggit', '0006_rename_taggeditem_content_type_object_id_taggit_tagg_content_8fc721_idx'),
+        ('wagtailcore', '0094_alter_page_locale'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name="CustomImage",
+            name='CustomImage',
             fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "title",
-                    models.CharField(max_length=255, verbose_name="title"),
-                ),
-                (
-                    "file",
-                    wagtail.images.models.WagtailImageField(
-                        height_field="height",
-                        upload_to=wagtail.images.models.get_upload_to,
-                        verbose_name="file",
-                        width_field="width",
-                    ),
-                ),
-                (
-                    "width",
-                    models.IntegerField(editable=False, verbose_name="width"),
-                ),
-                (
-                    "height",
-                    models.IntegerField(editable=False, verbose_name="height"),
-                ),
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True,
-                        db_index=True,
-                        verbose_name="created at",
-                    ),
-                ),
-                (
-                    "focal_point_x",
-                    models.PositiveIntegerField(blank=True, null=True),
-                ),
-                (
-                    "focal_point_y",
-                    models.PositiveIntegerField(blank=True, null=True),
-                ),
-                (
-                    "focal_point_width",
-                    models.PositiveIntegerField(blank=True, null=True),
-                ),
-                (
-                    "focal_point_height",
-                    models.PositiveIntegerField(blank=True, null=True),
-                ),
-                (
-                    "file_size",
-                    models.PositiveIntegerField(editable=False, null=True),
-                ),
-                (
-                    "file_hash",
-                    models.CharField(
-                        blank=True, db_index=True, editable=False, max_length=40
-                    ),
-                ),
-                (
-                    "alt_text",
-                    models.CharField(
-                        blank=True,
-                        help_text="A description of this image used by search engines and screen readers.",
-                        max_length=255,
-                        verbose_name="Alt Text",
-                    ),
-                ),
-                (
-                    "credit",
-                    models.CharField(
-                        blank=True,
-                        help_text="Credit or attribute the source of the image. Properly attributing images taken from online sources can reduce your risk of copyright infringement.",
-                        max_length=255,
-                        verbose_name="Credit",
-                    ),
-                ),
-                (
-                    "collection",
-                    models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="+",
-                        to="wagtailcore.collection",
-                        verbose_name="collection",
-                    ),
-                ),
-                (
-                    "tags",
-                    taggit.managers.TaggableManager(
-                        blank=True,
-                        help_text=None,
-                        through="taggit.TaggedItem",
-                        to="taggit.Tag",
-                        verbose_name="tags",
-                    ),
-                ),
-                (
-                    "uploaded_by_user",
-                    models.ForeignKey(
-                        blank=True,
-                        editable=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="uploaded by user",
-                    ),
-                ),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255, verbose_name='title')),
+                ('file', wagtail.images.models.WagtailImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')),
+                ('description', models.CharField(blank=True, default='', max_length=255, verbose_name='description')),
+                ('width', models.IntegerField(editable=False, verbose_name='width')),
+                ('height', models.IntegerField(editable=False, verbose_name='height')),
+                ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')),
+                ('focal_point_x', models.PositiveIntegerField(blank=True, null=True)),
+                ('focal_point_y', models.PositiveIntegerField(blank=True, null=True)),
+                ('focal_point_width', models.PositiveIntegerField(blank=True, null=True)),
+                ('focal_point_height', models.PositiveIntegerField(blank=True, null=True)),
+                ('file_size', models.PositiveIntegerField(editable=False, null=True)),
+                ('file_hash', models.CharField(blank=True, db_index=True, editable=False, max_length=40)),
+                ('credit', models.CharField(blank=True, help_text='Credit or attribute the source of the image. Properly attributing images taken from online sources can reduce your risk of copyright infringement.', max_length=255, verbose_name='Credit')),
+                ('collection', models.ForeignKey(default=wagtail.models.media.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.collection', verbose_name='collection')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')),
+                ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')),
             ],
             options={
-                "abstract": False,
+                'abstract': False,
             },
-            bases=(
-                wagtail.images.models.ImageFileMixin,
-                wagtail.search.index.Indexed,
-                models.Model,
-            ),
+            bases=(wagtail.images.models.ImageFileMixin, wagtail.search.index.Indexed, models.Model),
         ),
         migrations.CreateModel(
-            name="CustomDocument",
+            name='CustomDocument',
             fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "title",
-                    models.CharField(max_length=255, verbose_name="title"),
-                ),
-                (
-                    "file",
-                    models.FileField(
-                        upload_to="documents", verbose_name="file"
-                    ),
-                ),
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True, verbose_name="created at"
-                    ),
-                ),
-                (
-                    "file_size",
-                    models.PositiveIntegerField(editable=False, null=True),
-                ),
-                (
-                    "file_hash",
-                    models.CharField(blank=True, editable=False, max_length=40),
-                ),
-                (
-                    "collection",
-                    models.ForeignKey(
-                        default=wagtail.models.collections.get_root_collection_id,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="+",
-                        to="wagtailcore.collection",
-                        verbose_name="collection",
-                    ),
-                ),
-                (
-                    "tags",
-                    taggit.managers.TaggableManager(
-                        blank=True,
-                        help_text=None,
-                        through="taggit.TaggedItem",
-                        to="taggit.Tag",
-                        verbose_name="tags",
-                    ),
-                ),
-                (
-                    "uploaded_by_user",
-                    models.ForeignKey(
-                        blank=True,
-                        editable=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="uploaded by user",
-                    ),
-                ),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255, verbose_name='title')),
+                ('file', models.FileField(upload_to='documents', verbose_name='file')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
+                ('file_size', models.PositiveBigIntegerField(editable=False, null=True)),
+                ('file_hash', models.CharField(blank=True, editable=False, max_length=40)),
+                ('collection', models.ForeignKey(default=wagtail.models.media.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.collection', verbose_name='collection')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')),
+                ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')),
             ],
             options={
-                "verbose_name": "document",
-                "verbose_name_plural": "documents",
-                "abstract": False,
+                'verbose_name': 'document',
+                'verbose_name_plural': 'documents',
+                'abstract': False,
             },
             bases=(wagtail.search.index.Indexed, models.Model),
         ),
         migrations.CreateModel(
-            name="CustomRendition",
+            name='CustomRendition',
             fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "filter_spec",
-                    models.CharField(db_index=True, max_length=255),
-                ),
-                (
-                    "file",
-                    wagtail.images.models.WagtailImageField(
-                        height_field="height",
-                        storage=wagtail.images.models.get_rendition_storage,
-                        upload_to=wagtail.images.models.get_rendition_upload_to,
-                        width_field="width",
-                    ),
-                ),
-                ("width", models.IntegerField(editable=False)),
-                ("height", models.IntegerField(editable=False)),
-                (
-                    "focal_point_key",
-                    models.CharField(
-                        blank=True, default="", editable=False, max_length=16
-                    ),
-                ),
-                (
-                    "image",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="renditions",
-                        to="custom_media.customimage",
-                    ),
-                ),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('filter_spec', models.CharField(db_index=True, max_length=255)),
+                ('file', wagtail.images.models.WagtailImageField(height_field='height', storage=wagtail.images.models.get_rendition_storage, upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width')),
+                ('width', models.IntegerField(editable=False)),
+                ('height', models.IntegerField(editable=False)),
+                ('focal_point_key', models.CharField(blank=True, default='', editable=False, max_length=16)),
+                ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='renditions', to='custom_media.customimage')),
             ],
             options={
-                "unique_together": {
-                    ("image", "filter_spec", "focal_point_key")
-                },
+                'unique_together': {('image', 'filter_spec', 'focal_point_key')},
             },
             bases=(wagtail.images.models.ImageFileMixin, models.Model),
         ),

coderedcms/project_template/pro/custom_media/models.py

@@ -23,18 +23,9 @@ class CustomDocument(AbstractDocument):
 
 class CustomImage(AbstractImage):
     """
-    A custom Wagtail Image model with fields for alt text and
-    credit/attribution.
+    A custom Wagtail Image model with fields for credit/attribution.
     """
 
-    alt_text = models.CharField(
-        max_length=255,
-        blank=True,
-        verbose_name="Alt Text",
-        help_text=(
-            "A description of this image used by search engines and screen readers."
-        ),
-    )
     credit = models.CharField(
         max_length=255,
         blank=True,
@@ -45,10 +36,7 @@ class CustomImage(AbstractImage):
             "reduce your risk of copyright infringement."
         ),
     )
-    admin_form_fields = Image.admin_form_fields + (
-        "alt_text",
-        "credit",
-    )
+    admin_form_fields = Image.admin_form_fields + ("credit",)
 
 
 class CustomRendition(AbstractRendition):

coderedcms/static/coderedcms/css/crx-front.css

@@ -3,16 +3,18 @@ Wagtail CRX (https://www.coderedcorp.com/cms/)
 Copyright 2018-2023 CodeRed LLC
 License: https://github.com/coderedcorp/coderedcms/blob/main/LICENSE
 */
-.crx-article .article-body {
-  max-width: 800px;
-}
-
 @media (min-width: 768px) {
   .crx-article .article-body {
     font-size: 1.2em;
   }
 }
 
+@media (min-width: 992px) {
+  .crx-article .article-body {
+    max-width: 800px;
+  }
+}
+
 .crx-article .article-author-img {
   max-height: 3em;
 }
@@ -29,7 +31,7 @@ License: https://github.com/coderedcorp/coderedcms/blob/main/LICENSE
 }
 
 .container-fluid .carousel {
-  margin: 0 -15px;
+  margin: 0 -12px;
 }
 
 .carousel .no-image {

coderedcms/static/coderedcms/scss/_crx-article.scss

@@ -2,10 +2,12 @@
 
 .crx-article {
   .article-body {
-    max-width: 800px;
     @media (min-width: 768px) {
       font-size: 1.2em;
     }
+    @media (min-width: 992px) {
+      max-width: 800px;
+    }
   }
   .article-author-img {
     max-height: 3em;

coderedcms/static/coderedcms/scss/_crx-bs-overrides.scss

@@ -15,7 +15,7 @@
 
 // Carousel
 .container-fluid .carousel {
-  margin: 0 -15px;
+  margin: 0 -12px;
 }
 
 .carousel .no-image {

coderedcms/templates/coderedcms/blocks/pagelist_block.html

@@ -1,11 +1,11 @@
 {% extends "coderedcms/blocks/base_block.html" %}
 {% load wagtailcore_tags %}
 {% block block_render %}
-<div class="row">
+<div class="row g-4">
   {% for page in pages %}
   <div class="col-sm-6 col-lg-4">
     {% with page=page.specific %}
-    {% include page.miniview_template %}
+    {% include page.miniview_template with miniview_css_class="h-100" %}
     {% endwith %}
   </div>
   {% endfor %}

coderedcms/templates/coderedcms/pages/article_index_page.html

@@ -7,21 +7,7 @@
   <div class="row">
     <div class="col-md-9">
       {% for article in index_paginated %}
-      {% if self.show_images %}
-      <a href="{% pageurl article %}" title="{{article.title}}" class="text-white-50">
-        {% if article.cover_image %}
-        {% image article.specific.cover_image fill-1600x900 format-webp preserve-svg as cover_image %}
-        <img src="{{cover_image.url}}" class="w-100" alt="{{article.title}}">
-        {% endif %}
-      </a>
-      {% endif %}
-      <h3><a href="{% pageurl article %}">{{article.title}}</a></h3>
-      {% if self.show_captions and article.specific.caption %}<p class="lead">{{article.specific.caption}}</p>{% endif %}
-      {% if self.show_meta %}<p>{{article.specific.seo_published_at}} &bull; {{article.specific.seo_author}}</p>{% endif %}
-      {% if self.show_preview_text %}<p>{{article.specific.body_preview}}</p>{% endif %}
-      {% if not forloop.last %}
-      <hr>
-      {% endif %}
+      {% include article.miniview_template with page=article h="h2" miniview_css_class="mb-5" %}
       {% endfor %}
     </div>
     {% if page.index_classifiers.exists %}

coderedcms/templates/coderedcms/pages/article_page.html

@@ -18,7 +18,7 @@
       <span class="article-author">{{self.seo_author}}</span>
       <span class="mx-2">&bull;</span>
       {% endif %}
-      <span class="article-date">{{ self.seo_published_at }}</span>
+      <span class="article-date">{{ self.seo_published_at|date }}</span>
     </p>
   </div>
   {% endblock %}

coderedcms/templates/coderedcms/pages/article_page.mini.html

@@ -0,0 +1,17 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+<div class="card mb-3 {{ miniview_css_class }}">
+  {% if page.cover_image %}
+  {% image page.cover_image fill-800x450 format-webp preserve-svg as card_img %}
+  <a href="{% pageurl page %}" title="{{ page.title }}">
+    <img class="card-img-top w-100" src="{{ card_img.url }}" alt="{{ card_img.title }}">
+  </a>
+  {% endif %}
+  <div class="card-body">
+    <{{ h|default:"h3" }} class="h5 card-title">
+      <a href="{% pageurl page %}">{{ page.title }}</a>
+    </{{ h|default:"h3" }}>
+    {% if page.caption %}<p class="lead">{{page.caption}}</p>{% endif %}
+    <p class="card-text"><i>{{ page.seo_published_at|date }}</i></p>
+    <p class="card-text">{{ page.body_preview }}</p>
+  </div>
+</div>

coderedcms/templates/coderedcms/pages/article_page.search.html

@@ -10,7 +10,7 @@
   {% endif %}
   <div class="col">
     <div class="d-flex align-items-center">
-      <h4><a href="{{page.url}}">{{page.title}}</a></h4>
+      <h2 class="h4"><a href="{{page.url}}">{{page.title}}</a></h2>
       {% if page.content_type.model_class in pagetypes %}<small class="ms-3 badge badge-secondary">{{page.search_name}}</small>{% endif %}
     </div>
     {% if page.caption %}
@@ -19,7 +19,7 @@
     <p class="text-muted">
       <span class="article-author">{{page.seo_author}}</span>
       <span class="mx-2">&bull;</span>
-      <span class="article-date">{{ page.seo_published_at }}</span>
+      <span class="article-date">{{ page.seo_published_at|date }}</span>
     </p>
     {% if page.search_description %}
     <p>{{page.search_description|safe}}</p>

coderedcms/templates/coderedcms/pages/base.html

@@ -147,10 +147,10 @@
     {% if page.related_show %}
     <div class="container">
       <h2 class="text-center my-5">{% trans "Related" %}</h2>
-      <div class="row">
+      <div class="row g-4">
         {% for rp in related_pages %}
         <div class="col-sm-6 col-lg-4">
-          {% include rp.miniview_template with page=rp %}
+          {% include rp.miniview_template with page=rp miniview_css_class="h-100" %}
         </div>
         {% endfor %}
       </div>

coderedcms/templates/coderedcms/pages/event_index_page.html

@@ -18,35 +18,20 @@
 {% endblock %}
 {% block index_content %}
 <div class="container">
-  {% for event in index_paginated %}
-  <div class="row">
-    {% block event_cover_image %}
-    {% if event.cover_image %}
-    <div class="col-md">
-      {% image event.cover_image fill-1600x900 format-webp preserve-svg as cover_image %}
-      <a href="{{ event.url }}" title="{{ event.title }}"><img src="{{ cover_image.url }}" class="w-100" alt="{{ event.title }}"></a>
-    </div>
-    {% endif %}
-    {% endblock %}
-    {% block event_body_preview %}
-    <div class="col-md">
-      <h3><a href="{{ event.url }}">{{ event.title }}</a></h3>
-      <p>{{ event.most_recent_occurrence.0 }}</p>
-      <p>{{ event.body_preview }}</p>
+  <div class="row g-4">
+    {% for event in index_paginated %}
+    <div class="col-sm-6 col-lg-4">
+      {% include event.miniview_template with page=event h="h2" miniview_css_class="h-100" %}
     </div>
-    {% endblock %}
+    {% endfor %}
   </div>
-  {% if not forloop.last %}
-  <hr>
-  {% endif %}
-  {% endfor %}
   {% include "coderedcms/includes/pagination.html" with items=index_paginated %}
 </div>
 {% endblock %}
 
 {% block coderedcms_scripts %}
 {{ block.super }}
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.9/index.global.min.js" integrity="sha256-alsi6DkexWIdeVDEct5s7cnqsWgOqsh2ihuIZbU6H3I=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/@fullcalendar/bootstrap5@6.1.9/index.global.min.js" integrity="sha256-gUOOsuvXIJriWP5FGvNLUHPduBqgnIyGuAxWiWtHxMo=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js" integrity="sha256-ZztCtsADLKbUFK/X6nOYnJr0eelmV2X3dhLDB/JK6fM=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@fullcalendar/bootstrap5@6.1.15/index.global.min.js" integrity="sha256-TslkUnYKZuqQj4Ueu1WQesikFvl2DADWslCx3EfBHZM=" crossorigin="anonymous"></script>
 <script src="{% static 'coderedcms/js/crx-events.js' %}?v={% coderedcms_version %}"></script>
 {% endblock %}

coderedcms/templates/coderedcms/pages/event_page.mini.html

@@ -0,0 +1,16 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+<div class="card mb-3 {{ miniview_css_class }}">
+  {% if page.cover_image %}
+  {% image page.cover_image fill-800x450 format-webp preserve-svg as card_img %}
+  <a href="{% pageurl page %}" title="{{ page.title }}">
+    <img class="card-img-top w-100" src="{{ card_img.url }}" alt="{{ card_img.title }}">
+  </a>
+  {% endif %}
+  <div class="card-body">
+    <{{ h|default:"h3" }} class="h5 card-title">
+      <a href="{% pageurl page %}">{{ page.title }}</a>
+    </{{ h|default:"h3" }}>
+    <p class="card-text">{{ page.most_recent_occurrence.0 }}</p>
+    <p class="card-text">{{ page.body_preview }}</p>
+  </div>
+</div>

coderedcms/templates/coderedcms/pages/event_page.search.html

@@ -0,0 +1,31 @@
+{% load wagtailimages_tags %}
+<div class="row">
+  {% if page.cover_image %}
+  {% image page.cover_image fill-800x450 format-webp preserve-svg as cover_image %}
+  <div class="col-4 col-md-3 col-lg-2">
+    <a href="{{ page.url }}" title="{{ page.title }}">
+      <img src="{{ cover_image.url }}" class="w-100" alt="{{ page.title }}">
+    </a>
+  </div>
+  {% endif %}
+  <div class="col">
+    <div class="d-flex align-items-center">
+      <h2 class="h4"><a href="{{ page.url }}">{{ page.title }}</a></h2>
+      {% if page.content_type.model_class in pagetypes %}
+      <small class="ms-3 badge badge-secondary">{{page.search_name}}</small>
+      {% endif %}
+    </div>
+    <p class="text-muted">
+      <span>{{ page.most_recent_occurrence.0 }}</span>
+      {% if page.address %}
+      <span class="mx-2">&bull;</span>
+      <span>{{ page.address }}</span>
+      {% endif %}
+    </p>
+    {% if page.search_description %}
+    <p>{{page.search_description|safe}}</p>
+    {% elif page.body_preview %}
+    <p>{{page.body_preview}}</p>
+    {% endif %}
+  </div>
+</div>

coderedcms/templates/coderedcms/pages/page.mini.html

@@ -1,12 +1,15 @@
 {% load wagtailcore_tags wagtailimages_tags %}
-<div class="card mb-3">
+<div class="card mb-3 {{ miniview_css_class }}">
   {% if page.cover_image %}
   {% image page.cover_image fill-800x450 format-webp preserve-svg as card_img %}
-  <img class="card-img-top w-100" src="{{card_img.url}}" alt="{{card_img.title}}">
+  <a href="{% pageurl page %}" title="{{ page.title }}">
+    <img class="card-img-top w-100" src="{{ card_img.url }}" alt="{{ card_img.title }}">
+  </a>
   {% endif %}
   <div class="card-body">
-    <h5 class="card-title">{{page.title}}</h5>
-    <p class="card-text">{{page.body_preview}}</p>
-    <a class="card-link" href="{% pageurl page %}" title="{{page.title}}">Read more</a>
+    <{{ h|default:"h3" }} class="h5 card-title">
+      <a href="{% pageurl page %}">{{ page.title }}</a>
+    </{{ h|default:"h3" }}>
+    <p class="card-text">{{ page.body_preview }}</p>
   </div>
 </div>

coderedcms/templates/coderedcms/pages/search_result.html

@@ -1,6 +1,6 @@
 {% load coderedcms_tags %}
 <div class="d-flex align-items-center">
-  <h4><a href="{{page.url}}">{{page.title}}</a></h4>
+  <h2 class="h4"><a href="{{page.url}}">{{page.title}}</a></h2>
   {% if page.content_type.model_class in pagetypes %}
   <small class="ms-3 badge badge-secondary">{{page|get_name_of_class}}</small>
   {% endif %}

docs/contributing/index.rst

@@ -53,10 +53,10 @@ Changes are then made as a pull request against the ``main`` branch.
 The ``main`` branch is the primary working branch, representing the development
 version of coderedcms.
 
-Releases are maintained in ``release/X.Y`` branches, where X is the Major
-version and Y is the Minor version. Maintenance patches are applied in ``main``
-(if applicable) and then merged or cherry-picked into the respective release
-branch.
+Releases are maintained in ``release/X`` branches, where X is the
+Major version. Maintenance patches are applied in ``main`` (if
+applicable) and then merged or cherry-picked into the respective
+release branch.
 
 
 A Note on Cross-Platform Support
@@ -277,7 +277,7 @@ To build a publicly consumable pip package, run:
 
 .. code-block:: console
 
-    $ python setup.py sdist bdist_wheel
+    $ python -m build
 
 
 Building Documentation
@@ -299,25 +299,6 @@ Or manually using sphinx:
 
 Output will be in ``docs/_build/html/`` directory.
 
-Updating Tutorial Documentation
--------------------------------
-
-.. From time to time, the documentation for the tutorial will need to be updated. You can work directly in
-.. the tutorial site by loading the fixture file for its database (read more at :ref:`load-data`).
-
-Once you have worked in the tutorial site and gotten new screenshots for the **Getting Started** documentation,
-you will also need to update the fixture file, which is located in ``tutorial > mysite > website > fixtures``.
-
-**These are the steps for updating the fixture:**
-
-1. From the command line, type ``python manage.py dumpdata --natural-foreign --natural-primary -e contenttypes -e auth.Permission --indent 4 > dumpdata.json``
-
-2. The dumped data file will show up in the ``website`` folder. Open it and copy/paste its contents into a new file called ``database.json``. This will fix the encoding issue you would run into otherwise. Save the new fixture file and delete the one that was dumped. Also delete the one that is currently in the ``fixtures`` folder.
-
-3. Move the ``database.json`` file into the ``fixtures`` folder.
-
-.. 4. For testing ``loaddata``, please review the steps at  :ref:`load-data`.
-
 
 Publishing a New Release
 ------------------------
@@ -335,7 +316,7 @@ Next build a pip package:
 
 .. code-block:: console
 
-    $ python setup.py sdist bdist_wheel
+    $ python -m build
 
 Then upload the pip package to the Python Package Index:
 
@@ -354,7 +335,3 @@ Copy the contents of ``docs/_build/html/`` to the CodeRed docs server under the
 .. code-block:: console
 
    $ cr upload --path ./docs/_build/html/ --remote /www/wagtail-crx/ docs
-
-Note that we do not release separate documentation versions for minor or
-maintenance releases. Update the existing major version docs with release notes
-and other changes.

docs/features/page_types/event_pages.rst

@@ -31,7 +31,7 @@ Content Tab
 Implementation
 --------------
 
-The event functionality is built-in to Wagtail CRX but it is not enabled by default.
+The event functionality is built-in to Wagtail CRX which includes the ability to show events on a calendar, generate ical entries, and automatically rotate events based on next upcoming occurrences.
 
 There are two abstract pages available when dealing with events.  The first ``CoderedEventPage`` holds
 the information regarding an event.  Dates, location, etc. all will fall under this page.  The
@@ -80,17 +80,16 @@ create the new pages in your project.
 
 Now when going to the wagtail admin, you can create an Event Landing Page, and child Event Pages.
 
-.. versionadded:: 0.22
+.. note::
+
+   Events require timezone support to be enabled in Django. Be sure to set ``USE_TZ = True`` and ``TIME_ZONE`` in your settings.
+
+   All dates and times inputted via the Wagtail Admin, and rendered on the calendar and throughout the site, will be converted to ``TIME_ZONE`` from your Django settings.
 
-    All dates and times inputted via the Wagtail Admin, and rendered on the
-    calendar and throughout the site, will be converted to ``TIME_ZONE`` from
-    your Django settings. It is highly recommended to set ``TIME_ZONE`` and
-    ``USE_TZ = True`` in your Django settings for the Event pages to function
-    correctly.
+   For example, if ``TIME_ZONE`` is set to ``America/New_York``, then entering an event for 2021-12-31 09:00 in the Wagtail admin will be saved as 9am New York time. It will also be displayed on the website as 9am New York time.
 
-    For example, if ``TIME_ZONE`` is set to ``America/New_York``, then entering
-    an event for 2021-12-31 09:00 in the Wagtail admin will be saved as 9am New
-    York time. It will also be displayed on the website as 9am New York time.
+   If you then changed ``TIME_ZONE`` to ``America/Chicago``, the event time will automatically be displayed as 8am Chicago time.
+
+.. versionadded:: 0.22
 
-    If you then changed ``TIME_ZONE`` to ``America/Chicago``, the event time
-    will automatically be displayed as 8am Chicago time.
+   Events were added in 0.22

docs/hosting/index.rst

@@ -0,0 +1,6 @@
+Deploying & Hosting Wagtail CRX
+===============================
+
+Wagtail CRX can be deployed and hosted just like any other Wagtail or Django website. Read the `Wagtail hosting guide <https://docs.wagtail.org/en/stable/deployment/index.html>`_.
+
+CodeRed also provides `CodeRed Cloud, optimized for deploying and hosting wagtail sites <https://www.codered.cloud/docs/wagtail/quickstart/>`_, which includes both free and professional grade plans.

docs/index.rst

@@ -76,4 +76,5 @@ Contents
    how_to/index
    reference/index
    contributing/index
+   Deploying & hosting <hosting/index>
    releases/index

docs/releases/index.rst

@@ -15,6 +15,8 @@ Supported Versions:
 +--------------+---------+----------+---------------------------+
 | CRX version  | Wagtail | Python   | Support Status            |
 +==============+=========+==========+===========================+
+| CRX 4.1      | 6.3     | 3.9-3.13 | Supported                 |
++--------------+---------+----------+---------------------------+
 | CRX 4.x      | 6.x     | 3.8-3.12 | Supported                 |
 +--------------+---------+----------+---------------------------+
 | CRX 3.x      | 5.x     | 3.8-3.12 | Supported                 |
@@ -29,6 +31,7 @@ Supported Versions:
 .. toctree::
     :maxdepth: 1
 
+    v4.1.0
     v4.0.1
     v4.0.0
     v3.0.4

docs/releases/v4.1.0.rst

@@ -0,0 +1,63 @@
+v4.1.0 release notes
+====================
+
+
+New features
+------------
+
+* Support Wagtail 6.3 exclusively.
+
+* Support Python 3.9 to 3.13.
+
+* Improve visual consistency of miniview and search templates, including uniform height when rendered in rows, i.e. Related Pages.
+
+* New miniview template for Article and Event pages, which show more contextual details about each page type.
+
+* All miniview templates now include variables ``h`` to set the heading level, and ``miniview_css_class`` to add CSS to the top level card.
+
+* New search template for Event pages which shows more contextual details.
+
+
+Bug fixes
+---------
+
+* Fix modal and download buttons by restoring ``button_title`` field on ``ButtonMixin`` (which was previously refactored in v4.0).
+
+* Fix accessibility warnings about inconsistent heading levels of Related Pages.
+
+* Fix visual overflow of Carousel block.
+
+* Fix default field type on Form page fields.
+
+
+Maintenance
+-----------
+
+* Update to the latest fullcalendar, icalendar, and django-bootstrap5 versions.
+
+
+Upgrade considerations
+----------------------
+
+After upgrading, be sure to generate and apply new migrations as so:
+
+.. code-block::
+
+   python manage.py makemigrations
+   python manage.py migrate
+
+Template changes
+~~~~~~~~~~~~~~~~
+
+The default Article Index and Event Index page templates now use the respective miniview template to list child pages. This results in a slight visual difference.
+
+Block changes
+~~~~~~~~~~~~~
+
+* ``button_title`` has been re-added to ``ButtonMixin``.
+
+
+Thank you!
+----------
+
+Thanks to everyone who contributed to `4.1 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/56?closed=1>`_.

pyproject.toml

@@ -1,25 +1,70 @@
-[tool.black]
-line-length = 80
-exclude = '''
-(
-  /(
-      \.eggs
-    | \.git
-    | \.github
-    | \.hg
-    | \.mypy_cache
-    | \.tox
-    | \.venv
-    | _build
-    | build
-    | ci
-    | dist
-    | migrations
-    | testproject
-    | venv
-  )/
-)
-'''
+# -- PACKAGE --------------------------
+
+[build-system]
+requires = ["setuptools>=65.5"]
+build-backend = "setuptools.build_meta"
+
+[project]
+authors = [
+    {name = "CodeRed LLC", email = "info@coderedcorp.com"}
+]
+classifiers = [
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3 :: Only",
+    "Framework :: Django",
+    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.1",
+    "Framework :: Wagtail",
+    "Framework :: Wagtail :: 6",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+    "Topic :: Internet :: WWW/HTTP :: Site Management",
+]
+dependencies = [
+    "beautifulsoup4>=4.8,<4.13",  # should be the same as wagtail
+    "django-eventtools==1.0.*",
+    "django-bootstrap5==24.3",
+    "Django>=4.2,<6.0",  # should be the same as wagtail
+    "geocoder==1.38.*",
+    "icalendar==6.0.*",
+    "wagtail>=6.3,<7.0",
+    "wagtail-cache>=2.4,<3",
+    "wagtail-seo>=2.5,<3",
+]
+description = "Wagtail + CodeRed Extensions enabling rapid development of marketing-focused websites."
+dynamic = ["version"]
+license = {file = "LICENSE.txt"}
+name = "coderedcms"
+readme = "README.md"
+requires-python = ">=3.9"
+
+[project.scripts]
+coderedcms = "coderedcms.bin.coderedcms:main"
+
+[project.urls]
+Source = "https://github.com/coderedcorp/coderedcms"
+Documentation = "https://docs.coderedcorp.com/wagtail-crx/"
+Changelog = "https://docs.coderedcorp.com/wagtail-crx/releases/"
+
+[tool.setuptools]
+packages = ["coderedcms"]
+
+[tool.setuptools.dynamic]
+version = {attr = "coderedcms.__version__"}
+
+
+# -- TOOLS ----------------------------
 
 [tool.codespell]
 skip = 'migrations,vendor,_build,*.css.map,*.jpg,*.png,*.pyc'

requirements-dev.txt

@@ -2,6 +2,7 @@
 -r requirements-ci.txt
 
 # Requirements, in addition to coderedcms, needed for development.
+build
 libsass
+setuptools>=65.5
 twine
-wheel

setup.py

@@ -1,66 +0,0 @@
-import os
-
-from setuptools import setup
-
-from coderedcms import __version__
-
-
-with open(
-    os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf8"
-) as readme:
-    README = readme.read()
-
-# allow setup.py to be run from any path
-os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
-
-setup(
-    name="coderedcms",
-    version=__version__,
-    packages=["coderedcms"],
-    include_package_data=True,
-    license="BSD License",
-    description="Wagtail-based CMS by CodeRed for building marketing websites.",
-    long_description=README,
-    long_description_content_type="text/markdown",
-    url="https://github.com/coderedcorp/coderedcms",
-    author="CodeRed LLC",
-    author_email="info@coderedcorp.com",
-    classifiers=[
-        "Environment :: Web Environment",
-        "Framework :: Django",
-        "Intended Audience :: Developers",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3 :: Only",
-        "Framework :: Django",
-        "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.0",
-        "Framework :: Wagtail",
-        "Framework :: Wagtail :: 6",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: Site Management",
-    ],
-    python_requires=">=3.8",
-    install_requires=[
-        "beautifulsoup4>=4.8,<4.13",  # should be the same as wagtail
-        "django-eventtools==1.0.*",
-        "django-bootstrap5==24.2",
-        "Django>=4.2,<6.0",  # should be the same as wagtail
-        "geocoder==1.38.*",
-        "icalendar==5.0.*",
-        "wagtail>=6.0,<7.0",
-        "wagtail-cache>=2.4,<3",
-        "wagtail-seo>=2.5,<3",
-    ],
-    entry_points={
-        "console_scripts": ["coderedcms=coderedcms.bin.coderedcms:main"]
-    },
-    zip_safe=False,
-)