wagtail-cjkcms 23.9.2__tar.gz → 23.10.2__tar.gz

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/CHANGELOG.md

@@ -14,6 +14,20 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [23.10.2] - 2023-10-07
+### Fixed
+ - Search bar layout - vertical alignment
+ - Full search form - fixed broken template
+
+ ### Added
+ - Breadcrumbs template snippet - needs to be activated in Settings->Layout
+ - New section in the docs
+ 
+
+## [23.10.1] - 2023-10-01
+### Added
+ - Added EventCalendar content block. Use snippets to create EventCalendars, and to display them on pages.
+
 
 ## [23.9.2] - 2023-09-07
 ### Added

{wagtail-cjkcms-23.9.2/wagtail_cjkcms.egg-info → wagtail-cjkcms-23.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.9.2
+Version: 23.10.2
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause
@@ -32,7 +32,8 @@ License: BSD-3-Clause
         ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
         (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
         SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Project-URL: Homepage, https://github.com/cjkpl/wagtail-cjkcms
+Project-URL: Homepage, https://cjkcms.com
+Project-URL: Repository, https://github.com/cjkpl/wagtail-cjkcms/issues
 Keywords: wagtail,django,cms
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (23, 9, 2, "")
+VERSION = (23, 10, 2, "")
 
 __version_info__ = VERSION
 __version__ = ".".join(map(str, VERSION[:3])) + (f"-{VERSION[3]}" if VERSION[3] else "")

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/blocks/__init__.py

@@ -32,6 +32,7 @@ from .content_blocks import (  # noqa
     PriceListBlock,
     ReusableContentBlock,
 )
+from .content.events import PublicEventBlock, EventCalendarBlock
 from .layout_blocks import CardGridBlock, GridBlock, HeroBlock
 from cjkcms.settings import cms_settings
 
@@ -73,6 +74,7 @@ CONTENT_STREAMBLOCKS = HTML_STREAMBLOCKS + [
     ("modal", ModalBlock(HTML_STREAMBLOCKS)),
     ("pricelist", PriceListBlock()),
     ("reusable_content", ReusableContentBlock()),
+    ("event_calendar", EventCalendarBlock()),
 ]
 
 NAVIGATION_STREAMBLOCKS = [
@@ -81,6 +83,10 @@ NAVIGATION_STREAMBLOCKS = [
     ("document_link", NavDocumentLinkWithSubLinkBlock()),
 ]
 
+PUBLIC_EVENT_STREAMBLOCKS = [
+    ("event", PublicEventBlock()),
+]
+
 BASIC_LAYOUT_STREAMBLOCKS = [
     ("row", GridBlock(HTML_STREAMBLOCKS)),
     (

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/blocks/content/events.py

@@ -1,6 +1,7 @@
 from cjkcms.blocks.base_blocks import BaseBlock
 from wagtail import blocks
 from django.utils.translation import gettext_lazy as _
+from wagtail.snippets.blocks import SnippetChooserBlock
 
 
 class PublicEventBlock(BaseBlock):
@@ -57,4 +58,19 @@ class PublicEventBlock(BaseBlock):
         template = "cjkcms/blocks/public_event_block.html"
         icon = "view"
         label = "Public Event"
+        ordering = ["start_date"]
         label_format = _("{title} (Event)")
+
+
+class EventCalendarBlock(BaseBlock):
+    """
+    Allows selecting an event calendar snippet
+    """
+
+    event_calendar = SnippetChooserBlock("cjkcms.EventCalendar")
+
+    class Meta:
+        template = "cjkcms/blocks/event_calendar_block.html"
+        icon = "calendar"
+        label = _("Event calendar")
+        label_format = _("Event calendar")

wagtail-cjkcms-23.10.2/cjkcms/migrations/0015_eventcalendar.py

@@ -0,0 +1,49 @@
+# Generated by Django 4.2.5 on 2023-09-30 21:11
+
+import cjkcms.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0014_navbar_alignment"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EventCalendar",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255, verbose_name="Name")),
+                (
+                    "custom_css_class",
+                    models.CharField(
+                        blank=True, max_length=255, verbose_name="Custom CSS Class"
+                    ),
+                ),
+                (
+                    "custom_id",
+                    models.CharField(
+                        blank=True, max_length=255, verbose_name="Custom ID"
+                    ),
+                ),
+                (
+                    "events",
+                    cjkcms.fields.CjkcmsStreamField(
+                        use_json_field=True, verbose_name="Events"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Event calendar",
+            },
+        ),
+    ]

wagtail-cjkcms-23.10.2/cjkcms/migrations/0016_layoutsettings_breadcrumb_icon_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.6 on 2023-10-07 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0015_eventcalendar"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="breadcrumb_icon",
+            field=models.CharField(
+                blank=True,
+                default="slash",
+                help_text="Bootstrap icon name. See docs for built-in options.",
+                max_length=32,
+                verbose_name="Breadcrumb icon",
+            ),
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="breadcrumbs",
+            field=models.BooleanField(
+                default=False,
+                help_text="Show breadcrumbs in page header",
+                verbose_name="Breadcrumbs",
+            ),
+        ),
+    ]

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/models/admin_sidebar.py

@@ -1,4 +1,4 @@
-from .snippet_models import Navbar
+from .snippet_models import Navbar, EventCalendar
 from wagtail.snippets.views.snippets import SnippetViewSet
 
 
@@ -15,3 +15,14 @@ class NavbarSnippet(SnippetViewSet):
     search_fields = [
         "name",
     ]
+
+
+class EventCalendarSnippet(SnippetViewSet):
+    model = EventCalendar
+    menu_label = "Public Events"
+    menu_icon = "calendar"  # change as required
+    # add_to_admin_menu = True
+    list_display = ("name",)
+    search_fields = [
+        "name",
+    ]

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/models/snippet_models.py

@@ -18,6 +18,7 @@ from cjkcms.blocks import (
     HTML_STREAMBLOCKS,
     LAYOUT_STREAMBLOCKS,
     NAVIGATION_STREAMBLOCKS,
+    PUBLIC_EVENT_STREAMBLOCKS,
 )
 from cjkcms.settings import cms_settings
 from django.conf import settings
@@ -301,7 +302,6 @@ class FilmPanel(Orderable, models.Model):
     ]
 
 
-# @register_snippet
 class Navbar(models.Model):
     """
     Snippet for site navigation bars (header, main menu, etc.)
@@ -589,3 +589,49 @@ class CjkcmsEmail(ClusterableModel):
 
     def __str__(self):
         return self.subject
+
+
+class EventCalendar(models.Model):
+    """
+    Snippet for site event calendars
+    """
+
+    class Meta:
+        verbose_name = _("Event calendar")
+
+    name = models.CharField(
+        max_length=255,
+        verbose_name=_("Name"),
+    )
+    custom_css_class = models.CharField(
+        max_length=255,
+        blank=True,
+        verbose_name=_("Custom CSS Class"),
+    )
+    custom_id = models.CharField(
+        max_length=255,
+        blank=True,
+        verbose_name=_("Custom ID"),
+    )
+
+    events = CjkcmsStreamField(
+        PUBLIC_EVENT_STREAMBLOCKS,
+        verbose_name=_("Events"),
+        use_json_field=True,
+    )
+
+    panels = [
+        FieldPanel("name"),
+        MultiFieldPanel(
+            [
+                FieldPanel("custom_css_class"),
+                FieldPanel("custom_id"),
+            ],
+            heading=_("Attributes"),
+            classname="collapsed",
+        ),
+        FieldPanel("events"),
+    ]
+
+    def __str__(self):
+        return self.name

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/models/wagtailsettings_models.py

@@ -197,6 +197,19 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
         help_text=_("Choose lang choice selector"),
     )
 
+    breadcrumbs = models.BooleanField(
+        default=False,
+        verbose_name=_("Breadcrumbs"),
+        help_text=_("Show breadcrumbs in page header"),
+    )
+    breadcrumb_icon = models.CharField(
+        blank=True,
+        max_length=32,
+        default="slash",
+        verbose_name=_("Breadcrumb icon"),
+        help_text=_("Bootstrap icon name. See docs for built-in options."),
+    )
+
     frontend_theme = models.CharField(
         blank=True,
         max_length=50,
@@ -289,6 +302,13 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
             ],
             heading=_("Site Navbar Layout"),
         ),
+        MultiFieldPanel(
+            [
+                FieldPanel("breadcrumbs"),
+                FieldPanel("breadcrumb_icon"),
+            ],
+            heading=_("Site Header / Breadcrumbs"),
+        ),
         InlinePanel(
             "site_footer",
             help_text=_("Choose one or more footers"),
@@ -354,7 +374,7 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
 class NavbarOrderable(Orderable, models.Model):
     navbar_chooser = ParentalKey(
         LayoutSettings, related_name="site_navbar", verbose_name=_("Site Navbars")
-    )
+    )  # type: ignore
     navbar = models.ForeignKey(
         Navbar,
         blank=True,
@@ -368,7 +388,7 @@ class NavbarOrderable(Orderable, models.Model):
 class FooterOrderable(Orderable, models.Model):
     footer_chooser = ParentalKey(
         LayoutSettings, related_name="site_footer", verbose_name=_("Site Footers")
-    )
+    )  # type: ignore
     footer = models.ForeignKey(
         Footer,
         blank=True,

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/static/cjkcms/css/cjkcms-front.css

@@ -292,4 +292,10 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
 .modal {
   max-width: none;
   margin: 1.75rem auto;
+}
+
+#id_s {
+  margin-bottom: 0;
+  margin-top: 0;
+  border: gray 1px solid;
 }

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/calendar-day.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 448 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M128 0c17.7 0 32 14.3 32 32V64H288V32c0-17.7 14.3-32 32-32s32 14.3 32 32V64h48c26.5 0 48 21.5 48 48v48H0V112C0 85.5 21.5 64 48 64H96V32c0-17.7 14.3-32 32-32zM0 192H448V464c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V192zm80 64c-8.8 0-16 7.2-16 16v96c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16V272c0-8.8-7.2-16-16-16H80z"/></svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/caret-right-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-right-fill" viewBox="0 0 16 16">
+  <path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/caret-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-right" viewBox="0 0 16 16">
+  <path d="M6 12.796V3.204L11.481 8 6 12.796zm.659.753 5.48-4.796a1 1 0 0 0 0-1.506L6.66 2.451C6.011 1.885 5 2.345 5 3.204v9.592a1 1 0 0 0 1.659.753z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/chevron-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/slash.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-slash-lg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/world.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-globe" viewBox="0 0 16 16">
+  <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4a9.267 9.267 0 0 1 .64-1.539 6.7 6.7 0 0 1 .597-.933A7.025 7.025 0 0 0 2.255 4H4.09zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a6.958 6.958 0 0 0-.656 2.5h2.49zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5H4.847zM8.5 5v2.5h2.99a12.495 12.495 0 0 0-.337-2.5H8.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5H4.51zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12c.138.386.295.744.468 1.068.552 1.035 1.218 1.65 1.887 1.855V12H5.145zm.182 2.472a6.696 6.696 0 0 1-.597-.933A9.268 9.268 0 0 1 4.09 12H2.255a7.024 7.024 0 0 0 3.072 2.472zM3.82 11a13.652 13.652 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5H3.82zm6.853 3.472A7.024 7.024 0 0 0 13.745 12H11.91a9.27 9.27 0 0 1-.64 1.539 6.688 6.688 0 0 1-.597.933zM8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855.173-.324.33-.682.468-1.068H8.5zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 0 1-.312 2.5zm2.802-3.5a6.959 6.959 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5h2.49zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 0 0-3.072-2.472c.218.284.418.598.597.933zM10.855 4a7.966 7.966 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4h2.355z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/blocks/event_calendar_block.html

@@ -0,0 +1,6 @@
+{% load wagtailcore_tags %}
+
+<div {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %} class="block-html {{ self.settings.custom_css_class }}">
+  {% if self.event_calendar.name %}<h4>{{ self.event_calendar.name }}</h4>{% endif %}
+  {% include_block self.event_calendar.events %}
+</div>

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/blocks/public_event_block.html

@@ -0,0 +1,26 @@
+{% load static cjkcms_tags %}
+{% block block_render %}
+    {% if not self.hide_after_end_date or self.start_date|is_in_future %}
+    <div class="border {{self.settings.custom_css_class}} mb-2 p-1 rounded position-relative hover-shadow"
+    {% if self.settings.custom_id %} id="{{self.settings.custom_id}}"{% endif %}>
+        <p class="mb-0">{{self.title}}</p>
+        <footer class="mt-1 small">
+            <div class="align-items-center d-flex">
+            <object data="{% static 'cjkcms/images/icons/calendar-day.svg' %}" class="me-1 opacity-50"></object> 
+            <strong>
+            {{self.start_date}} 
+            {% if self.end_date %}
+            - {{ self.end_date }}
+            {% endif %}
+            </strong>
+            </div>
+            {% if self.url %}
+            <div class="align-items-center d-flex">
+            <object data="{% static 'cjkcms/images/icons/world.svg' %}" class="me-1 opacity-50"></object>
+            <a href="{{ self.url }}" target="_blank" class="stretched-link link-body-emphasis">{{ self.url }}</a>
+            </div>
+            {% endif %}
+        </footer>
+    </div>
+    {% endif %}
+{% endblock %}

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/base.html

@@ -91,6 +91,11 @@
                         </div>
                     {% endif %}
                 {% endblock %}
+
+                {% if settings.cjkcms.LayoutSettings.breadcrumbs %}
+                {% block breadcrumbs %}{% endblock %}
+                {% endif %}
+
                 {% block content_pre_body %}{% endblock %}
 
                 {% block content_body %}

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/search.html

@@ -24,7 +24,7 @@
         <form class="mt-5" action="{% url 'cjkcms_search' %}" method="GET">
             <div class="row">
                 <div class="col-sm-9">
-                    {% bootstrap_form form size='large' layout='inline' %}
+                    {% bootstrap_form form size='lg' layout='inline' %}
                 </div>
                 <div class="col-sm-3">
                     <div class="form-group">
@@ -46,7 +46,7 @@
                 {% for pt in pagetypes %}
                 <li class="nav-item">
                     {% query_update qs_nop 't' pt.content_type.model as qs_t %}
-                    <a class="nav-link {% if form.t.value == pt.content_type.model %}active{% endif %}" href="?{{qs_t.urlencode}}">{{pt.search_name_plural}}</a>
+                    <a class="nav-link {% if form.t.value == pt.content_type.model %}active{% endif %}" href="?{{qs_t.urlencode}}">{{pt|get_plural_name_of_class}}</a>
                 </li>
                 {% endfor %}
             </ul>

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/web_page_notitle.html

@@ -8,6 +8,10 @@
     {% include 'cjkcms/snippets/actionbar.html' %}
 {% endblock %}
 
+{% block breadcrumbs %}
+{% include 'cjkcms/snippets/breadcrumbs.html' %}
+{% endblock %}
+
 {% block footer %}
 {% include 'cjkcms/snippets/footer.html' %}
 {% endblock %}

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/snippets/breadcrumbs.html

@@ -0,0 +1,27 @@
+{% load static wagtailcore_tags wagtailimages_tags cjkcms_tags wagtailsettings_tags %}
+<!-- ========================= breadcrumbs-section start ========================= -->
+{% if self.get_ancestors|length > 1 %}
+<div class="container py-1">
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb d-flex align-items-center">
+        {% block breadcrumb_title %}
+        {% for p in self.get_ancestors %}
+            {% if p.is_root == False %}
+            <li class="none">
+                <object type="image/svg+xml" data="{% static 'cjkcms/images/icons/'|add:settings.cjkcms.LayoutSettings.breadcrumb_icon|add:'.svg' %}" 
+                class="opacity-75" style="margin-bottom:-2px;"></object> 
+                <a href="{{ p.url }}">{{ p.title }}</a>
+            </li>
+            
+            {% endif %}
+        {% endfor %}
+        <li class="breadcrumb-item active ms-1" aria-current="page">
+            <object type="image/svg+xml" data="{% static 'cjkcms/images/icons/'|add:settings.cjkcms.LayoutSettings.breadcrumb_icon|add:'.svg' %}" 
+            class="opacity-75" style="margin-bottom:-2px;"></object> 
+            {{ page.title }}</li>
+        {% endblock %}
+        </ol>
+    </nav>
+</div>
+{% endif %}
+<!-- ========================= breadcrumbs-section end ========================= -->

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/snippets/navbar_search.html

@@ -0,0 +1,6 @@
+{% load cjkcms_tags django_bootstrap5 i18n %}
+      <form action="{% url 'cjkcms_search' %}" method="GET">
+        {% csrf_token %}
+        {% get_searchform request as form %}
+        {% bootstrap_form form layout='inline' %}
+    </form>

{wagtail-cjkcms-23.9.2 → wagtail-cjkcms-23.10.2}/cjkcms/templatetags/cjkcms_tags.py

@@ -18,7 +18,7 @@ from cjkcms.blocks.base_blocks import CjkcmsAdvSettings
 from cjkcms.forms import SearchForm
 from cjkcms.models import Footer, Navbar
 from cjkcms.settings import cms_settings
-from datetime import datetime
+from datetime import datetime, date
 
 from cjkcms.models.wagtailsettings_models import LayoutSettings
 
@@ -253,3 +253,26 @@ def get_plural_name_of_class(class_type):
 def define(val=None):
     """Allows defining a new variable in the template"""
     return val
+
+
+@register.filter(name="is_in_future")
+def is_in_future(the_date):
+    """Checks if given date or datetime is in future"""
+    if isinstance(the_date, datetime):
+        return the_date >= datetime.now()
+    elif isinstance(the_date, date):
+        # Convert date to datetime with time set to midnight
+        datetime_date = datetime(the_date.year, the_date.month, the_date.day)
+        return datetime_date >= datetime.now()
+    return False
+
+
+@register.filter(name="is_in_past")
+def is_in_past(the_date):
+    if isinstance(the_date, datetime):
+        return the_date < datetime.now()
+    elif isinstance(the_date, date):
+        # Convert date to datetime with time set to midnight
+        datetime_date = datetime(the_date.year, the_date.month, the_date.day)
+        return datetime_date < datetime.now()
+    return False

wagtail-cjkcms-23.10.2/cjkcms/tests/manage.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

wagtail-cjkcms-23.10.2/cjkcms/tests/settings.py

@@ -0,0 +1,88 @@
+"""
+Settings for running tests
+"""
+import os
+
+BASE_DIR = os.path.abspath(os.path.dirname(__file__))
+BASE_URL = "http://localhost"
+
+DEBUG = True
+SECRET_KEY = "mysecretkey4testing"
+ALLOWED_HOSTS = ["*"]
+INSTALLED_APPS = [
+    "cjkcms.tests.testapp.apps.TestAppConfig",  # replace `myapp` with your app name
+    # --- wagtail-cjkcms + requirements #
+    "cjkcms",
+    "wagtailseo",
+    "wagtailcache",
+    "wagtail.contrib.table_block",
+    "wagtail.contrib.settings",
+    "wagtail_color_panel",
+    "django_bootstrap5",
+    # --- end-wagtail-cjkcms #
+    "wagtail.contrib.forms",
+    "wagtail.contrib.redirects",
+    "wagtail.contrib.sitemaps",
+    "django.contrib.sitemaps",
+    "wagtail.embeds",
+    "wagtail.sites",
+    "wagtail.users",
+    "wagtail.snippets",
+    "wagtail.documents",
+    "wagtail.images",
+    "wagtail.search",
+    "wagtail.admin",
+    "wagtail",
+    "taggit",
+    "modelcluster",
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+]
+MIDDLEWARE = [
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django.middleware.security.SecurityMiddleware",
+    "wagtail.contrib.redirects.middleware.RedirectMiddleware",
+]
+ROOT_URLCONF = "cjkcms.tests.urls"
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [
+            os.path.join(BASE_DIR, "templates"),
+        ],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ],
+        },
+    },
+]
+WAGTAILADMIN_BASE_URL = BASE_URL
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_URL = "/static/"
+MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+MEDIA_URL = "/media/"
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": ":memory:",
+        # "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+    }
+}
+LANGUAGE_CODE = "en-us"
+TIME_ZONE = "UTC"
+USE_I18N = True
+USE_TZ = True