wagtail-cjkcms 25.2.3__py2.py3-none-any.whl → 25.2.6__py2.py3-none-any.whl

cjkcms/__init__.py

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

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

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):

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 %}

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.3.dist-info → wagtail_cjkcms-25.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.2.3
+Version: 25.2.6
 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
@@ -34,7 +34,7 @@ Requires-Dist: django>=5.0
 Requires-Dist: wagtail>=6.0
 Requires-Dist: wagtail-seo>=3.0
 Requires-Dist: wagtail-cache>=2.5.1
-Requires-Dist: cjkcms-color-panel
+Requires-Dist: wagtail-color-panel>=1.6.0
 
 ![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.3.dist-info → wagtail_cjkcms-25.2.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cjkcms/__init__.py,sha256=rQ9g_AlwfGYAI0d2fu7wG6Uvpewsd58wJ14pfeSIya8,272
+cjkcms/__init__.py,sha256=my20r-LQDrgV3DxuH17cQxMI8qwGMvXOFyUkoql373k,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
@@ -13,7 +13,7 @@ cjkcms/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/api/mailchimp.py,sha256=pufnnu8n-c6kkWNKy-EsRLW5LLBn8_TmYrnRSQCPFdY,2832
 cjkcms/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/bin/cjkcms.py,sha256=i11hhB11COQhTk05y7mkeIkUYcFjhI8-QxLkN3tCxgg,5763
-cjkcms/blocks/__init__.py,sha256=a54EtWyH8UPqszlVEeOtFCvBW2WmbaW1vR4sZuN9Hf0,3542
+cjkcms/blocks/__init__.py,sha256=kUr403BZfB7tHUfVAbH0LYT3mRRIbSUDISNmmu-N1OE,4170
 cjkcms/blocks/base_blocks.py,sha256=uKp6QO3iOPT4P0H0yOumvL7faPvLQK9Dj-D8iqlvqQ4,11616
 cjkcms/blocks/content_blocks.py,sha256=-bIh3BCNYx0N7iK3mpfnLOzIsSMItgpLeC9Cqg-_dTc,9759
 cjkcms/blocks/html_blocks.py,sha256=bDRDEresn3R87Uux7YztU2WhRnxGhJ429soOpmAd41c,9544
@@ -61,7 +61,7 @@ cjkcms/models/__init__.py,sha256=f99GmxfFxGtQl8JvZFz8rAtklCIesLoSccyhhi2xgPU,232
 cjkcms/models/admin_sidebar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/page_models.py,sha256=SuN0WhPKkJe8SixV3zeivMKDzBN2xvP9JfUpof14k0c,25602
 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
@@ -196,7 +196,7 @@ cjkcms/templates/cjkcms/blocks/card_horizontal.html,sha256=CDxYUgzASP514wDgpIgOH
 cjkcms/templates/cjkcms/blocks/card_horizontal2.html,sha256=Yx2St6fbjULu4PFppWSa5Mnq6f7-M2fvxXY_N6jlZ1o,1104
 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/card_landing2.html,sha256=0cdRvsyag6J6yyHmupk6FreemP7pFO_tHsEiIT17mbg,2883
 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
@@ -330,22 +330,35 @@ cjkcms/tests/test_search_blocks.py,sha256=K6acussD7to_qttTBl4z-rAF00UJYZpd8OoeBt
 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_utils.py,sha256=F6YLRMJjcf0cLiB77KnE5_XQW9lsy_yFB4dtZxjpSs8,2636
 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_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/images/test_8GL8Kb7.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_IocDjKv.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_LH2dPwn.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_O3GLriA.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_OSyHHue.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_WUJDfCh.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_ZfGlHpM.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_e3WjdNA.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_ecUr3Ew.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_kMBM1w9.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_nEQzCFz.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_qOYmckb.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_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/media/original_images/test_8GL8Kb7.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_IocDjKv.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_LH2dPwn.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_O3GLriA.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_OSyHHue.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_WUJDfCh.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_ZfGlHpM.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_e3WjdNA.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_ecUr3Ew.png,sha256=GvnFOJX4x2u1s4LjNld27VHvbaASC5OCHs4bAyLHq7Q,2307
+cjkcms/tests/media/original_images/test_kMBM1w9.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_nEQzCFz.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_qOYmckb.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=N11rFqkMqQNVagoLjmIX8BVsgfW7wFqYKiDB9gE0PTo,575
@@ -355,9 +368,9 @@ cjkcms/tests/testapp/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 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.3.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-25.2.3.dist-info/METADATA,sha256=XDA-RfSqldQnFlyw-_dwv1WAJrRWfqTnaJKcE9MdHTY,3118
-wagtail_cjkcms-25.2.3.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-wagtail_cjkcms-25.2.3.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-25.2.3.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-25.2.3.dist-info/RECORD,,
+wagtail_cjkcms-25.2.6.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-25.2.6.dist-info/METADATA,sha256=junHCd09ku-FOZOM2TXHYsvBsyak1SzqseigsfmqCrg,3126
+wagtail_cjkcms-25.2.6.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+wagtail_cjkcms-25.2.6.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-25.2.6.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-25.2.6.dist-info/RECORD,,