wagtail-cjkcms 25.1.10__tar.gz → 25.2.2__tar.gz

{wagtail_cjkcms-25.1.10/wagtail_cjkcms.egg-info → wagtail_cjkcms-25.2.2}/PKG-INFO

@@ -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 → wagtail_cjkcms-25.2.2}/cjkcms/__init__.py

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

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/blocks/html_blocks.py

@@ -6,6 +6,7 @@ HTML blocks should NOT contain more sub-blocks or sub-streamfields.
 They must be safe to nest within more robust "content blocks" without
 creating recursion.
 """
+
 import logging
 
 from django.utils.encoding import force_str

wagtail_cjkcms-25.2.2/cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.0.6 on 2024-09-02 12:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cjkcms", "0021_remove_layoutsettings_navbar_color_scheme_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cjkcmspage",
+            name="breadcrumb_label",
+            field=models.CharField(
+                blank=True,
+                help_text="If empty, page title will be used.",
+                max_length=128,
+                verbose_name="Breadcrumb label",
+            ),
+        ),
+        migrations.AddField(
+            model_name="cjkcmspage",
+            name="breadcrumbs_visible",
+            field=models.BooleanField(
+                default=True,
+                help_text="Show breadcrumbs in this page header. For global change, see Settings->Layout",
+                verbose_name="Breadcrumbs",
+            ),
+        ),
+    ]

wagtail_cjkcms-25.2.2/cjkcms/migrations/0023_alter_navbar_language.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.4 on 2024-12-31 20:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cjkcms", "0022_cjkcmspage_breadcrumb_label_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="navbar",
+            name="language",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="_all_",
+                help_text="Select a language to limit display to specific locale.",
+                max_length=10,
+                verbose_name="Show in language",
+            ),
+        ),
+    ]

wagtail_cjkcms-25.2.2/cjkcms/migrations/0024_remove_cjkcmspage_struct_org_actions_and_more.py

@@ -0,0 +1,80 @@
+# Generated by Django 5.1.5 on 2025-02-08 10:45
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cjkcms', '0023_alter_navbar_language'),
+        ('wagtailimages', '0027_image_description'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_actions',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_address_country',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_address_locality',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_address_postal',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_address_region',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_address_street',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_extra_json',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_geo_lat',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_geo_lng',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_hours',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_image',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_logo',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_name',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_phone',
+        ),
+        migrations.RemoveField(
+            model_name='cjkcmspage',
+            name='struct_org_type',
+        ),
+        migrations.AlterField(
+            model_name='cjkcmspage',
+            name='og_image',
+            field=models.ForeignKey(blank=True, help_text='Shown when linking to this page on social media. If blank, may show an image from the page, or the default from Settings > SEO.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Preview image'),
+        ),
+    ]

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/models/cms_models.py

@@ -4,6 +4,7 @@ without having to create a new page types.
 Feel free to replace this file with your own configuration,
 in your Wagtail project. Copy+paste and modify as needed.
 """
+
 from django.utils.translation import gettext_lazy as _
 from . import (
     CjkcmsArticlePage,
@@ -59,8 +60,8 @@ class ArticleIndexPage(CjkcmsArticleIndexPage):
 
     # Only allow ArticlePages beneath this page.
     subpage_types = ["cjkcms.ArticlePage"]
-
     template = "cjkcms/pages/article_index_page.html"
+    search_filterable = True
 
 
 class WebPage(CjkcmsWebPage):
@@ -78,3 +79,4 @@ class WebPage(CjkcmsWebPage):
         verbose_name = _("Web Page")
 
     template = "cjkcms/pages/web_page.html"
+    search_filterable = True

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/models/integration_models.py

@@ -23,9 +23,9 @@ class MailchimpSubscriberIntegrationWidget(Input):
         list_library = self.build_list_library()
         ctx["widget"]["value"] = json.dumps(json_value)
         ctx["widget"]["extra_js"] = self.render_js(name, list_library, json_value)
-        ctx["widget"][
-            "selectable_mailchimp_lists"
-        ] = self.get_selectable_mailchimp_lists(list_library)
+        ctx["widget"]["selectable_mailchimp_lists"] = (
+            self.get_selectable_mailchimp_lists(list_library)
+        )
         ctx["widget"]["stored_mailchimp_list"] = self.get_stored_mailchimp_list(
             json_value
         )
@@ -81,23 +81,21 @@ class MailchimpSubscriberIntegrationWidget(Input):
                     "interest_categories": {},
                 }
 
-                list_library[mlist["id"]][
-                    "merge_fields"
-                ] = mailchimp.get_merge_fields_for_list(mlist["id"])["merge_fields"]
-                list_library[mlist["id"]][
-                    "interest_categories"
-                ] = mailchimp.get_interest_categories_for_list(mlist["id"])[
-                    "categories"
-                ]
+                list_library[mlist["id"]]["merge_fields"] = (
+                    mailchimp.get_merge_fields_for_list(mlist["id"])["merge_fields"]
+                )
+                list_library[mlist["id"]]["interest_categories"] = (
+                    mailchimp.get_interest_categories_for_list(mlist["id"])[
+                        "categories"
+                    ]
+                )
 
                 for category in list_library[mlist["id"]]["interest_categories"]:
-                    category[
-                        "interests"
-                    ] = mailchimp.get_interests_for_interest_category(
-                        mlist["id"], category["id"]
-                    )[
-                        "interests"
-                    ]
+                    category["interests"] = (
+                        mailchimp.get_interests_for_interest_category(
+                            mlist["id"], category["id"]
+                        )["interests"]
+                    )
 
         return list_library
 

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/models/page_models.py

@@ -35,7 +35,7 @@ from wagtail.utils.decorators import cached_classmethod
 from wagtailcache.cache import WagtailCacheMixin
 from wagtailseo.models import SeoMixin, TwitterCard
 
-from cjkcms import utils
+from cjkcms.utils.richtext import get_richtext_preview
 from cjkcms.blocks import CONTENT_STREAMBLOCKS, LAYOUT_STREAMBLOCKS
 from cjkcms.models.snippet_models import ClassifierTerm
 from cjkcms.models.wagtailsettings_models import LayoutSettings
@@ -315,8 +315,8 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         ),
     ]
 
-    promote_panels = SeoMixin.seo_meta_panels + SeoMixin.seo_struct_panels
-
+    promote_panels = SeoMixin.seo_meta_panels
+    
     integration_panels = []
 
     def __init__(self, *args, **kwargs):
@@ -373,6 +373,11 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         edit_handler = TabbedInterface(panels)
         return edit_handler.bind_to_model(cls)
 
+    @property
+    def search_name(self) -> str:
+        """Unless override, get the verbose name of the model"""
+        return self._meta.verbose_name
+
     @property
     def breadcrumb_title(self) -> str:
         """
@@ -630,7 +635,7 @@ class CjkcmsWebPage(CjkcmsPage):
         """
         A shortened version of the body without HTML tags.
         """
-        return utils.get_richtext_preview(self.body)
+        return get_richtext_preview(self.body)
 
 
 class CjkcmsArticlePage(CjkcmsWebPage):

wagtail_cjkcms-25.2.2/cjkcms/project_template/basic/home/blocks/__init__.py

@@ -0,0 +1,12 @@
+from .blocks import HOME_CONTENT_STREAMBLOCKS, HOME_LAYOUT_STREAMBLOCKS  # noqa
+
+# from otherapp.blocks import OTHERAPP_CONTENT_STREAMBLOCKS, OTHERAPP_LAYOUT_STREAMBLOCKS  # noqa
+
+
+# add your own content block
+PROJECT_CONTENT_STREAMBLOCKS = (
+    HOME_CONTENT_STREAMBLOCKS  # + OTHERAPP_CONTENT_STREAMBLOCKS
+)
+
+# add your own layout blocks
+PROJECT_LAYOUT_STREAMBLOCKS = HOME_LAYOUT_STREAMBLOCKS  # + OTHERAPP_LAYOUT_STREAMBLOCKS

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/project_template/basic/home/blocks/blocks.py

@@ -66,11 +66,11 @@ class EventPresentationBlock(BaseBlock):
 
 
 # add your own content block
-PROJECT_CONTENT_STREAMBLOCKS = [
+HOME_CONTENT_STREAMBLOCKS = [
     ("event_presentation", EventPresentationBlock()),
 ]
 
 # add your own layout blocks
-PROJECT_LAYOUT_STREAMBLOCKS = [
+HOME_LAYOUT_STREAMBLOCKS = [
     # ("custom_block", CustomBlock()),
 ]

{wagtail_cjkcms-25.1.10/cjkcms/project_template/webpack → wagtail_cjkcms-25.2.2/cjkcms/project_template/basic}/home/models/cms_models.py

@@ -1,6 +1,7 @@
 """
 Three main creatable page types used in Cjk CMS.
 """
+
 from django.utils.translation import gettext_lazy as _
 from cjkcms.models import (
     CjkcmsArticlePage,

wagtail_cjkcms-25.2.2/cjkcms/project_template/webpack/home/blocks/__init__.py

@@ -0,0 +1,12 @@
+from .blocks import HOME_CONTENT_STREAMBLOCKS, HOME_LAYOUT_STREAMBLOCKS  # noqa
+
+# from otherapp.blocks import OTHERAPP_CONTENT_STREAMBLOCKS, OTHERAPP_LAYOUT_STREAMBLOCKS  # noqa
+
+
+# add your own content block
+PROJECT_CONTENT_STREAMBLOCKS = (
+    HOME_CONTENT_STREAMBLOCKS  # + OTHERAPP_CONTENT_STREAMBLOCKS
+)
+
+# add your own layout blocks
+PROJECT_LAYOUT_STREAMBLOCKS = HOME_LAYOUT_STREAMBLOCKS  # + OTHERAPP_LAYOUT_STREAMBLOCKS

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/project_template/webpack/home/blocks/blocks.py

@@ -66,11 +66,11 @@ class EventPresentationBlock(BaseBlock):
 
 
 # add your own content block
-PROJECT_CONTENT_STREAMBLOCKS = [
+HOME_CONTENT_STREAMBLOCKS = [
     ("event_presentation", EventPresentationBlock()),
 ]
 
 # add your own layout blocks
-PROJECT_LAYOUT_STREAMBLOCKS = [
+HOME_LAYOUT_STREAMBLOCKS = [
     # ("custom_block", CustomBlock()),
 ]

{wagtail_cjkcms-25.1.10/cjkcms/project_template/basic → wagtail_cjkcms-25.2.2/cjkcms/project_template/webpack}/home/models/cms_models.py

@@ -1,6 +1,7 @@
 """
 Three main creatable page types used in Cjk CMS.
 """
+
 from django.utils.translation import gettext_lazy as _
 from cjkcms.models import (
     CjkcmsArticlePage,

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/cardgrid_columns.html

@@ -2,7 +2,9 @@
 {% load wagtailcore_tags %}
 
 {% block grid_content %}
-<div class="row {{self.settings.custom_css_class}} position-relative" data-masonry='{"percentPosition": true }'>
+<div class="row {{self.settings.custom_css_class}} position-relative" 
+      data-masonry='{"percentPosition": true }' 
+      {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
       {% for block in self.content %}
       <div class="col-sm-6 col-lg-4 mb-4" style="position: absolute;left:0;top:0;">
         {% include_block block %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/cardgrid_deck.html

@@ -7,7 +7,8 @@
         {{self.settings.custom_css_class}}
     {% else %}
         row-cols-1 row-cols-md-2 row-cols-lg-3 g-4
-    {% endif %} ">
+    {% endif %}" 
+    {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
       {% for block in self.content %}
           <div class="col">
             {% include_block block %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/cardgrid_group.html

@@ -2,7 +2,8 @@
 {% load wagtailcore_tags %}
 
 {% block grid_content %}
-<div class="card-group {{self.settings.custom_css_class}}">
+<div class="card-group {{self.settings.custom_css_class}}"
+      {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
       {% for block in self.content %}
             {% include_block block %}
       {% endfor %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/cardgrid_zero.html

@@ -2,7 +2,8 @@
 {% load wagtailcore_tags %}
 
 {% block grid_content %}
-<div class="card-zero {{self.settings.custom_css_class}}">
+<div class="card-zero {{self.settings.custom_css_class}}"
+      {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
       {% for block in self.content %}
             {% include_block block %}
       {% endfor %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_article_card_deck.html

@@ -8,8 +8,7 @@
         {{self.settings.custom_css_class}}
     {% else %}
         row-cols-1 row-cols-md-2 row-cols-lg-3 g-4
-    {% endif %}
-    "
+    {% endif %}"
      {% if self.settings.custom_id %}
      id="{{self.settings.custom_id}}"
      {% endif %} >

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_article_card_group.html

@@ -3,7 +3,10 @@
 
 {% block block_render %}
 
-    <div class="card-group">
+    <div class="card-group {{self.settings.custom_css_class}}"
+     {% if self.settings.custom_id %}
+     id="{{self.settings.custom_id}}"
+     {% endif %}>
         {% for page in pages %}
         {% with page.specific as article %}
             {% include "cjkcms/blocks/article_block_card.html" %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_article_media.html

@@ -5,7 +5,10 @@
 
     {% for page in pages %}
     {% with page.specific as article %}
-    <div class="media">
+    <div class="media{{self.settings.custom_css_class}}"
+     {% if self.settings.custom_id %}
+     id="{{self.settings.custom_id}}"
+     {% endif %}>
         {% if article.cover_image %}
             {% image article.cover_image fill-150x100 as cover_image %}
             <a href="{{article.url}}"><img class="mr-3" src="{{cover_image.url}}" alt="{{cover_image.title}}"></a>

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_block.html

@@ -2,7 +2,10 @@
 {% load wagtailcore_tags %}
 
 {% block block_render %}
-<div class="row">
+<div class="row {{self.settings.custom_css_class}}"
+     {% if self.settings.custom_id %}
+     id="{{self.settings.custom_id}}"
+     {% endif %}>
   {% if self.title %}
   <h3>{{ self.title }}</h3>
   {% endif %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_list_group.html

@@ -3,7 +3,10 @@
 
 {% block block_render %}
 
-<div class="list-group">
+<div class="list-group {{self.settings.custom_css_class}}"
+     {% if self.settings.custom_id %}
+     id="{{self.settings.custom_id}}"
+     {% endif %}>
     {% for page in pages %}
     {% with page=page.specific %}
     <a class="list-group-item list-group-item-action flex-column align-items-start {% if request.path == page.url %}active{% endif %}" href="{{page.url}}">

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/blocks/pagelist_toc_nextprev.html

@@ -3,11 +3,10 @@
 
 {% block block_render %}
 
-<div class="list-group
-    {% if self.settings.custom_css_class %}
-        {{self.settings.custom_css_class}}
-    {% endif %}
-    ">
+<div class="list-group {{self.settings.custom_css_class}}"
+     {% if self.settings.custom_id %}
+     id="{{self.settings.custom_id}}"
+     {% endif %}>
     {% if self.title %}
     <h5 class="fw-bold">{{self.title}}</h5>
     {% endif %}

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/pages/search.html

@@ -35,19 +35,26 @@
         </form>
         {# endif #}
 
-        {% if pagetypes %}
+        {% if results_by_model %}
         {% query_update request.GET 'p' None as qs_nop %}
         <div class="mt-5">
             <ul class="nav nav-pills">
                 <li class="nav-item">
                     {% query_update qs_nop 't' None as qs_t %}
-                    <a class="nav-link {% if not form.t.value %}active{% endif %}" href="?{{qs_t.urlencode}}">{% trans 'All Results' %}</a>
-                </li>
-                {% 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|get_plural_name_of_class}}</a>
+                    <a class="nav-link {% if not form.t.value %}active{% endif %}" href="?{{ qs_t.urlencode }}">{% trans 'All Results' %}</a>
                 </li>
+                {% for key, result in results_by_model.items %}
+                    {% if result.count > 0 %}
+                        {% query_update qs_nop 't' key as qs_t %}
+                        <li class="nav-item">
+                            <a class="nav-link {% if form.t.value == key %}active{% endif %}" href="?{{ qs_t.urlencode }}">{{ result.model|get_plural_name_of_class }}
+                            <span class="badge badge-info">
+                                {{ result.count }}
+                                <span class="visually-hidden">search results</span>
+                            </span>
+                        </a>
+                        </li>
+                    {% endif %}
                 {% endfor %}
             </ul>
         </div>

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templates/cjkcms/widgets/checkbox_classifiers.html

@@ -24,12 +24,8 @@
     {% endwith %}
 {% else %}
     {% load i18n %}
-    <div class="cjkcms-callout">
+    <div class="">
         <div class="cjkcms-big-icon icon icon-snippet"></div>
-        <h3>
-            <span class="cjkcms-new">{% trans "New!" %}</span>
-            {% trans "Organize Pages with Classifiers" %}
-        </h3>
         <p>
             {% trans "Use Classifiers to create custom categories and filters."%}
         </p>

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/templatetags/friendly_loader.py

@@ -2,6 +2,7 @@
 https://github.com/ataylor32/django-friendly-tag-loader/blob/master/src/friendlytagloader/templatetags/friendly_loader.py
 Sadly, this repo has not been updated for 3 years
 """
+
 import contextlib
 
 from django import template

{wagtail_cjkcms-25.1.10 → wagtail_cjkcms-25.2.2}/cjkcms/tests/settings.py

@@ -1,6 +1,7 @@
 """
 Settings for running tests
 """
+
 import os
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))