wagtail-cjkcms 25.1.10__py2.py3-none-any.whl → 25.2.2__py2.py3-none-any.whl

cjkcms/tests/test_settings.py

@@ -25,35 +25,46 @@ class SettingsTests(TestCase):
             # self.assertIsNone(abs_path, f"{logo} not found.")
             self.assertTrue(str(abs_path).endswith(logo), f"{logo} not found.")
 
-    def _check_templates(self, templates, skip_empty=False):
+    def _check_templates(self, templates, skip_empty=False, check_advanced=False):
         """Check if all declared template files specified in the `templates` list
         are accessible and execute without error. Used to check individual
-        sections in settings.py"""
+        sections in settings.py. Skip empty templates if `skip_empty` is True.
+        Check advanced settings features optionally (custom_id, custom_css_class)"""
 
         for tpl in templates:
             if skip_empty and not tpl[0]:
                 continue
             try:
-                get_template(tpl[0])
+                tpl = get_template(tpl[0])
+                # if check_advanced, ensure that strings {{self.settings.custom_css_class}}
+                # and {{self.settings.custom_id}} are present in template source
+                if check_advanced:
+                    self.assertIn("{{self.settings.custom_css_class}}", tpl.template.source)
+                    self.assertIn("{{self.settings.custom_id}}", tpl.template.source)
+
             except TemplateDoesNotExist as e:
                 self.fail(f"Template not found: {str(e)}")
 
     def test_cardblock_templates(self):
         templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_BLOCKS["cardblock"]
-        self._check_templates(templates)
+        self._check_templates(templates, check_advanced=True)
 
     def test_cardgridblock_templates(self):
         templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_BLOCKS["cardgridblock"]
-        self._check_templates(templates)
+        self._check_templates(templates, check_advanced=True)
 
     def test_pagelistblock_templates(self):
         templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_BLOCKS["pagelistblock"]
-        self._check_templates(templates)
+        self._check_templates(templates, check_advanced=True)
 
     def test_pagepreviewblock_templates(self):
         templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_BLOCKS["pagepreviewblock"]
         self._check_templates(templates)
 
+    def test_quoteblock_templates(self):
+        templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_BLOCKS["quoteblock"]
+        self._check_templates(templates, check_advanced=True)
+
     def test_frontend_template_pages_templates(self):
         templates = cms_settings.CJKCMS_FRONTEND_TEMPLATES_PAGES["*"]
         self._check_templates(templates, skip_empty=True)

cjkcms/tests/testapp/models.py

@@ -8,12 +8,15 @@ from cjkcms.models import (
 class ProjectArticlePage(CjkcmsArticlePage):
     template = "cjkcms/pages/article_page.html"
     search_template = "cjkcms/pages/article_page.search.html"
+    search_filterable = True
 
 
 class ProjectArticleIndexPage(CjkcmsArticleIndexPage):
     template = "cjkcms/pages/article_index_page.html"
+    search_filterable = True
 
 
 class ProjectWebPage(CjkcmsWebPage):
     # use cjkcms template by default
     template = "cjkcms/pages/web_page.html"
+    search_filterable = True

cjkcms/utils/__init__.py

@@ -0,0 +1,2 @@
+from .visibility import can_show_block  # noqa: F401
+from .richtext import get_richtext_preview  # noqa: F401

cjkcms/utils/richtext.py

@@ -0,0 +1,16 @@
+from django.utils.html import strip_tags
+from django.utils.safestring import mark_safe
+
+
+def get_richtext_preview(content, max_length=200):
+    """Returns a shortened version of a richtext field's content,
+    with HTML tags stripped, and trimmed to max_length.
+    >>> get_richtext_preview('<h1><div>Hello </div>world</h1>')
+    'Hello world'
+    >>> get_richtext_preview('Hi worl\x64')
+    'Hi world'"""
+    # strip tags
+    c = strip_tags(content)
+    # truncate and add ellipses
+    preview = f"{c[:max_length]}..." if len(c) > 200 else c
+    return mark_safe(preview)

cjkcms/{utils.py → utils/visibility.py}

@@ -1,22 +1,6 @@
-from django.utils.html import strip_tags
-from django.utils.safestring import mark_safe
 from datetime import datetime, timezone
 
 
-def get_richtext_preview(content, max_length=200):
-    """Returns a shortened version of a richtext field's content,
-    with HTML tags stripped, and trimmed to max_length.
-    >>> get_richtext_preview('<h1><div>Hello </div>world</h1>')
-    'Hello world'
-    >>> get_richtext_preview('Hi worl\x64')
-    'Hi world'"""
-    # strip tags
-    c = strip_tags(content)
-    # truncate and add ellipses
-    preview = f"{c[:max_length]}..." if len(c) > 200 else c
-    return mark_safe(preview)
-
-
 def can_show_block(
     context,
     item_visibility: str,

cjkcms/views.py

@@ -23,6 +23,32 @@ from cjkcms.models import (
     LayoutSettings,
 )
 
+from wagtail.models import Locale
+
+
+def search_model_backend(model, search_query, current_locale):
+    """
+    Helper function to search a specific model with the search backend.
+
+    Parameters:
+    - model: The model to search.
+    - search_query: The query string to search for.
+    - current_locale: The current locale for filtering pages.
+
+    Returns:
+    - list: Search results for the model.
+    """
+    backend = get_search_backend()
+    if issubclass(model, Page):
+        # Search only live and public pages for models that are Page subclasses
+        return backend.search(
+            search_query,
+            model.objects.live().public().filter(locale=current_locale),
+        )
+    else:
+        # Search normally for non-page models
+        return backend.search(search_query, model)
+
 
 def search(request):
     """
@@ -34,35 +60,51 @@ def search(request):
     Returns:
     HttpResponse: The rendered search results page.
     """
+
     search_form = SearchForm(request.GET)
-    results = []
+    results = None
     results_paginated = []
     indexed_models = []
-    for model in apps.get_models():
-        if (
-            issubclass(model, index.Indexed)
-            and hasattr(model, "search_filterable")
-            and model.search_filterable
-        ):
-            indexed_models.append(model)
+    results_by_model = {}
 
     if search_form.is_valid():
+        current_locale = Locale.get_active()
         search_query = search_form.cleaned_data["s"]
         search_model = search_form.cleaned_data["t"]
-        backend = get_search_backend()
+        results = []
+        for model in apps.get_models():
+            if (
+                issubclass(model, index.Indexed)
+                and hasattr(model, "search_filterable")
+                and model.search_filterable
+            ):
+                indexed_models.append(model)
+
+        # If a specific model is selected
         if search_model and ContentType.objects.filter(model=search_model).exists():
             try:
                 # If provided a model name, try to get it
                 model = ContentType.objects.get(model=search_model).model_class()
-                results = backend.search(search_query, model)
+                results = search_model_backend(model, search_query, current_locale)
+                # Store the count of results for this model
+                results_by_model[model._meta.model_name] = {
+                    "model": model,
+                    "count": results.count(),
+                }
             except ContentType.DoesNotExist:
-                # Maintain existing behavior of only returning objects if the page type is real
-                results = []
+                results = None
         else:
-            results = list(Page.objects.live().search(search_query))
-            # results=[]
+            # Search all indexed models
             for model in indexed_models:
-                results += backend.search(search_query, model)
+                model_results = search_model_backend(
+                    model, search_query, current_locale
+                )
+                # Store the count of results for this model
+                results_by_model[model._meta.model_name] = {
+                    "model": model,
+                    "count": model_results.count(),
+                }
+                results += model_results
         # get and paginate results
         if results:
             paginator = Paginator(
@@ -84,6 +126,7 @@ def search(request):
         "results": results,
         "pagetypes": indexed_models,
         "results_paginated": results_paginated,
+        "results_by_model": results_by_model,
     }
     # Render template
     return render(

cjkcms/wagtail_hooks.py

@@ -1,5 +1,3 @@
-import mimetypes
-
 from cjkcms import __version__
 from cjkcms.draftail import (
     NewWindowExternalLinkHandler,
@@ -8,7 +6,6 @@ from cjkcms.draftail import (
 )
 
 # from cjkcms.models.admin_sidebar import NavbarSnippet, EventCalendarSnippet
-from django.http.response import HttpResponse
 from django.templatetags.static import static
 from django.utils.html import format_html
 from wagtail import hooks
@@ -132,19 +129,6 @@ hooks.register("after_edit_snippet", clear_wagtailcache)
 hooks.register("after_delete_snippet", clear_wagtailcache)
 
 
-@hooks.register("before_serve_document")  # type: ignore
-def serve_document_directly(document, request):
-    """
-    This hook prevents documents from being downloaded unless
-    specified by an <a> tag with the download attribute.
-    """
-    content_type, content_encoding = mimetypes.guess_type(document.filename)
-    response = HttpResponse(document.file.read(), content_type=content_type)
-    response["Content-Disposition"] = 'inline;filename="{0}"'.format(document.filename)
-    response["Content-Encoding"] = str(content_encoding)
-    return response
-
-
 class ImportExportMenuItem(MenuItem):
     def is_shown(self, request):
         return request.user.is_superuser

{wagtail_cjkcms-25.1.10.dist-info → wagtail_cjkcms-25.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.1.10
+Version: 25.2.2
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x/6.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause
@@ -32,7 +32,7 @@ License-File: LICENSE
 Requires-Dist: django-bootstrap5
 Requires-Dist: django>=4.2
 Requires-Dist: wagtail>=5.1
-Requires-Dist: wagtail-seo>=2.5.0
+Requires-Dist: wagtail-seo>=3.0
 Requires-Dist: wagtail-cache>=2.5.1
 Requires-Dist: cjkcms-color-panel
 

{wagtail_cjkcms-25.1.10.dist-info → wagtail_cjkcms-25.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cjkcms/__init__.py,sha256=xQ8pfTYB1vbDrctxqOteABI3IJLq0eaFkcE_v8QNVKw,273
+cjkcms/__init__.py,sha256=mpNOQ-DmGjTDCHg_hgrPAPBD0pR1HpwNiATbTvqTH-g,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
@@ -6,9 +6,8 @@ cjkcms/image_formats.py,sha256=d4zRshuybwxSRL8UpBH31dFBr32o4HNexa0ks5PX3TI,1833
 cjkcms/search_urls.py,sha256=92XkGTJRrQQyA061wWl1l5C0vq6INVJPXOrpcgp3aoU,125
 cjkcms/settings.py,sha256=zw8V6cMP57w-U0M5hU4a1ouRLn-q02Waip7KnTZfbpc,20109
 cjkcms/urls.py,sha256=k5tEHWI4Umi2PWvGdNJ-FZ9OCy6AS3Y2S7k5jNOpgt0,644
-cjkcms/utils.py,sha256=u4pkPxAwqH3SgyIcmvk7I5L3w-eIcz0Rphmv0Y1DRpA,2006
-cjkcms/views.py,sha256=NWy3pBBcLUOH6WjEJh03N2sND4oToiyiy6_spgXdUcY,4389
-cjkcms/wagtail_hooks.py,sha256=emfgvVN4pkUuBjvHl1mMZz8zXq3CCqAw3BlufrK4S9k,7311
+cjkcms/views.py,sha256=Bl2K_hWwhxBPwkm7SeUo45qyEbrQUlMmE9tis2GQKwg,5793
+cjkcms/wagtail_hooks.py,sha256=AL2laH5wvYcM7rOIqOV2RGYe8Bx0luMi_5xvT1E0xTs,6686
 cjkcms/widgets.py,sha256=2B92WkaktZC1ge4GrAMTB7VVYKnKR8qoZLAtWS2z_00,1745
 cjkcms/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/api/mailchimp.py,sha256=pufnnu8n-c6kkWNKy-EsRLW5LLBn8_TmYrnRSQCPFdY,2832
@@ -17,7 +16,7 @@ cjkcms/bin/cjkcms.py,sha256=i11hhB11COQhTk05y7mkeIkUYcFjhI8-QxLkN3tCxgg,5763
 cjkcms/blocks/__init__.py,sha256=a54EtWyH8UPqszlVEeOtFCvBW2WmbaW1vR4sZuN9Hf0,3542
 cjkcms/blocks/base_blocks.py,sha256=uKp6QO3iOPT4P0H0yOumvL7faPvLQK9Dj-D8iqlvqQ4,11616
 cjkcms/blocks/content_blocks.py,sha256=-bIh3BCNYx0N7iK3mpfnLOzIsSMItgpLeC9Cqg-_dTc,9759
-cjkcms/blocks/html_blocks.py,sha256=rXdR1uxFYDYjOXpxndItxacWstiME8CdqZgB6d5qAYE,9543
+cjkcms/blocks/html_blocks.py,sha256=bDRDEresn3R87Uux7YztU2WhRnxGhJ429soOpmAd41c,9544
 cjkcms/blocks/layout_blocks.py,sha256=n2oVyL-ZQQaEA00HU6YraR59YF065o-OK7WuAahGuiw,3406
 cjkcms/blocks/searchable_html_block.py,sha256=i1rWv4vwwvZ9fxkASwPKl87-TqVHkXOFyohH3ve7pYk,171
 cjkcms/blocks/content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -54,14 +53,15 @@ cjkcms/migrations/0018_layoutsettings_search_format.py,sha256=NURMUoMyg20hSM_IDc
 cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py,sha256=SeA-oN5r9uePXOfPv57ETfGF_ZzNpv9vnkA_rmATXUY,1504
 cjkcms/migrations/0020_socialmediasettings_github_and_more.py,sha256=flCSiw6wB32wsxSln2NA66zWkxrJLhNfL1O3UInH2to,1044
 cjkcms/migrations/0021_remove_layoutsettings_navbar_color_scheme_and_more.py,sha256=lOOyu3QHjnjZY3HwXWCvUBxngm-t_sk4TvuxZ2Cq_j4,2723
-cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py,sha256=UqXcsDPMsJOewtU3aTl1R4ZE5I45ykiIEepQBALzno0,812
-cjkcms/migrations/0023_alter_navbar_language.py,sha256=TnMs5fzf-PmirNn6CgYh5pUwwHhaYKPDCjqnZqrj8Ok,547
+cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py,sha256=GprAV-Z_jJ9csmrhW1lMT9g91wQ5vVVfhqhxbS96ETc,954
+cjkcms/migrations/0023_alter_navbar_language.py,sha256=uXqRLfKQwFGgEDPICTo_esHmOsKgEVlGPhjc6pDDcCo,658
+cjkcms/migrations/0024_remove_cjkcmspage_struct_org_actions_and_more.py,sha256=sNwzF9U5KuueAx7xtAoyhK8x05bOLKl990bU3SvjkZo,2561
 cjkcms/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/models/__init__.py,sha256=f99GmxfFxGtQl8JvZFz8rAtklCIesLoSccyhhi2xgPU,232
 cjkcms/models/admin_sidebar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cjkcms/models/cms_models.py,sha256=9U46xwPidQfUlXnuVUW5IbtphXX_8djJD4CohoP3NbU,2356
-cjkcms/models/integration_models.py,sha256=L29OBwLH8DfHtDplu218UGbbvL94Erk3J_R7n365zQM,6302
-cjkcms/models/page_models.py,sha256=-9SLMKA5KI2gMMOTaAtpr4pE2RhidilaRRzF7nnE0WI,25454
+cjkcms/models/cms_models.py,sha256=leC-RKrd6GltgWcvM_3KT0guMeBt5r2YhgADFi6glzA,2414
+cjkcms/models/integration_models.py,sha256=DAAgMtjErjaWKRu6yPQUoWAG-uu4qZxCg1N9FqlswAA,6280
+cjkcms/models/page_models.py,sha256=OGB_SBP8Oh23JEFHzmwRFlhXHJxW9RZf6bwe7__hc7A,25606
 cjkcms/models/snippet_models.py,sha256=cV7nFpNfJE_JP-3g77swGgQt3szrwHlAEOXUwwYE2QY,17188
 cjkcms/models/wagtailsettings_models.py,sha256=ntgbGOquVmgbMehgV36KEiS25olqr_m5Ff7Ce7Pq61Y,23041
 cjkcms/project_template/basic/.editorconfig,sha256=1wgq7hgAUSHLfuy4Jh9BJ4ysyQL0si5UBbCu_OMz9hg,722
@@ -71,13 +71,13 @@ cjkcms/project_template/basic/README.md,sha256=KqbqIp8hHb6nW7PuQjjKL6QIsibNu3vzV
 cjkcms/project_template/basic/manage.py,sha256=a0-pofJxi3cyiildUPnerQr2NQUnJz3INLfdA5vAEBE,678
 cjkcms/project_template/basic/requirements.txt,sha256=ElqN__9IW5lZIZ0M9vKPohdcJShbrTG1oZbF_UjgJZE,123
 cjkcms/project_template/basic/home/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cjkcms/project_template/basic/home/blocks/__init__.py,sha256=_dufD-ss9mMATmAtrsgXG9G3Rb4W-QhH2NcMi18tQQo,137
-cjkcms/project_template/basic/home/blocks/blocks.py,sha256=UpEzbazb_hIVNtDyZvuiUMvwC7O7OWgCDke0wuxi9gk,2141
+cjkcms/project_template/basic/home/blocks/__init__.py,sha256=Qm1MDxNmnXaY1vVISlaZu0EaySahCfzq0hvmW7ilDig,429
+cjkcms/project_template/basic/home/blocks/blocks.py,sha256=YWE15PKj71bnKvqQqEqK51rTawM2lUkZ25o79b6AsyE,2135
 cjkcms/project_template/basic/home/migrations/0001_initial.py,sha256=yPFA3NfiTpYBVXzl-ZqFmo1W-JZPXX_GS2XqrkivtSQ,4981
 cjkcms/project_template/basic/home/migrations/0002_create_homepage.py,sha256=xBM1nxi18c91ojqKMNhdjTZEhaF33dWYoVZneO-GUfM,2047
 cjkcms/project_template/basic/home/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/project_template/basic/home/models/__init__.py,sha256=Zbh266jB2tBtwC8amTyaU0mbjjxjfxxbiYt2M9ctrq8,383
-cjkcms/project_template/basic/home/models/cms_models.py,sha256=MXmzahhCcDla1zxdMYTKvhLtpG85iE1NSWiF522umGM,3106
+cjkcms/project_template/basic/home/models/cms_models.py,sha256=W8UeJzB1ATnw-ljnQHxvFevNrUKck638_Iz-x4totmI,3107
 cjkcms/project_template/basic/home/templates/home/blocks/event_presentation.html,sha256=KUOqay0D20g6N4M4tU8gTGvpNwTP-6F34hO0DfNZ3hI,2282
 cjkcms/project_template/basic/project_name/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/project_template/basic/project_name/urls.py,sha256=OjM85aN8h7gmM7Haaxmcoe9RlheJ0kuQrIyElM0CzPg,911
@@ -119,13 +119,13 @@ cjkcms/project_template/webpack/frontend/webpack/webpack.config.dev.js,sha256=WH
 cjkcms/project_template/webpack/frontend/webpack/webpack.config.prod.js,sha256=FjsN0ooC51W39UhISKlsoBMevNewbCw-0Phma1MyaA8,986
 cjkcms/project_template/webpack/frontend/webpack/webpack.config.watch.js,sha256=JWJCSV0MsvN5ZRS0JiYvlYn0INpD3gVXWiCzJny5L88,1485
 cjkcms/project_template/webpack/home/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cjkcms/project_template/webpack/home/blocks/__init__.py,sha256=_dufD-ss9mMATmAtrsgXG9G3Rb4W-QhH2NcMi18tQQo,137
-cjkcms/project_template/webpack/home/blocks/blocks.py,sha256=UpEzbazb_hIVNtDyZvuiUMvwC7O7OWgCDke0wuxi9gk,2141
+cjkcms/project_template/webpack/home/blocks/__init__.py,sha256=Qm1MDxNmnXaY1vVISlaZu0EaySahCfzq0hvmW7ilDig,429
+cjkcms/project_template/webpack/home/blocks/blocks.py,sha256=YWE15PKj71bnKvqQqEqK51rTawM2lUkZ25o79b6AsyE,2135
 cjkcms/project_template/webpack/home/migrations/0001_initial.py,sha256=yPFA3NfiTpYBVXzl-ZqFmo1W-JZPXX_GS2XqrkivtSQ,4981
 cjkcms/project_template/webpack/home/migrations/0002_create_homepage.py,sha256=xBM1nxi18c91ojqKMNhdjTZEhaF33dWYoVZneO-GUfM,2047
 cjkcms/project_template/webpack/home/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/project_template/webpack/home/models/__init__.py,sha256=7dlJygS5td5eLdIKd-PG5L0vM9xdTsb0yPKcVZNKSKQ,391
-cjkcms/project_template/webpack/home/models/cms_models.py,sha256=MXmzahhCcDla1zxdMYTKvhLtpG85iE1NSWiF522umGM,3106
+cjkcms/project_template/webpack/home/models/cms_models.py,sha256=W8UeJzB1ATnw-ljnQHxvFevNrUKck638_Iz-x4totmI,3107
 cjkcms/project_template/webpack/home/templates/home/blocks/event_presentation.html,sha256=KUOqay0D20g6N4M4tU8gTGvpNwTP-6F34hO0DfNZ3hI,2282
 cjkcms/project_template/webpack/project_name/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/project_template/webpack/project_name/urls.py,sha256=OjM85aN8h7gmM7Haaxmcoe9RlheJ0kuQrIyElM0CzPg,911
@@ -197,10 +197,10 @@ cjkcms/templates/cjkcms/blocks/card_horizontal2.html,sha256=Yx2St6fbjULu4PFppWSa
 cjkcms/templates/cjkcms/blocks/card_img.html,sha256=-67mrEcSEGllm0XZjxEEcEIW03nboi2-a7lAQLjHglk,786
 cjkcms/templates/cjkcms/blocks/card_landing1.html,sha256=igysNkq07i_ZjU0mfwd83kWPrXEv3yTL9dqRzhIIDlU,2615
 cjkcms/templates/cjkcms/blocks/card_landing2.html,sha256=9HNdG1IrMcHhP94c5DTicNoQ0gJOdjotRQ4bUlFDmBo,2823
-cjkcms/templates/cjkcms/blocks/cardgrid_columns.html,sha256=YnmGNWLlPloos4Yues9nqQqKLKjRdGPFkGBqFjiai-A,678
-cjkcms/templates/cjkcms/blocks/cardgrid_deck.html,sha256=L4Tn6vnRFcZ2nlDWZNxJcr0dKY2q-TOmVPIgtyvoI1o,450
-cjkcms/templates/cjkcms/blocks/cardgrid_group.html,sha256=mCOBw0wmTOyHvRXrngI-lweLiucjRmrXpuE2J7k87Qc,277
-cjkcms/templates/cjkcms/blocks/cardgrid_zero.html,sha256=lECaWt-D_N1zd5U8xnYWu0H-M-vNnMnIvzlulBag_hg,276
+cjkcms/templates/cjkcms/blocks/cardgrid_columns.html,sha256=1ls8LWuRcX-WQQhI20YcHn0MCG1nUEdyPuYmJof_9Uk,768
+cjkcms/templates/cjkcms/blocks/cardgrid_deck.html,sha256=tP3-RrN8BXUkTWn9Y8HRwSftuQNy5SGLCfZ0dT9RbTA,530
+cjkcms/templates/cjkcms/blocks/cardgrid_group.html,sha256=CBF8Hv-RfhoC6FR9XyBkRAruI4H1US1l4_nwuNrHaM0,359
+cjkcms/templates/cjkcms/blocks/cardgrid_zero.html,sha256=ZJECwiQ3IarjwA5brEVO5KTa6P05BLlHqhb6yW9uIuw,358
 cjkcms/templates/cjkcms/blocks/carousel_block.html,sha256=XC04uEPWjQKmN7dHoQVv9NmFPkBxLhCpwTzvVGeXUwk,2698
 cjkcms/templates/cjkcms/blocks/column_block.html,sha256=7aiPizV-MrXS2LyV_fP1aCpNoC0nNAQphyVuAWbi2SI,406
 cjkcms/templates/cjkcms/blocks/countdown.html,sha256=blU12tkfSUp1G3W7bEK0xBClVgj-baeCk9qGkWIpb9E,921
@@ -222,12 +222,12 @@ cjkcms/templates/cjkcms/blocks/image_link_block.html,sha256=1SnNXhvgorW3oIPOWuLe
 cjkcms/templates/cjkcms/blocks/modal_block.html,sha256=xlXP0drI0QinbH0-yLpEuIR8H2kz9rY9LmwQTIduqd8,1020
 cjkcms/templates/cjkcms/blocks/page_link_block.html,sha256=rRLrzIp7eTYNjNzkZelxorD6zEhtBWDG6p4jTBVIDK4,164
 cjkcms/templates/cjkcms/blocks/pagelist_article_card_columns.html,sha256=48yrs_GgqHfJSfACewqZjdq1AE_RuSZXDvMUTrmsFn0,787
-cjkcms/templates/cjkcms/blocks/pagelist_article_card_deck.html,sha256=biFu8CmpvHDNhLn66rmXg-w3gev-R8sEZGXPOhoWCqQ,642
-cjkcms/templates/cjkcms/blocks/pagelist_article_card_group.html,sha256=UzLRHUq4_bWv85WGzCTBevjRyjt1cqCfZSuLy9n9pMI,361
-cjkcms/templates/cjkcms/blocks/pagelist_article_media.html,sha256=k2AXqDNSntZUmastwPDE5lzs4OTy6KRe6qPTGeLaTXc,956
-cjkcms/templates/cjkcms/blocks/pagelist_block.html,sha256=0c0nqSNQtw8OKmbLDsTziRzNG0T98K6F0zhd4oqTQoc,858
-cjkcms/templates/cjkcms/blocks/pagelist_list_group.html,sha256=b21qMXTxf8-MluccVVrWBew-FhfjmMbyqas9nm06hGI,610
-cjkcms/templates/cjkcms/blocks/pagelist_toc_nextprev.html,sha256=__QZ6SNxoWByrjUsjo1MNx5CP4pnj0xR74WUHJVTkKU,1224
+cjkcms/templates/cjkcms/blocks/pagelist_article_card_deck.html,sha256=BZwOOsSrkwEqV-8Nf0yP6rmsufBylalJ8kqSzG4-V9Q,637
+cjkcms/templates/cjkcms/blocks/pagelist_article_card_group.html,sha256=fuy_XHIVFKSaM9-4V2phJ0l3CE-1FuzxUQbtqFD8Qrs,489
+cjkcms/templates/cjkcms/blocks/pagelist_article_media.html,sha256=zdgEWRQ1lspoMjKz05jci9RNW6NykU3fCfBxAWCpO3c,1083
+cjkcms/templates/cjkcms/blocks/pagelist_block.html,sha256=VX7IkFMqON-BMl1T_Y2fiKJBi6UOhMi1zmQqNdpgzSw,986
+cjkcms/templates/cjkcms/blocks/pagelist_list_group.html,sha256=nQ679sgrRDKbjDYuxP9-ZvvIoewybhjITVbagGQiuMM,738
+cjkcms/templates/cjkcms/blocks/pagelist_toc_nextprev.html,sha256=5kqTxJw5qT8eSn80H1h1WQ3kYIAYcz4o0miSxGqSyKk,1244
 cjkcms/templates/cjkcms/blocks/pagepreview_block.html,sha256=KGodzh8Pd-Jhg8mmMoLWFuiU3xDzBn4fuCqfYXT_iM4,200
 cjkcms/templates/cjkcms/blocks/pagepreview_card.html,sha256=SJeuA6lWEQYws53vNCGSOK_JxyUZN-ja2D8dUh2dr4E,793
 cjkcms/templates/cjkcms/blocks/pricelist_block.html,sha256=kq1M97zQlQjr_8E4Q9pge1hUMzjO_WNFQygN8Y1OUZ8,244
@@ -284,7 +284,7 @@ cjkcms/templates/cjkcms/pages/base.html,sha256=XqaHguBc00cllm304dY-8MMuIYxqosnZq
 cjkcms/templates/cjkcms/pages/form_page_landing.html,sha256=zdySSHOWF10-x2MFLH9XMjeFSeNTMRM-VpvZ1tM8kw0,248
 cjkcms/templates/cjkcms/pages/home_page.html,sha256=67h2o3EVXsrivMqM26OZV-7-H_9vv1clFJ4MFMknIMU,50
 cjkcms/templates/cjkcms/pages/page.mini.html,sha256=VR3lTCUgHPXTd2HAlNrxQAmNjS_0VGzfQccUV5IeDXc,506
-cjkcms/templates/cjkcms/pages/search.html,sha256=mWpFQi5P01HAUdm7tOJAAJ2B7LbIALS4ShmbQveF_Go,3006
+cjkcms/templates/cjkcms/pages/search.html,sha256=m3VyiByKmuF3YDUAMHChFYCN6zeihqjKLURZEEOI8A0,3377
 cjkcms/templates/cjkcms/pages/search_result.html,sha256=peGL-4UtHGQdYlmdUqGUX3MxZLuw4EcxY00yQFW_7Ag,582
 cjkcms/templates/cjkcms/pages/web_page.html,sha256=floOVzOyPYvTMKfWd3pY0vyrqG7jt4WS5xJt3j6gZM0,594
 cjkcms/templates/cjkcms/pages/web_page_notitle.html,sha256=HjwzN8NpJBOVjKM6_cLtPfUllotFMkvQPLXL2aoB6A0,378
@@ -305,7 +305,7 @@ cjkcms/templates/cjkcms/snippets/tracking_g3.html,sha256=9OWUZKpHyomU02ubrf1rZpC
 cjkcms/templates/cjkcms/snippets/tracking_g4.html,sha256=auZnwOOyEpI48JUSlsJMfB3eMwEJV-85hZaJ7xtOSwI,832
 cjkcms/templates/cjkcms/snippets/tracking_matomo.html,sha256=kreCmOVi5U855Ly-NqxVT_ysbnj29Vb3n1k3PiUnVL8,694
 cjkcms/templates/cjkcms/snippets/tracking_matomo_noscript.html,sha256=g20zZkBNAY9A6Dk5cKZD3x2SD4ERrIW4AlISdLfkeGs,230
-cjkcms/templates/cjkcms/widgets/checkbox_classifiers.html,sha256=4v4RCOtJC1-3Qfksg4zloyI_1LBUpldDpjjJ4UTmBl0,1444
+cjkcms/templates/cjkcms/widgets/checkbox_classifiers.html,sha256=B1DnwyTsjjf9f3SDTo6A3vOsR4iJOCAfUlc0X_lL4ug,1282
 cjkcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html,sha256=sTMq7WSrxLkTY1bn8BFzRyRg3Dm3YjnYzVmLZfpuiug,839
 cjkcms/templates/wagtailadmin/block_forms/struct.html,sha256=cGGZY8luf9B29jhEqldzF5BnFTI0scM27bSHNFf-Fx8,550
 cjkcms/templates/wagtailadmin/shared/cr_main_nav_2fix.html,sha256=BAhkDE8_8KbhUOnHV-_P41jFDxszsp4699rYl33N6zo,885
@@ -313,12 +313,12 @@ cjkcms/templates/wagtailadmin/tables/thumbnail_cell.html,sha256=RzMT-tBnnDOgL-ze
 cjkcms/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/templatetags/auth_extras.py,sha256=IIxQ5n9FaQVZmhW-yW1XM5p2OjIemtqVoX-O-UcCns8,327
 cjkcms/templatetags/cjkcms_tags.py,sha256=KkKQ0o1FMdIC3zPAu7rKcnT3aAlLWMxTUIkE7ehgUcg,10411
-cjkcms/templatetags/friendly_loader.py,sha256=Zwopb9NNNN6IuDJCMFlwKuhmJC0hi4uTPEZSAxeakYY,4962
+cjkcms/templatetags/friendly_loader.py,sha256=jSGOqgAyXaN8XvbjEyvOwYAtAucnehHT8Ld4Qli5_l8,4963
 cjkcms/templatetags/gravatar.py,sha256=JG5MB6HUFso15J8gZ_te5FTMYAuo4km8rzMKKvLLh-E,1127
 cjkcms/templatetags/txtutils_tags.py,sha256=UMojdiLt6Jpijc-2QLusPc-qXX9bqFZf0JbqqPsfnWQ,1223
 cjkcms/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/tests/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
-cjkcms/tests/settings.py,sha256=WVu7tOcUH1E_DJ6YOEfi5_r5tJobUbX9O0VAmVl4ICg,2556
+cjkcms/tests/settings.py,sha256=OwAx_73FfO68FcCcc6yaJQdNBd8Pz7N2YqwJ60ouPHo,2557
 cjkcms/tests/test_advsettings.py,sha256=NiXJfc5ocJgxtbbnWhzEloS2wm3ODbZCyYfsS6lRgvU,6908
 cjkcms/tests/test_articlepages.py,sha256=7V7tr2kCKiEU1y36PlB9yoP0tmSDb8cchf8VYof3GGM,4226
 cjkcms/tests/test_bin.py,sha256=z-6vMYYqhv18UO00sUPrNpLLue0mbRr5vzqisu7UKAY,3506
@@ -326,47 +326,38 @@ cjkcms/tests/test_countdown_block.py,sha256=83RgYXvOLErcswXg13WRPD-Lf5VAykx_YRb2
 cjkcms/tests/test_draftail_extensions.py,sha256=8WAf8LdvSxW7kgtJaXQ8V3rSRNkzRDc-JGnlKOWZr3k,2364
 cjkcms/tests/test_finders_oembed.py,sha256=J-dG3aTsO2KXnUA0o4yKHh_r5Za9v_8gcXJQGwJrXpI,2489
 cjkcms/tests/test_gravatar.py,sha256=UWu1cVi3Gj96yqeQu795gw6FVPbZ44eCkkH1NGEGgBo,2629
-cjkcms/tests/test_search_blocks.py,sha256=3xUxFX6KP_lySGcQnsmXr3YI7tXs67-YoAMxmU-BNQs,4936
-cjkcms/tests/test_settings.py,sha256=n2B-qtaSdMJC4KuMGGx6qo5HIU73aaImbMkI_o7tK8A,2665
+cjkcms/tests/test_search_blocks.py,sha256=K6acussD7to_qttTBl4z-rAF00UJYZpd8OoeBt-T1Kc,5882
+cjkcms/tests/test_settings.py,sha256=I-py7xCNqgx-EMj0ucOZ68dKY11CLgEtJzYkeYD-Mw4,3457
 cjkcms/tests/test_templatetags.py,sha256=RHaIn93G8Aa2lG3JTHSPhFOTLBa4AWXJnwXa9Us5iqI,5966
 cjkcms/tests/test_urls.py,sha256=otiKZcs1WLDQM6AOfcdZgsOGDwea1qS3VEc8Yy-FV-Q,2880
 cjkcms/tests/test_webpage.py,sha256=PvXeXbawigObsdi_YpQNuHFx3Lqi6wM3ktVHZsxYbr4,1520
 cjkcms/tests/urls.py,sha256=_ksKz7HBHJtQK3HxC9cmJMX_dt6n4alx3FXjcL-cu28,850
 cjkcms/tests/media/images/test.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_0djPZwc.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_6zOjMLi.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_CWdn4xd.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_DqyysqG.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_J846ST8.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_WP0MnOi.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_XhwqhpE.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_ef9wMOI.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_erEkAMT.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_q64YMWd.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_xDdLBw1.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
-cjkcms/tests/media/images/test_xtSZp5Z.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_3NMwZ9L.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_AGrWgX3.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_TpkZkXF.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_cOs0NW2.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_sCFpDtv.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_w289mH5.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
 cjkcms/tests/media/original_images/test.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_0djPZwc.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_6zOjMLi.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_CWdn4xd.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_DqyysqG.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_J846ST8.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_WP0MnOi.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_XhwqhpE.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_ef9wMOI.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_erEkAMT.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_q64YMWd.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_xDdLBw1.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
-cjkcms/tests/media/original_images/test_xtSZp5Z.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_3NMwZ9L.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_AGrWgX3.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_TpkZkXF.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_cOs0NW2.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_sCFpDtv.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_w289mH5.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
 cjkcms/tests/testapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/tests/testapp/apps.py,sha256=EwyrkWTu-_OoLoERBTlqkqfPIIrEsbHY3kbCxgrv_7I,169
-cjkcms/tests/testapp/models.py,sha256=Rkn9KHrGbLzrKjP4y_gwtXma1_fJOZNU7ekb689fJEU,488
+cjkcms/tests/testapp/models.py,sha256=N11rFqkMqQNVagoLjmIX8BVsgfW7wFqYKiDB9gE0PTo,575
 cjkcms/tests/testapp/migrations/0001_initial.py,sha256=hxr-r-42IQEGr_OsZkxXXCW7wbxAHuI_OLOkn-seJUU,4942
 cjkcms/tests/testapp/migrations/0002_create_homepage.py,sha256=EfsxHh1oyqwahW9RVpTvaRDx_CHtFSJQahKEr7XC5Gg,1999
 cjkcms/tests/testapp/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wagtail_cjkcms-25.1.10.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-25.1.10.dist-info/METADATA,sha256=hpUF2y_cCucvl17cqxY5Vvfk6-A0a3xqdnI0RsGVK5k,3121
-wagtail_cjkcms-25.1.10.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-wagtail_cjkcms-25.1.10.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-25.1.10.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-25.1.10.dist-info/RECORD,,
+cjkcms/utils/__init__.py,sha256=uLr0n5jD1dmdICgpv7WjgAtuyrs50ERyRLVUmoSV1cA,110
+cjkcms/utils/richtext.py,sha256=dgNVQIAXevXzaVhCtGc7XW4PDwTFiGEL7q-YGgpcEjo,573
+cjkcms/utils/visibility.py,sha256=sbxIM5g903AydRdBbwwahB8tpoyQrHjmERn9Yg_aJ4g,1433
+wagtail_cjkcms-25.2.2.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-25.2.2.dist-info/METADATA,sha256=ekmb6dItmDGk6uEhDw_9MeK1A_iqdO6xPwuSqNWoIwQ,3118
+wagtail_cjkcms-25.2.2.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+wagtail_cjkcms-25.2.2.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-25.2.2.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-25.2.2.dist-info/RECORD,,