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

cjkcms/__init__.py

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

cjkcms/templates/cjkcms/blocks/button_block.html

@@ -1,8 +1,8 @@
-{% load cjkcms_tags %}
+{% load cjkcms_tags wagtailcore_tags %}
 
 {% can_show_item value.visible_for as csi %}
 {% if csi %}
-<a href="{{self.url}}"
+<a href="{% if request.LANGUAGE_CODE and request.LANGUAGE_CODE != 'en' %}/{{ request.LANGUAGE_CODE }}{% endif %}{{ self.url }}"
     {% if settings.cjkcms.AnalyticsSettings.ga_track_button_clicks %}
         data-ga-event-category='{{self.settings.ga_tracking_event_category|default:"Button"}}'
         data-ga-event-label='{{self.settings.ga_tracking_event_label|default:self.button_title}}'

cjkcms/templates/cjkcms/pages/search.html

@@ -60,7 +60,11 @@
             {% for page in results_paginated %}
             <div class="mb-5">
                 {% with page=page.specific %}
-                    {% include page.search_template %}
+                    {% if page.search_template %}
+                        {% include page.search_template %}
+                    {% else %}
+                        {% include "cjkcms/pages/search_result.html" %}
+                    {% endif %}
                 {% endwith %}
             </div>
             {% endfor %}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.9.1
+Version: 24.10.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.9.1.dist-info → wagtail_cjkcms-24.10.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cjkcms/__init__.py,sha256=4D9a_2NzNWo4xFQqMdyqNNW_QbrmXsmL3cnNF97-Wog,272
+cjkcms/__init__.py,sha256=7Y2-d_V4x4pTA_2fk-CkTOblqr9l2rz_iiQW-EmN_60,273
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
@@ -179,7 +179,7 @@ cjkcms/templates/cjkcms/blocks/article_block_card.html,sha256=37Xb0XNGVSyWP8gXVG
 cjkcms/templates/cjkcms/blocks/article_masonry_card.html,sha256=rW1fDJrERAw_1u391An7F8mvqmrvM2xLcXS9gAgfwuM,1132
 cjkcms/templates/cjkcms/blocks/base_block.html,sha256=i1iRaLNqVF5Cd_Tv56TbXrA8uBCChnRMRagN047Rx2I,188
 cjkcms/templates/cjkcms/blocks/base_link_block.html,sha256=EznK9jWFFC_k8mEyi3W_h0w3CNvB_jubYsTawAEvivY,2675
-cjkcms/templates/cjkcms/blocks/button_block.html,sha256=p34BZn4P0C5s7eYnw6d7jl2h5nEVKFwE31aXoQbx6kk,740
+cjkcms/templates/cjkcms/blocks/button_block.html,sha256=cNovMRdHugaR0gQhYws-Mm9PiJHZAWF1MlE620HOJUQ,862
 cjkcms/templates/cjkcms/blocks/card_block.html,sha256=Z5wzPM7-X3QWx5B_CAO2e5ei9OyNwUD4m4h_HV2Bj5c,746
 cjkcms/templates/cjkcms/blocks/card_blurb.html,sha256=QUIK1Xv7cIvTA17wXSp0FKCSobQhBWqLqPIWMNvd2u8,856
 cjkcms/templates/cjkcms/blocks/card_foot.html,sha256=VPGJRBTAf_n73wS_nNryccnrmrGNGy9NodPxgI_3ioc,786
@@ -276,7 +276,7 @@ cjkcms/templates/cjkcms/pages/base.html,sha256=cdr1wUFE74HztUT1RpIKay7lhg8RGo99u
 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
-cjkcms/templates/cjkcms/pages/search.html,sha256=-OnyMV9hYGr94KVq6N2QEAjO--9ccTXOhs-YBps4Yvc,2613
+cjkcms/templates/cjkcms/pages/search.html,sha256=-48UPLBhEmd2bMVg8mz4GvcIm5OLkcbiqKltgLLzges,2802
 cjkcms/templates/cjkcms/pages/search_result.html,sha256=peGL-4UtHGQdYlmdUqGUX3MxZLuw4EcxY00yQFW_7Ag,582
 cjkcms/templates/cjkcms/pages/web_page.html,sha256=floOVzOyPYvTMKfWd3pY0vyrqG7jt4WS5xJt3j6gZM0,594
 cjkcms/templates/cjkcms/pages/web_page_notitle.html,sha256=HjwzN8NpJBOVjKM6_cLtPfUllotFMkvQPLXL2aoB6A0,378
@@ -322,17 +322,15 @@ cjkcms/tests/test_templatetags.py,sha256=RHaIn93G8Aa2lG3JTHSPhFOTLBa4AWXJnwXa9Us
 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.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.10.1.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-24.10.1.dist-info/METADATA,sha256=VTtMmsBEBdBB6k-orM-AGdJxuOzKL1tQt6ZLQswSBwI,3107
+wagtail_cjkcms-24.10.1.dist-info/WHEEL,sha256=OpXWERl2xLPRHTvd2ZXo_iluPEQd8uSbYkJ53NAER_Y,109
+wagtail_cjkcms-24.10.1.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-24.10.1.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-24.10.1.dist-info/RECORD,,

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

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