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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.2.1
+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.2.1 → wagtail_cjkcms-25.2.2}/cjkcms/__init__.py

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

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.2.1 → 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):
@@ -635,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.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → 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.2.1 → wagtail_cjkcms-25.2.2}/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)

wagtail_cjkcms-25.2.2/cjkcms/utils/__init__.py

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

wagtail_cjkcms-25.2.2/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)

wagtail_cjkcms-25.2.1/cjkcms/utils.py → wagtail_cjkcms-25.2.2/cjkcms/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,

{wagtail_cjkcms-25.2.1 → wagtail_cjkcms-25.2.2}/requirements.txt

@@ -1,6 +1,6 @@
 django-bootstrap5
 django>=4.2
 wagtail>=5.1
-wagtail-seo>=2.5.0
+wagtail-seo>=3.0
 wagtail-cache>=2.5.1
 cjkcms-color-panel

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.2.1
+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.2.1 → wagtail_cjkcms-25.2.2}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ cjkcms/image_formats.py
 cjkcms/search_urls.py
 cjkcms/settings.py
 cjkcms/urls.py
-cjkcms/utils.py
 cjkcms/views.py
 cjkcms/wagtail_hooks.py
 cjkcms/widgets.py
@@ -64,6 +63,7 @@ cjkcms/migrations/0020_socialmediasettings_github_and_more.py
 cjkcms/migrations/0021_remove_layoutsettings_navbar_color_scheme_and_more.py
 cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py
 cjkcms/migrations/0023_alter_navbar_language.py
+cjkcms/migrations/0024_remove_cjkcmspage_struct_org_actions_and_more.py
 cjkcms/migrations/__init__.py
 cjkcms/models/__init__.py
 cjkcms/models/admin_sidebar.py
@@ -341,27 +341,28 @@ cjkcms/tests/test_urls.py
 cjkcms/tests/test_webpage.py
 cjkcms/tests/urls.py
 cjkcms/tests/media/images/test.original.png
-cjkcms/tests/media/images/test_IocDjKv.original.png
-cjkcms/tests/media/images/test_LH2dPwn.original.png
-cjkcms/tests/media/images/test_O3GLriA.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_qOYmckb.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_sCFpDtv.original.png
+cjkcms/tests/media/images/test_w289mH5.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_IocDjKv.png
-cjkcms/tests/media/original_images/test_LH2dPwn.png
-cjkcms/tests/media/original_images/test_O3GLriA.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_qOYmckb.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_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
 cjkcms/tests/testapp/migrations/0001_initial.py
 cjkcms/tests/testapp/migrations/0002_create_homepage.py
 cjkcms/tests/testapp/migrations/__init__.py
+cjkcms/utils/__init__.py
+cjkcms/utils/richtext.py
+cjkcms/utils/visibility.py
 docs/index.md
 docs/requirements.txt
 docs/unit_testing.md

{wagtail_cjkcms-25.2.1 → wagtail_cjkcms-25.2.2}/wagtail_cjkcms.egg-info/requires.txt

@@ -1,6 +1,6 @@
 django-bootstrap5
 django>=4.2
 wagtail>=5.1
-wagtail-seo>=2.5.0
+wagtail-seo>=3.0
 wagtail-cache>=2.5.1
 cjkcms-color-panel