wagtail-cjkcms 25.5.1__tar.gz → 25.5.3__tar.gz

{wagtail_cjkcms-25.5.1/wagtail_cjkcms.egg-info → wagtail_cjkcms-25.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-cjkcms
-Version: 25.5.1
+Version: 25.5.3
 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

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/__init__.py

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

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/blocks/__init__.py

@@ -35,6 +35,7 @@ from .content_blocks import (  # noqa
 )
 from .content.events import PublicEventBlock, EventCalendarBlock
 from .content.countdown import CountdownBlock
+from .content.multistep import MultiStepInstructionsBlock
 from .layout_blocks import CardGridBlock, GridBlock, HeroBlock
 from cjkcms.settings import cms_settings
 
@@ -79,6 +80,7 @@ CONTENT_STREAMBLOCKS = HTML_STREAMBLOCKS + [
     ("event_calendar", EventCalendarBlock()),
     ("highlight", HighlightBlock()),
     ("countdown", CountdownBlock()),
+    ("multistep_instructions", MultiStepInstructionsBlock()),
 ]
 
 NAVIGATION_STREAMBLOCKS = [

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/blocks/base_blocks.py

@@ -188,11 +188,33 @@ class CjkcmsAdvSettings(blocks.StructBlock):
     # placeholder, real value get set in __init__()
     custom_template = blocks.Block()
 
+    force_theme = blocks.ChoiceBlock(
+        choices=[
+            (None, _("None")),
+            ("light", _("Light")),
+            ("dark", _("Dark")),
+        ],
+        default=None,
+        required=False,
+        label=_("Force Theme"),
+        help_text=_(
+            "Override the theme for this block, also adding bg-body and text-body classes."
+        ),
+    )
+
     custom_css_class = blocks.CharBlock(
         required=False,
         max_length=255,
         label=_("Custom CSS Class"),
     )
+
+    item_css_class = blocks.CharBlock(
+        required=False,
+        max_length=255,
+        label=_("Item CSS Class"),
+        help_text=_("Used for multi-item blocks, like galleries or lists."),
+    )
+
     custom_id = blocks.CharBlock(
         required=False,
         max_length=255,

wagtail_cjkcms-25.5.3/cjkcms/blocks/content/multistep.py

@@ -0,0 +1,93 @@
+from wagtail import blocks
+from wagtail.blocks import StructBlock, StreamBlock
+from cjkcms.blocks.html_blocks import ButtonBlock
+from cjkcms.blocks.base_blocks import BaseBlock
+from cjkcms.settings import cms_settings
+from django.utils.translation import gettext_lazy as _
+
+
+class BootstrapColorChoiceBlock(blocks.ChoiceBlock):
+
+    class Meta:
+        label = "Color"
+
+
+class InstructionBlock(StructBlock):
+    header = blocks.CharBlock(
+        label="Header",
+        required=False,
+    )
+
+    pill_label = blocks.CharBlock(
+        label="Pill button Label",
+        help_text="Used only in Vertical Pills layout",
+    )
+
+    content_1 = blocks.RichTextBlock(
+        icon="font",
+        features=cms_settings.CJKCMS_RICHTEXT_FEATURES["full"],
+        label="Content Section 1",
+        required=False,
+    )
+
+    content_2 = blocks.RichTextBlock(
+        icon="font",
+        features=cms_settings.CJKCMS_RICHTEXT_FEATURES["full"],
+        label="Content Section 2",
+        required=False,
+    )
+
+    buttons = StreamBlock(
+        [("button", ButtonBlock())],
+        label="Step Buttons",
+        required=False,
+        block_counts={"button": {"min_num": 0, "max_num": 3}},
+    )
+
+    class Meta:
+        icon = "plus"
+        label = "Step"
+        label_format = "{header} (Step)"
+
+
+class MultiStepInstructionsBlock(BaseBlock):
+    header = blocks.CharBlock(label="Headline", required=False)
+
+    layout = blocks.ChoiceBlock(
+        label="Layout",
+        choices=[
+            ("vertical_pills", "Vertical Pills"),
+            ("alternating_cards", "Alternating Cards"),
+        ],
+        default="alternating_cards",
+    )
+
+    alignment = blocks.ChoiceBlock(
+        label="Header & Buttons Alignment",
+        choices=[
+            ("left", "Left"),
+            ("right", "Right"),
+            ("center", "Center"),
+        ],
+        default="center",
+    )
+
+    # gutter size for content spacing, dropdown choices for intengers 0-5
+    content_gutter = blocks.ChoiceBlock(
+        label="Content Gutter Size",
+        choices=[(str(i), str(i)) for i in range(6)],
+        default="3",
+        help_text="Horizontal gutter size for content spacing, 0-5",
+    )
+
+    steps = StreamBlock(
+        [("step", InstructionBlock())],
+        label="Steps",
+        block_counts={"step": {"min_num": 1, "max_num": 10, "required": True}},
+    )
+
+    class Meta:
+        icon = "group"
+        label = "Multi Step Instructions"
+        label_format = "{header} (Multi Step Instructions)"
+        template = "cjkcms/blocks/multi_step_instructions.html"

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/static/cjkcms/css/cjkcms-front.css

@@ -338,4 +338,4 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
   height: 0;
   width: 0;
   display: block;
-}
+}

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/templates/cjkcms/blocks/base_block.html

@@ -1,6 +1,7 @@
 <div class="{{self.settings.custom_css_class}}"
      {% if self.settings.custom_id %}
      id="{{self.settings.custom_id}}"
-     {% endif %} >
+     {% endif %}
+     >
 {% block block_render %}{% endblock %}
 </div>

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/templates/cjkcms/blocks/column_block.html

@@ -1,7 +1,12 @@
 {% load wagtailcore_tags %}
 
 <div {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}
-     class="col{% if self.settings.column_breakpoint %}-{{ self.settings.column_breakpoint }}{% endif %}{% if self.column_size %}-{{ self.column_size }}{% endif %} {{self.settings.custom_css_class}}">
+      {% if self.settings.force_theme %}
+          data-bs-theme="{{ self.settings.force_theme }}" data-mdb-theme="{{ self.settings.force_theme }}"
+      {% endif %}
+     class="col{% if self.settings.column_breakpoint %}-{{ self.settings.column_breakpoint }}{% endif %}{% if self.column_size %}-{{ self.column_size }}{% endif %} 
+     {{self.settings.custom_css_class}}
+     {% if self.settings.force_theme %} bg-body text-body{% endif %}">
       {% for block in self.content %}
       {% include_block block %}
       {% endfor %}

wagtail_cjkcms-25.5.3/cjkcms/templates/cjkcms/blocks/grid_block.html

@@ -0,0 +1,22 @@
+{% load wagtailcore_tags %}
+
+<div class="container{% if self.fluid %}-fluid{% endif %}"
+  {% if self.settings.custom_id %} id="{{self.settings.custom_id}}"{% endif %}    
+>
+  {% block grid_content %}
+  <div
+      {% if self.settings.force_theme %}
+        data-bs-theme="{{ self.settings.force_theme }}" data-mdb-theme="{{ self.settings.force_theme }}"
+    {% endif %}
+  
+  class="row {{self.settings.custom_css_class}}
+   {% if self.settings.force_theme %} bg-body text-body{% endif %}">
+      {% for column in self.content %}
+            {% include_block column %}
+      {% endfor %}
+  </div>
+  {% endblock %}
+
+</div>
+
+{% block custom_scripts %}{% endblock %}

wagtail_cjkcms-25.5.3/cjkcms/templates/cjkcms/blocks/multi_step_instructions.html

@@ -0,0 +1,14 @@
+{% load wagtailcore_tags wagtailimages_tags cjkcms_tags static %}
+<div
+    {% if self.settings.force_theme %}
+        data-bs-theme="{{ self.settings.force_theme }}" data-mdb-theme="{{ self.settings.force_theme }}"
+    {% endif %}
+    class="multi_step_instructions {%if self.settings.custom_css_class%}{{self.settings.custom_css_class}}{% else %} p-2 m-2 {% endif %}
+    {% if self.settings.force_theme %} bg-body text-body{% endif %}">
+        {% if self.header %}
+        <h2 class="text-center py-2 fw-bolder">{{ self.header }}</h2>
+        {% endif %}
+        {% with "cjkcms/snippets/multistep/"|add:self.layout|add:".html" as layout_template %}
+            {% include layout_template %}
+        {% endwith %}
+</div>

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/cjkcms/templates/cjkcms/pages/base.html

@@ -61,10 +61,6 @@
         {% endblock %}
 
         {% 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" %}
             {% endif %}
@@ -205,7 +201,7 @@
 
         {% block tracking_bottom %}
             {% if settings.cjkcms.AnalyticsSettings.matomo_site_id and settings.cjkcms.AnalyticsSettings.matomo_hostname %}
-                {% include "cjkcms/snippets/tracking_matomo_noscript.html" %}
+                {% include "cjkcms/snippets/tracking_matomo.html" %}
             {% endif %}
         {% endblock %}
 

wagtail_cjkcms-25.5.3/cjkcms/templates/cjkcms/snippets/multistep/alternating_cards.html

@@ -0,0 +1,28 @@
+{% load wagtailcore_tags wagtailimages_tags static %}
+
+{% for instruction in self.steps %}
+        <div class="row {%if self.settings.item_css_class%}{{self.settings.item_css_class}}{% else %}gx-4 gy-4 mb-4 border-bottom{% endif %}">
+            <div class="col-lg-6
+            {% if forloop.counter|divisibleby:2 %}order-last{% endif %}">
+                <h3 class="mb-2 
+                {% if self.alignment == "center" %}text-center
+                    {% elif self.alignment == "left" %}text-start
+                    {% else %}text-end{% endif %}
+                ">{{ instruction.value.header }}</h3>
+                <div class="content-instructions">
+                    {{ instruction.value.content_1|richtext }}
+                </div>
+                <div class="d-flex mb-2
+                {% if self.alignment == "center" %}justify-content-center
+                    {% elif self.alignment == "left" %}justify-content-start
+                    {% else %}justify-content-end{% endif %}">
+                {{ instruction.value.buttons }}
+                </div>
+            </div>
+            <div class="col-lg-6">
+                <div class="content-instructions">
+                    {{ instruction.value.content_2|richtext }}
+                </div>
+            </div>
+        </div>
+{% endfor %}

wagtail_cjkcms-25.5.3/cjkcms/templates/cjkcms/snippets/multistep/vertical_pills.html

@@ -0,0 +1,57 @@
+{% load wagtailcore_tags wagtailimages_tags static %}
+
+<div class="row {%if self.settings.item_css_class%}{{self.settings.item_css_class}}{% else %}gx-4 gy-4{% endif %}">
+    <div class="col-3">
+        <!-- Tab navs -->
+        <div
+                class="nav flex-column nav-pills text-center"
+                id="v-pills-tab"
+                role="tablist"
+                aria-orientation="vertical"
+        >
+            {% for instruction in self.steps %}
+                <a
+                        data-mdb-pill-init
+                        class="nav-link {% if forloop.first %}active{% endif %}"
+                        id="v-pills-{{ instruction.value.pill_label|slugify }}-tab"
+                        href="#vp-{{ instruction.value.pill_label|slugify }}"
+                        role="tab"
+                        aria-controls="vp-{{ instruction.value.pill_label|slugify }}"
+                        aria-selected="{% if forloop.first %}true{% else %}false{% endif %}"
+                >{{ instruction.value.pill_label }}</a>
+            {% endfor %}
+        </div>
+        <!-- Tab navs -->
+    </div>
+    <div class="col-9">
+        <!-- Tab content -->
+        <div class="tab-content" id="vp-content">
+            {% for instruction in self.steps %}
+                <div
+                        class="tab-pane fade show {% if forloop.first %}active{% endif %}"
+                        id="vp-{{ instruction.value.pill_label|slugify }}"
+                        role="tabpanel"
+                        aria-labelledby="vp-{{ instruction.value.pill_label|slugify }}-tab"
+                >
+                    <h3 class="
+                        {% if self.alignment == "center" %}text-center
+                        {% elif self.alignment == "left" %}text-start
+                        {% else %}text-end{% endif %}">{{ instruction.value.header }}</h3>
+                    <div class="content-instructions">
+                        {{ instruction.value.content_1|richtext }}
+                    </div>
+                    <div class="content-instructions">
+                        {{ instruction.value.content_2|richtext }}
+                    </div>
+                    <div class="d-flex
+                    {% if self.alignment == "center" %}justify-content-center
+                        {% elif self.alignment == "left" %}justify-content-start
+                        {% else %}justify-content-end{% endif %}">
+                    {{ instruction.value.buttons }}
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+        <!-- Tab content -->
+    </div>
+</div>

wagtail_cjkcms-25.5.3/cjkcms/templates/cjkcms/snippets/tracking_matomo_noscript.html

@@ -0,0 +1,2 @@
+{% load wagtailsettings_tags %}
+<noscript><img src="{{settings.cjkcms.AnalyticsSettings.matomo_hostname}}/matomo.php?rec=1&idsite={{settings.cjkcms.AnalyticsSettings.matomo_site_id}}" style="border:0;" alt="" /></noscript>

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-cjkcms
-Version: 25.5.1
+Version: 25.5.3
 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

{wagtail_cjkcms-25.5.1 → wagtail_cjkcms-25.5.3}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ cjkcms/blocks/searchable_html_block.py
 cjkcms/blocks/content/__init__.py
 cjkcms/blocks/content/countdown.py
 cjkcms/blocks/content/events.py
+cjkcms/blocks/content/multistep.py
 cjkcms/draftail/__init__.py
 cjkcms/draftail/draftail_extensions.py
 cjkcms/finders/__init__.py
@@ -228,6 +229,7 @@ cjkcms/templates/cjkcms/blocks/image_block.html
 cjkcms/templates/cjkcms/blocks/image_gallery_block.html
 cjkcms/templates/cjkcms/blocks/image_link_block.html
 cjkcms/templates/cjkcms/blocks/modal_block.html
+cjkcms/templates/cjkcms/blocks/multi_step_instructions.html
 cjkcms/templates/cjkcms/blocks/page_link_block.html
 cjkcms/templates/cjkcms/blocks/pagelist_article_card_columns.html
 cjkcms/templates/cjkcms/blocks/pagelist_article_card_deck.html
@@ -313,6 +315,8 @@ cjkcms/templates/cjkcms/snippets/tracking_g3.html
 cjkcms/templates/cjkcms/snippets/tracking_g4.html
 cjkcms/templates/cjkcms/snippets/tracking_matomo.html
 cjkcms/templates/cjkcms/snippets/tracking_matomo_noscript.html
+cjkcms/templates/cjkcms/snippets/multistep/alternating_cards.html
+cjkcms/templates/cjkcms/snippets/multistep/vertical_pills.html
 cjkcms/templates/cjkcms/widgets/checkbox_classifiers.html
 cjkcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html
 cjkcms/templates/wagtailadmin/block_forms/struct.html
@@ -342,35 +346,21 @@ 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_68x8kd6.original.png
-cjkcms/tests/media/images/test_8GL8Kb7.original.png
-cjkcms/tests/media/images/test_IocDjKv.original.png
-cjkcms/tests/media/images/test_LH2dPwn.original.png
-cjkcms/tests/media/images/test_NojnfK5.original.png
-cjkcms/tests/media/images/test_O3GLriA.original.png
-cjkcms/tests/media/images/test_OSyHHue.original.png
-cjkcms/tests/media/images/test_WUJDfCh.original.png
-cjkcms/tests/media/images/test_ZfGlHpM.original.png
-cjkcms/tests/media/images/test_e3WjdNA.original.png
-cjkcms/tests/media/images/test_ecUr3Ew.original.png
-cjkcms/tests/media/images/test_kMBM1w9.original.png
-cjkcms/tests/media/images/test_nEQzCFz.original.png
-cjkcms/tests/media/images/test_qOYmckb.original.png
+cjkcms/tests/media/images/test_3ZB0HiN.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_vMIUDCh.original.png
+cjkcms/tests/media/images/test_wMRIuGx.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_68x8kd6.png
-cjkcms/tests/media/original_images/test_8GL8Kb7.png
-cjkcms/tests/media/original_images/test_IocDjKv.png
-cjkcms/tests/media/original_images/test_LH2dPwn.png
-cjkcms/tests/media/original_images/test_NojnfK5.png
-cjkcms/tests/media/original_images/test_O3GLriA.png
-cjkcms/tests/media/original_images/test_OSyHHue.png
-cjkcms/tests/media/original_images/test_WUJDfCh.png
-cjkcms/tests/media/original_images/test_ZfGlHpM.png
-cjkcms/tests/media/original_images/test_e3WjdNA.png
-cjkcms/tests/media/original_images/test_ecUr3Ew.png
-cjkcms/tests/media/original_images/test_kMBM1w9.png
-cjkcms/tests/media/original_images/test_nEQzCFz.png
-cjkcms/tests/media/original_images/test_qOYmckb.png
+cjkcms/tests/media/original_images/test_3ZB0HiN.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_vMIUDCh.png
+cjkcms/tests/media/original_images/test_wMRIuGx.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py

wagtail_cjkcms-25.5.1/cjkcms/templates/cjkcms/blocks/grid_block.html

@@ -1,16 +0,0 @@
-{% load wagtailcore_tags %}
-
-<div class="container{% if self.fluid %}-fluid{% endif %}"
-  {% if self.settings.custom_id %} id="{{self.settings.custom_id}}"{% endif %} >
-
-  {% block grid_content %}
-  <div class="row {{self.settings.custom_css_class}}">
-      {% for column in self.content %}
-            {% include_block column %}
-      {% endfor %}
-  </div>
-  {% endblock %}
-
-</div>
-
-{% block custom_scripts %}{% endblock %}

wagtail_cjkcms-25.5.1/cjkcms/templates/cjkcms/snippets/tracking_matomo_noscript.html

@@ -1,2 +0,0 @@
-{% load wagtailsettings_tags %}
-<noscript><p><img src="{{settings.cjkcms.AnalyticsSettings.matomo_hostname}}/matomo.php?rec=1&idsite={{settings.cjkcms.AnalyticsSettings.matomo_site_id}}" style="border:0;" alt="" /></p></noscript>