wagtail-cjkcms 24.8.1__py2.py3-none-any.whl → 24.9.1__py2.py3-none-any.whl

cjkcms/__init__.py

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

cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py

@@ -0,0 +1,23 @@
+# 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'),
+        ),
+    ]

cjkcms/models/page_models.py

@@ -208,6 +208,25 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         blank=True, max_length=255, choices=None, verbose_name=_("Template")  # type: ignore  # noqa: E501
     )
 
+    ###############
+    # Breadcrumbs fields (on layout tab)
+    ###############
+
+    breadcrumbs_visible = models.BooleanField(
+        default=True,
+        verbose_name=_("Breadcrumbs"),
+        help_text=_(
+            "Show breadcrumbs in this page header. For global change, see Settings->Layout"
+        ),
+    )
+
+    breadcrumb_label = models.CharField(
+        blank=True,
+        max_length=128,
+        verbose_name=_("Breadcrumb label"),
+        help_text=_("If empty, page title will be used."),
+    )
+
     ###############
     # SEO overrides
     ###############
@@ -269,6 +288,13 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
 
     layout_panels = [
         MultiFieldPanel([FieldPanel("custom_template")], heading=_("Visual Design")),
+        MultiFieldPanel(
+            [
+                FieldPanel("breadcrumbs_visible"),
+                FieldPanel("breadcrumb_label"),
+            ],
+            heading=_("Breadcrumbs settings"),
+        ),
         MultiFieldPanel(
             [
                 FieldPanel("index_show_subpages"),
@@ -347,6 +373,13 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         edit_handler = TabbedInterface(panels)
         return edit_handler.bind_to_model(cls)
 
+    @property
+    def breadcrumb_title(self) -> str:
+        """
+        Gets breadcrumb title, or page title if not set.
+        """
+        return self.breadcrumb_label or self.title  # type: ignore
+
     @property
     def default_seo_image(self) -> "Optional[AbstractImage]":
         """

cjkcms/models/wagtailsettings_models.py

@@ -261,6 +261,22 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
         help_text=_("Show breadcrumbs in page header"),
     )
 
+    # # defines layout for the breadcrumb: full, shortened
+    # breadcrumb_layout_default = "full"
+    # breadcrumb_layout_choices = (
+    #     ("full", _("Display full")),
+    #     ("shortened_dots", _("Shortened with dots in middle levels")),
+    #     ("shortened_mobile_dots", _("Shortened with dots on mobile view")),
+    # )
+
+    # breadcrumb_layout = models.CharField(
+    #     max_length=255,
+    #     choices=breadcrumb_layout_choices,
+    #     default=breadcrumb_layout_default,
+    #     blank=True,
+    #     verbose_name=_("Breadcrumbs layout"),
+    # )
+
     breadcrumb_icon = models.CharField(
         blank=True,
         max_length=32,

cjkcms/templates/cjkcms/pages/base.html

@@ -92,7 +92,7 @@
                     {% endif %}
                 {% endblock %}
 
-                {% if settings.cjkcms.LayoutSettings.breadcrumbs %}
+                {% if settings.cjkcms.LayoutSettings.breadcrumbs and page.breadcrumbs_visible %}
                 {% block breadcrumbs %}{% endblock %}
                 {% endif %}
 

cjkcms/templates/cjkcms/robots.txt

@@ -3,4 +3,4 @@ Disallow: /backend/
 Disallow: /django-backend/
 Allow: /
 
-Sitemap: https://yourdomain.com/sitemap.xml
+Sitemap: /sitemap.xml

cjkcms/templates/cjkcms/snippets/breadcrumbs.html

@@ -10,7 +10,7 @@
             <li class="none">
                 <object type="image/svg+xml" data="{% static 'cjkcms/images/icons/'|add:settings.cjkcms.LayoutSettings.breadcrumb_icon|add:'.svg' %}" 
                 class="opacity-75" style="margin-bottom:-2px;"></object> 
-                <a href="{{ p.url }}">{{ p.title }}</a>
+                <a href="{{ p.url }}">{{ p.specific.breadcrumb_title }}</a>
             </li>
             
             {% endif %}
@@ -18,7 +18,7 @@
         <li class="breadcrumb-item active ms-1" aria-current="page">
             <object type="image/svg+xml" data="{% static 'cjkcms/images/icons/'|add:settings.cjkcms.LayoutSettings.breadcrumb_icon|add:'.svg' %}" 
             class="opacity-75" style="margin-bottom:-2px;"></object> 
-            {{ page.title }}</li>
+            {{ page.breadcrumb_title }}</li>
         {% endblock %}
         </ol>
     </nav>

cjkcms/templatetags/cjkcms_tags.py

@@ -301,3 +301,14 @@ def is_in_past(the_date):
         datetime_date = datetime(the_date.year, the_date.month, the_date.day)
         return datetime_date < datetime.now()
     return False
+
+
+@register.simple_tag
+def first_non_empty(*args):
+    """
+    Returns the first non-empty argument.
+    """
+    for arg in args:
+        if arg:
+            return arg
+    return ""

cjkcms/tests/test_templatetags.py

@@ -7,7 +7,7 @@ from cjkcms.models import AdobeApiSettings
 from datetime import datetime, timedelta
 from django.test import TestCase
 from django.template import Template, Context
-from cjkcms.templatetags.cjkcms_tags import is_in_future, is_in_past
+from cjkcms.templatetags.cjkcms_tags import is_in_future, is_in_past, first_non_empty
 
 
 django_engine = engines["django"]
@@ -142,3 +142,21 @@ class TemplateTagTests(TestCase):
         context = Context({"the_date": datetime.now() - timedelta(days=1)})
         result = template.render(context)
         self.assertEqual(result, "past")
+
+    def test_all_empty(self):
+        self.assertEqual(first_non_empty("", None, False, 0), "")
+
+    def test_first_non_empty(self):
+        self.assertEqual(first_non_empty("", None, "first", "second"), "first")
+
+    def test_middle_non_empty(self):
+        self.assertEqual(first_non_empty("", None, "first", "second"), "first")
+
+    def test_last_non_empty(self):
+        self.assertEqual(first_non_empty("", None, "", "last"), "last")
+
+    def test_all_non_empty(self):
+        self.assertEqual(first_non_empty("first", "second", "third"), "first")
+
+    def test_no_arguments(self):
+        self.assertEqual(first_non_empty(), "")

{wagtail_cjkcms-24.8.1.dist-info → wagtail_cjkcms-24.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.8.1
+Version: 24.9.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

{wagtail_cjkcms-24.8.1.dist-info → wagtail_cjkcms-24.9.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cjkcms/__init__.py,sha256=SgMT7Zs_-ZNaOqpA0rxgl7wwkic5edW6lZVl43pKAZk,272
+cjkcms/__init__.py,sha256=4D9a_2NzNWo4xFQqMdyqNNW_QbrmXsmL3cnNF97-Wog,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
@@ -53,14 +53,15 @@ cjkcms/migrations/0018_layoutsettings_search_format.py,sha256=NURMUoMyg20hSM_IDc
 cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py,sha256=SeA-oN5r9uePXOfPv57ETfGF_ZzNpv9vnkA_rmATXUY,1504
 cjkcms/migrations/0020_socialmediasettings_github_and_more.py,sha256=flCSiw6wB32wsxSln2NA66zWkxrJLhNfL1O3UInH2to,1044
 cjkcms/migrations/0021_remove_layoutsettings_navbar_color_scheme_and_more.py,sha256=lOOyu3QHjnjZY3HwXWCvUBxngm-t_sk4TvuxZ2Cq_j4,2723
+cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py,sha256=UqXcsDPMsJOewtU3aTl1R4ZE5I45ykiIEepQBALzno0,812
 cjkcms/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/models/__init__.py,sha256=f99GmxfFxGtQl8JvZFz8rAtklCIesLoSccyhhi2xgPU,232
 cjkcms/models/admin_sidebar.py,sha256=R3gtDUfbtdVPLNb-__XZWYk9Ap5k9WkHc-u6XDhesdc,665
 cjkcms/models/cms_models.py,sha256=9U46xwPidQfUlXnuVUW5IbtphXX_8djJD4CohoP3NbU,2356
 cjkcms/models/integration_models.py,sha256=L29OBwLH8DfHtDplu218UGbbvL94Erk3J_R7n365zQM,6302
-cjkcms/models/page_models.py,sha256=cV5Q5Xc3CORB5bXXxQ8ODTZwUYWq5LlUTYaIIUpJkdw,24525
+cjkcms/models/page_models.py,sha256=-9SLMKA5KI2gMMOTaAtpr4pE2RhidilaRRzF7nnE0WI,25454
 cjkcms/models/snippet_models.py,sha256=BQeq3Bqr3c0DRKExGqz4VlQhoTnTKjEjOTYuwJ2wqU8,16837
-cjkcms/models/wagtailsettings_models.py,sha256=WBEAo5fK9BxLPHRBUKA3KQBZm-QqbKdkqv3gGR4nBrA,22467
+cjkcms/models/wagtailsettings_models.py,sha256=ntgbGOquVmgbMehgV36KEiS25olqr_m5Ff7Ce7Pq61Y,23041
 cjkcms/project_template/basic/.editorconfig,sha256=1wgq7hgAUSHLfuy4Jh9BJ4ysyQL0si5UBbCu_OMz9hg,722
 cjkcms/project_template/basic/.gitattributes,sha256=TXzwnsENJoG4wiS2LEREDeZ0JI_vRGA6EEijwUCVJvE,364
 cjkcms/project_template/basic/.gitignore,sha256=EBotJhW2lEZ9u6nXwClkSq9rVawXsCh6h4u38g3lM_I,275
@@ -172,7 +173,7 @@ cjkcms/static/vendor/mdb/js/mdb.umd.min.js,sha256=6ExxHAv6V4GggQXwu1gkXc4MHtdiqK
 cjkcms/static/vendor/mdb/js/mdb.umd.min.js.map,sha256=1k9rRQNB3hrVj47Anhg19MtXioMnuffFMh34NEyrBcY,502496
 cjkcms/templates/404.html,sha256=GnIFZoXMcFzz_UTMChOgbO6-IIWQZKaAom7OJXn6dao,3245
 cjkcms/templates/500.html,sha256=YWYel2g2SDKLwSv8C9VLPzVvkcRLo6X9WYwWjxnfz0U,4802
-cjkcms/templates/cjkcms/robots.txt,sha256=UvpkMM2JFcYA-igs8t37RtQgYSqRkyl1GSgiCHhb8aw,114
+cjkcms/templates/cjkcms/robots.txt,sha256=669-RWM9DZYUfyxUvl2Fxn6pcZ_7Efbb7HeZYoR0DWo,92
 cjkcms/templates/cjkcms/blocks/accordion_block.html,sha256=9gsMZMflXqdYcFVqf8YOsyb3YYHgC26Sug_tzGvc6N8,1443
 cjkcms/templates/cjkcms/blocks/article_block_card.html,sha256=37Xb0XNGVSyWP8gXVGh742eZmW-3hFSmEAfCe5QOrvo,974
 cjkcms/templates/cjkcms/blocks/article_masonry_card.html,sha256=rW1fDJrERAw_1u391An7F8mvqmrvM2xLcXS9gAgfwuM,1132
@@ -271,7 +272,7 @@ cjkcms/templates/cjkcms/includes/stream_forms/render_field.html,sha256=F3FHztOTG
 cjkcms/templates/cjkcms/pages/article_index_page.html,sha256=K_5xM-d2EPDJ961LLqiOLompzSoJz1cHQbwvRNDZfH4,2002
 cjkcms/templates/cjkcms/pages/article_page.html,sha256=jXOAOznaiSPULcZQB-A8AYmeTU9-xEWcyAgnrYAJ74Y,2031
 cjkcms/templates/cjkcms/pages/article_page.search.html,sha256=0L4zGoqu1SP1F2BIIYeD9IMaxpjIsqawpIzEN8e94kY,1018
-cjkcms/templates/cjkcms/pages/base.html,sha256=CBBRV4PLVhj85rk055mWgSPj6uTx2YaxkWjkjWQn7tw,9574
+cjkcms/templates/cjkcms/pages/base.html,sha256=cdr1wUFE74HztUT1RpIKay7lhg8RGo99u-Rfdkm6zlY,9603
 cjkcms/templates/cjkcms/pages/form_page_landing.html,sha256=zdySSHOWF10-x2MFLH9XMjeFSeNTMRM-VpvZ1tM8kw0,248
 cjkcms/templates/cjkcms/pages/home_page.html,sha256=67h2o3EVXsrivMqM26OZV-7-H_9vv1clFJ4MFMknIMU,50
 cjkcms/templates/cjkcms/pages/page.mini.html,sha256=VR3lTCUgHPXTd2HAlNrxQAmNjS_0VGzfQccUV5IeDXc,506
@@ -281,7 +282,7 @@ cjkcms/templates/cjkcms/pages/web_page.html,sha256=floOVzOyPYvTMKfWd3pY0vyrqG7jt
 cjkcms/templates/cjkcms/pages/web_page_notitle.html,sha256=HjwzN8NpJBOVjKM6_cLtPfUllotFMkvQPLXL2aoB6A0,378
 cjkcms/templates/cjkcms/snippets/actionbar.html,sha256=gI_fVpM7InInvEOaqb1Xs5a0NHQVE8MKKeE2PI_eXLs,31
 cjkcms/templates/cjkcms/snippets/bottom_corner_lang_selector.html,sha256=_gcHmob1tMeT3_KppsozcWw4F1ocyF3YiOunUmBesjs,1943
-cjkcms/templates/cjkcms/snippets/breadcrumbs.html,sha256=zvugWh1kS2Eobn1T4eq1XEngn49z1ME7IlEwrmXUxyo,1311
+cjkcms/templates/cjkcms/snippets/breadcrumbs.html,sha256=3flWNTJ568V4l9HTuYK5vZ7Mm6L1S0Qk8dKmQP0boDM,1342
 cjkcms/templates/cjkcms/snippets/footer.html,sha256=_QUtV_LHgGjh-XLzw5Fd_Lxdrx9on5G0luFaa6oirB0,430
 cjkcms/templates/cjkcms/snippets/frontend_assets.html,sha256=2q24FFzOiM2USJiI1tuNTdJZGvRQnMPjAwTA0AlGNiU,1656
 cjkcms/templates/cjkcms/snippets/frontend_scripts.html,sha256=kO3lpKZylriXj27ff6ubtDXkpqOwqSZM256iM6cCuHM,510
@@ -302,7 +303,7 @@ cjkcms/templates/wagtailadmin/shared/cr_main_nav_2fix.html,sha256=BAhkDE8_8KbhUO
 cjkcms/templates/wagtailadmin/tables/thumbnail_cell.html,sha256=RzMT-tBnnDOgL-zexKanZTTpCEX1bMybFL2p_zvOEV4,578
 cjkcms/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/templatetags/auth_extras.py,sha256=IIxQ5n9FaQVZmhW-yW1XM5p2OjIemtqVoX-O-UcCns8,327
-cjkcms/templatetags/cjkcms_tags.py,sha256=OE42fZ8_IoadhVKTXxoNuRB00D_W7Xg-7RxWWxMZAgk,8721
+cjkcms/templatetags/cjkcms_tags.py,sha256=BLLtgWnzvzHvuDZlvcJMSZaXo5EjPtk1J7_94J0aZUg,8904
 cjkcms/templatetags/friendly_loader.py,sha256=Zwopb9NNNN6IuDJCMFlwKuhmJC0hi4uTPEZSAxeakYY,4962
 cjkcms/templatetags/gravatar.py,sha256=JG5MB6HUFso15J8gZ_te5FTMYAuo4km8rzMKKvLLh-E,1127
 cjkcms/templatetags/txtutils_tags.py,sha256=UMojdiLt6Jpijc-2QLusPc-qXX9bqFZf0JbqqPsfnWQ,1223
@@ -317,19 +318,21 @@ cjkcms/tests/test_finders_oembed.py,sha256=J-dG3aTsO2KXnUA0o4yKHh_r5Za9v_8gcXJQG
 cjkcms/tests/test_gravatar.py,sha256=UWu1cVi3Gj96yqeQu795gw6FVPbZ44eCkkH1NGEGgBo,2629
 cjkcms/tests/test_search_blocks.py,sha256=0ARZwVOgAkoAZQFo99adt4ZpogfPwaYms6ZbbluSbmw,4919
 cjkcms/tests/test_settings.py,sha256=n2B-qtaSdMJC4KuMGGx6qo5HIU73aaImbMkI_o7tK8A,2665
-cjkcms/tests/test_templatetags.py,sha256=deNuZtSlr29hokn7azTyB2FhwnG3x0L13bjdHGA4jrw,5313
+cjkcms/tests/test_templatetags.py,sha256=RHaIn93G8Aa2lG3JTHSPhFOTLBa4AWXJnwXa9Us5iqI,5966
 cjkcms/tests/test_urls.py,sha256=v0MnVUzJmUcpnPQ0jTkslUqsj0gfbCEmyQw7_zualWk,2832
 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/original_images/test.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=Rkn9KHrGbLzrKjP4y_gwtXma1_fJOZNU7ekb689fJEU,488
 cjkcms/tests/testapp/migrations/0001_initial.py,sha256=hxr-r-42IQEGr_OsZkxXXCW7wbxAHuI_OLOkn-seJUU,4942
 cjkcms/tests/testapp/migrations/0002_create_homepage.py,sha256=EfsxHh1oyqwahW9RVpTvaRDx_CHtFSJQahKEr7XC5Gg,1999
 cjkcms/tests/testapp/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wagtail_cjkcms-24.8.1.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-24.8.1.dist-info/METADATA,sha256=Z-HbKBHoViO1zl1u8-M9fZtWe4msFkUqZzIiB5ygUkU,3106
-wagtail_cjkcms-24.8.1.dist-info/WHEEL,sha256=GUeE9LxUgRABPG7YM0jCNs9cBsAIx0YAkzCB88PMLgc,109
-wagtail_cjkcms-24.8.1.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-24.8.1.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-24.8.1.dist-info/RECORD,,
+wagtail_cjkcms-24.9.1.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-24.9.1.dist-info/METADATA,sha256=6tGGR3pFPV_FztoU7z6hQhaq-t828M0b1EvbqjLx-mc,3106
+wagtail_cjkcms-24.9.1.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
+wagtail_cjkcms-24.9.1.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-24.9.1.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-24.9.1.dist-info/RECORD,,

{wagtail_cjkcms-24.8.1.dist-info → wagtail_cjkcms-24.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any