wagtail-cjkcms 25.2.4__tar.gz → 25.3.1__tar.gz

{wagtail_cjkcms-25.2.4/wagtail_cjkcms.egg-info → wagtail_cjkcms-25.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wagtail-cjkcms
-Version: 25.2.4
+Version: 25.3.1
 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
@@ -35,6 +35,7 @@ Requires-Dist: wagtail>=6.0
 Requires-Dist: wagtail-seo>=3.0
 Requires-Dist: wagtail-cache>=2.5.1
 Requires-Dist: wagtail-color-panel>=1.6.0
+Dynamic: license-file
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/cjkcms/__init__.py

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

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/cjkcms/blocks/__init__.py

@@ -99,29 +99,7 @@ BASIC_LAYOUT_STREAMBLOCKS = [
     ),
 ]
 
-LAYOUT_STREAMBLOCKS = [
-    (
-        "hero",
-        HeroBlock(
-            [
-                ("row", GridBlock(CONTENT_STREAMBLOCKS)),
-                (
-                    "cardgrid",
-                    CardGridBlock(
-                        [
-                            ("card", CardBlock()),
-                        ]
-                    ),
-                ),
-                (
-                    "html",
-                    SearchableHTMLBlock(
-                        icon="code", form_classname="monospace", label=_("HTML")
-                    ),
-                ),
-            ]
-        ),
-    ),
+FLAT_LAYOUT_STREAMBLOCKS = [
     ("row", GridBlock(CONTENT_STREAMBLOCKS)),
     (
         "cardgrid",
@@ -136,3 +114,38 @@ LAYOUT_STREAMBLOCKS = [
         SearchableHTMLBlock(icon="code", form_classname="monospace", label=_("HTML")),
     ),
 ]
+
+LAYOUT_STREAMBLOCKS = [
+    ("hero", HeroBlock(FLAT_LAYOUT_STREAMBLOCKS)),
+    *FLAT_LAYOUT_STREAMBLOCKS,
+]
+
+
+def replace_contentblocks(flat_layout_blocks, full_layout_blocks, new_content_blocks):
+    """helper function to add new content blocks in projects,
+    replacing the default content blocks in the layout blocks.
+
+    Args:
+        flat_layout_blocks (_type_): CJKCMS layout blocks which contains "row" of content blocks
+        full_layout_blocks (_type_): CJKCMS outer layout with hero and flat layout blocks
+        new_content_blocks (_type_): full set of new content blocks to replace the old ones
+
+    Returns:
+        full_layout_blocks: full layout blocks with new content blocks, readty to include
+        in the project models' body fields
+    """
+    for i, item in enumerate(flat_layout_blocks):
+        if item[0] == "row":
+            # Replace each 'row' entry with new content blocks
+            flat_layout_blocks[i] = (
+                "row",
+                GridBlock(new_content_blocks),
+            )
+    full_layout_blocks = [
+        (
+            "hero",
+            HeroBlock(flat_layout_blocks),
+        ),
+        *flat_layout_blocks,
+    ]
+    return full_layout_blocks

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/cjkcms/models/page_models.py

@@ -316,7 +316,7 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
     ]
 
     promote_panels = SeoMixin.seo_meta_panels
-    
+
     integration_panels = []
 
     def __init__(self, *args, **kwargs):

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/cjkcms/templates/cjkcms/blocks/card_landing2.html

@@ -43,12 +43,12 @@
           </div>
           <div class="col-8 col-lg-9 col-xl-10 text-center text-md-start">
             {% if self.title %}
-            <h1 class="fw-bold" style="color:#FFFFFF; position: relative; z-index: 1; text-shadow: 2px 2px 4px rgba(0,0,0,0.5);">
+            <h1 class="fw-bold fs-2 pb-2" style="color:#FFFFFF; position: relative; z-index: 1; text-shadow: 2px 2px 4px rgba(0,0,0,0.5);">
             {{self.title}}
             </h1>
             {% endif %}
             {% if self.subtitle %}
-            <h2 class="lh-1 ls-tight fw-900 text-primary mb-4">
+            <h2 class="lh-1 ls-tight fw-900 fs-3 text-primary mb-4 mt-4" style="position: relative; z-index: 1;">
               {{self.subtitle}}
             </h2>
             {% endif %}

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/cjkcms/templates/cjkcms/pages/base.html

@@ -63,6 +63,7 @@
         {% block tracking %}
             {% if settings.cjkcms.AnalyticsSettings.matomo_site_id and settings.cjkcms.AnalyticsSettings.matomo_hostname %}
                 {% include "cjkcms/snippets/tracking_matomo.html" %}
+                {% include "cjkcms/snippets/tracking_matomo_noscript.html" %}
             {% endif %}
             {% if settings.cjkcms.AnalyticsSettings.g4_tracking_id  %}
                 {% include "cjkcms/snippets/tracking_g4.html" %}

wagtail_cjkcms-25.3.1/cjkcms/tests/test_utils.py

@@ -0,0 +1,80 @@
+import unittest
+from cjkcms.blocks import (
+    GridBlock,
+    HeroBlock,
+    AccordionBlock,
+    CardBlock,
+    ButtonBlock,
+    CardGridBlock,
+    # replace_contentblocks,
+)
+
+
+class TestReplaceContentBlocks(unittest.TestCase):
+    def setUp(self):
+        self.old_content_blocks = [
+            ("accordion", AccordionBlock()),
+            ("card", CardBlock()),
+        ]
+        self.flat_layout_blocks = [
+            ("row", GridBlock(self.old_content_blocks)),
+            (
+                "cardgrid",
+                CardGridBlock(
+                    [
+                        ("card", CardBlock()),
+                    ]
+                ),
+            ),
+        ]
+        self.full_layout_blocks = [
+            ("hero", HeroBlock(self.flat_layout_blocks)),
+            *self.flat_layout_blocks,
+        ]
+        self.new_content_blocks = [
+            *self.old_content_blocks,
+            ("button", ButtonBlock()),
+        ]
+
+    def test_replace_contentblocks(self):
+        pass
+        # updated_full_layout_blocks = replace_contentblocks(
+        #     self.flat_layout_blocks, self.full_layout_blocks, self.new_content_blocks
+        # )
+
+        # Check if the top-level "row" block is replaced
+        # self.assertIsInstance(updated_full_layout_blocks[0][1], HeroBlock)
+        # self.assertEqual(
+        #     updated_full_layout_blocks[0][1]
+        #     .content_streamblocks[0][1]
+        #     .contet_streamblocks,
+        #     self.new_content_blocks,
+        # )
+
+    #     # Check if the "hero" block is updated correctly
+    #     self.assertIsInstance(updated_full_layout_blocks[0][1], HeroBlock)
+    #     self.assertEqual(
+    #         updated_full_layout_blocks[0][1].streamblock[0][1].streamblock,
+    #         self.new_content_blocks,
+    #     )
+
+    # def test_no_replacement_for_non_matching_blocks(self):
+    #     non_matching_structure = [
+    #         ("cardgrid", CardGridBlock),
+    #         ("button", ButtonBlock),
+    #     ]
+    #     updated_full_layout_blocks = replace_contentblocks(
+    #         non_matching_structure, self.full_layout_blocks, self.new_content_blocks
+    #     )
+
+    #     # Check if the structure remains unchanged
+    #     self.assertEqual(updated_full_layout_blocks[1], non_matching_structure)
+
+    # def test_empty_structure(self):
+    #     empty_structure = []
+    #     updated_full_layout_blocks = replace_contentblocks(
+    #         empty_structure, self.full_layout_blocks, self.new_content_blocks
+    #     )
+
+    #     # Check if the structure remains unchanged
+    #     self.assertEqual(updated_full_layout_blocks[1], empty_structure)

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wagtail-cjkcms
-Version: 25.2.4
+Version: 25.3.1
 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
@@ -35,6 +35,7 @@ Requires-Dist: wagtail>=6.0
 Requires-Dist: wagtail-seo>=3.0
 Requires-Dist: wagtail-cache>=2.5.1
 Requires-Dist: wagtail-color-panel>=1.6.0
+Dynamic: license-file
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail_cjkcms-25.2.4 → wagtail_cjkcms-25.3.1}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -338,18 +338,25 @@ cjkcms/tests/test_search_blocks.py
 cjkcms/tests/test_settings.py
 cjkcms/tests/test_templatetags.py
 cjkcms/tests/test_urls.py
+cjkcms/tests/test_utils.py
 cjkcms/tests/test_webpage.py
 cjkcms/tests/urls.py
 cjkcms/tests/media/images/test.original.png
-cjkcms/tests/media/images/test_6mZL9NZ.original.png
-cjkcms/tests/media/images/test_OSPIkp8.original.png
-cjkcms/tests/media/images/test_YBCJmYS.original.png
-cjkcms/tests/media/images/test_q0QJ4UA.original.png
+cjkcms/tests/media/images/test_3NMwZ9L.original.png
+cjkcms/tests/media/images/test_AGrWgX3.original.png
+cjkcms/tests/media/images/test_TpkZkXF.original.png
+cjkcms/tests/media/images/test_cOs0NW2.original.png
+cjkcms/tests/media/images/test_huAlBCK.original.png
+cjkcms/tests/media/images/test_sCFpDtv.original.png
+cjkcms/tests/media/images/test_w289mH5.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_6mZL9NZ.png
-cjkcms/tests/media/original_images/test_OSPIkp8.png
-cjkcms/tests/media/original_images/test_YBCJmYS.png
-cjkcms/tests/media/original_images/test_q0QJ4UA.png
+cjkcms/tests/media/original_images/test_3NMwZ9L.png
+cjkcms/tests/media/original_images/test_AGrWgX3.png
+cjkcms/tests/media/original_images/test_TpkZkXF.png
+cjkcms/tests/media/original_images/test_cOs0NW2.png
+cjkcms/tests/media/original_images/test_huAlBCK.png
+cjkcms/tests/media/original_images/test_sCFpDtv.png
+cjkcms/tests/media/original_images/test_w289mH5.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py