Merge branch 'main' into release/4

Author: vsalvino

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

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

MANIFEST.in

@@ -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

azure-pipelines.yml

@@ -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/blocks/base_blocks.py

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

coderedcms/forms.py

@@ -713,6 +713,7 @@ class Meta:
         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 Meta:
         ("-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 Meta:
         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=_(