wagtail-cjkcms 24.12.4__py2.py3-none-any.whl → 25.1.2__py2.py3-none-any.whl

cjkcms/__init__.py

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

cjkcms/blocks/content_blocks.py

@@ -182,17 +182,6 @@ class NavBaseLinkBlock(BaseBlock):
         label=_("Image"),
     )
 
-    if cms_settings.CJKCMS_NAVBAR_SHOW_VISIBLE_FOR:
-        visible_for = blocks.ChoiceBlock(
-            choices=cms_settings.CJKCMS_AUTH_VISIBILITY_CHOICES,
-            default=cms_settings.CJKCMS_AUTH_VISIBILITY_DEFAULT,
-            required=False,
-            label=_("Item visibility"),
-            help_text=_(
-                "DEPRECATED. Use the visibility options in the `Advanced Settings`. "
-            ),
-        )
-
 
 class NavExternalLinkBlock(NavBaseLinkBlock):
     """

cjkcms/settings.py

@@ -485,10 +485,6 @@ class _DefaultSettings:
     CJKCMS_VERSION_MONITOR_TOKEN = ""  # blank token = disabled version monitor api
     CJKCMS_VERSION_MONITOR_ALLOWED_DOMAINS = []  # disallow from any domain by default
 
-    CJKCMS_NAVBAR_SHOW_VISIBLE_FOR = (
-        False  # safety fallback for a deprecated and removed feature
-    )
-
     def __getattribute__(self, attr: str):
         # First load from Django settings.
         # If it does not exist, load from _DefaultSettings.

cjkcms/templates/cjkcms/blocks/base_link_block.html

@@ -1,61 +1,56 @@
 {% load cjkcms_tags wagtailcore_tags wagtailimages_tags %}
 
 {% block menu_item %}
-    {% can_show_item value.visible_for as csi %}
-    {% if csi %}
-        {% if value.page.live or value.link or value.document %}
-        {% is_menu_item_dropdown value as has_dropdown %}
-        <li class="{{liclass}} {% if has_dropdown %}dropdown{% endif %}">
-            {% is_active_page page value.page as is_active_url %}
-            <a href="{% block url %}#{% endblock %}"
-            {% if value.settings.custom_id %}id="{{value.settings.custom_id}}"{% endif %}
-            class="{{aclass}} {% if has_dropdown %}dropdown-toggle{% endif %}
-                    {% if is_active_url %}active{% endif %}
-                    {{value.settings.custom_css_class}}"
-            {% if has_dropdown %}data-bs-toggle="dropdown"
-            data-mdb-dropdown-init
-            data-mdb-ripple-init
-            role="button"
-            aria-haspopup="true"
-            aria-expanded="false"
+    {% if value.page.live or value.link or value.document %}
+    {% is_menu_item_dropdown value as has_dropdown %}
+    <li class="{{liclass}} {% if has_dropdown %}dropdown{% endif %}">
+        {% is_active_page page value.page as is_active_url %}
+        <a href="{% block url %}#{% endblock %}"
+        {% if value.settings.custom_id %}id="{{value.settings.custom_id}}"{% endif %}
+        class="{{aclass}} {% if has_dropdown %}dropdown-toggle{% endif %}
+                {% if is_active_url %}active{% endif %}
+                {{value.settings.custom_css_class}}"
+        {% if has_dropdown %}data-bs-toggle="dropdown"
+        data-mdb-dropdown-init
+        data-mdb-ripple-init
+        role="button"
+        aria-haspopup="true"
+        aria-expanded="false"
+        {% endif %}
+        {% if ga_event_label %}
+        data-ga-event-label="{{ ga_event_label }}"
+        {% endif %}
+        {% if ga_event_category %}
+        data-ga-event-category="{{ ga_event_category }}"
+        {% endif %}
+        >
+            {% if value.image %}
+                {% image value.image max-200x200 as img %}
+                <img src="{{img.url}}" class="w-100" alt="{{img.image.title}}"/>
+            {% elif value.display_text %}
+                {% link_display value.display_text as dt %}
+                {{dt|safe}}
+            {% elif value.page %}
+                {{value.page.title}}
+            {% elif value.document %}
+                {{value.document.title}}
             {% endif %}
-            {% if ga_event_label %}
-            data-ga-event-label="{{ ga_event_label }}"
-            {% endif %}
-            {% if ga_event_category %}
-            data-ga-event-category="{{ ga_event_category }}"
-            {% endif %}
-            >
-                {% if value.image %}
-                    {% image value.image max-200x200 as img %}
-                    <img src="{{img.url}}" class="w-100" alt="{{img.image.title}}"/>
-                {% elif value.display_text %}
-                    {% link_display value.display_text as dt %}
-                    {{dt|safe}}
-                {% elif value.page %}
-                    {{value.page.title}}
-                {% elif value.document %}
-                    {{value.document.title}}
-                {% endif %}
-            </a>
+        </a>
 
 
-            {% if has_dropdown %}
-            <ul class="dropdown-menu">
-                {% for sub_link in value.sub_links %}
-                    {% include_block sub_link with liclass="" aclass="dropdown-item" %}
+        {% if has_dropdown %}
+        <ul class="dropdown-menu">
+            {% for sub_link in value.sub_links %}
+                {% include_block sub_link with liclass="" aclass="dropdown-item" %}
+            {% endfor %}
+            {% if value.show_child_links %}
+                {% for child in value.page.specific.get_index_children %}
+                    {% is_active_page page child as is_active_child %}
+                    <li><a class="dropdown-item {% if is_active_child %}active{% endif %}" href="{% pageurl child %}">{{child.title}}</a></li>
                 {% endfor %}
-                {% if value.show_child_links %}
-                    {% for child in value.page.specific.get_index_children %}
-                        {% is_active_page page child as is_active_child %}
-                        <li><a class="dropdown-item {% if is_active_child %}active{% endif %}" href="{% pageurl child %}">{{child.title}}</a></li>
-                    {% endfor %}
-                {% endif %}
-            </ul>
-            {% endif %} {# has_dropdown #}
-        </li>
-        {% endif %} {# value.page.live or value.link or value.document #}
-    {% else %} {# csi #}
-        {# NO SHOW #}
-    {% endif %} {# csi #}
+            {% endif %}
+        </ul>
+        {% endif %} {# has_dropdown #}
+    </li>
+    {% endif %} {# value.page.live or value.link or value.document #}
 {% endblock %}

cjkcms/templates/cjkcms/snippets/navbar_search_modal.html

@@ -1,7 +1,7 @@
 {% load wagtailcore_tags cjkcms_tags django_bootstrap5 i18n %}
 
 
-<form action="{% url 'cjkcms_search' %}" method="GET" class="row row-cols-lg-auto g-3 align-items-center">
+<form action="{% url 'cjkcms_search' %}" method="GET" class="align-items-center">
   {% csrf_token %}
   {% get_searchform request as form %}
   {% bootstrap_form_errors form type='non_fields' %}

{wagtail_cjkcms-24.12.4.dist-info → wagtail_cjkcms-25.1.2.dist-info}/METADATA

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

{wagtail_cjkcms-24.12.4.dist-info → wagtail_cjkcms-25.1.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 cjkcms/.DS_Store,sha256=cYcT7MpEwyMj1-CAvcue4ODbL87U2KGsmN7HYD4O8SY,6148
-cjkcms/__init__.py,sha256=yW8u3GSpPqM3OXKEfa9TQgGfLIwYPeM5h_ykGauzn6w,273
+cjkcms/__init__.py,sha256=RI73zzmj0s76wmYc4FBSwTWLrcw6x-wH0xtBF9JbySY,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
 cjkcms/image_formats.py,sha256=d4zRshuybwxSRL8UpBH31dFBr32o4HNexa0ks5PX3TI,1833
 cjkcms/search_urls.py,sha256=92XkGTJRrQQyA061wWl1l5C0vq6INVJPXOrpcgp3aoU,125
-cjkcms/settings.py,sha256=UbC-iUCXgVq9FRyQ5ePXOF6DJ7lQUOF5EMf8V4pA2xc,20440
+cjkcms/settings.py,sha256=ODBpl3Fn3yCX0CYogt0OIGD-2IGaijefwpdZngx3Bnc,20324
 cjkcms/urls.py,sha256=k5tEHWI4Umi2PWvGdNJ-FZ9OCy6AS3Y2S7k5jNOpgt0,644
 cjkcms/utils.py,sha256=u4pkPxAwqH3SgyIcmvk7I5L3w-eIcz0Rphmv0Y1DRpA,2006
 cjkcms/views.py,sha256=NWy3pBBcLUOH6WjEJh03N2sND4oToiyiy6_spgXdUcY,4389
@@ -17,7 +17,7 @@ cjkcms/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/bin/cjkcms.py,sha256=i11hhB11COQhTk05y7mkeIkUYcFjhI8-QxLkN3tCxgg,5763
 cjkcms/blocks/__init__.py,sha256=a54EtWyH8UPqszlVEeOtFCvBW2WmbaW1vR4sZuN9Hf0,3542
 cjkcms/blocks/base_blocks.py,sha256=uKp6QO3iOPT4P0H0yOumvL7faPvLQK9Dj-D8iqlvqQ4,11616
-cjkcms/blocks/content_blocks.py,sha256=LdTS7mVFMvQF6HDcl5iuqOzPe48T8ROFLcad5jGE-6E,10188
+cjkcms/blocks/content_blocks.py,sha256=-bIh3BCNYx0N7iK3mpfnLOzIsSMItgpLeC9Cqg-_dTc,9759
 cjkcms/blocks/html_blocks.py,sha256=rXdR1uxFYDYjOXpxndItxacWstiME8CdqZgB6d5qAYE,9543
 cjkcms/blocks/layout_blocks.py,sha256=n2oVyL-ZQQaEA00HU6YraR59YF065o-OK7WuAahGuiw,3406
 cjkcms/blocks/searchable_html_block.py,sha256=i1rWv4vwwvZ9fxkASwPKl87-TqVHkXOFyohH3ve7pYk,171
@@ -190,7 +190,7 @@ cjkcms/templates/cjkcms/blocks/accordion_block.html,sha256=9gsMZMflXqdYcFVqf8YOs
 cjkcms/templates/cjkcms/blocks/article_block_card.html,sha256=37Xb0XNGVSyWP8gXVGh742eZmW-3hFSmEAfCe5QOrvo,974
 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/base_link_block.html,sha256=3SBZGZ6_kn2NGWK8U2Uri_0Kqh8YCdjmGSSlMXF8TbQ,2336
 cjkcms/templates/cjkcms/blocks/button_block.html,sha256=skwQN6x0FWBYGEQbX1hIg1prgO0AarmzjzdsjmPyvdg,875
 cjkcms/templates/cjkcms/blocks/card_block.html,sha256=Z5wzPM7-X3QWx5B_CAO2e5ei9OyNwUD4m4h_HV2Bj5c,746
 cjkcms/templates/cjkcms/blocks/card_blurb.html,sha256=QUIK1Xv7cIvTA17wXSp0FKCSobQhBWqLqPIWMNvd2u8,856
@@ -302,7 +302,7 @@ cjkcms/templates/cjkcms/snippets/frontend_scripts.html,sha256=kO3lpKZylriXj27ff6
 cjkcms/templates/cjkcms/snippets/navbar.html,sha256=wdF_eJMuHf2sdUMCeINs48FmjrcisNej55jQ8M4ZJXg,2828
 cjkcms/templates/cjkcms/snippets/navbar_lang_selector.html,sha256=sn7KLDentGOsMZ9CNAxdAGLYO3a_mYfSUhJ6iZzteOE,836
 cjkcms/templates/cjkcms/snippets/navbar_search_button.html,sha256=yV6xIWQ3_BdrTEPVp3j0WKqChPui7oC0Zl3C2fUrpes,1075
-cjkcms/templates/cjkcms/snippets/navbar_search_modal.html,sha256=dcFnSw9FjDQWoa_wilUXOUd5CkpjpyOyuqzhXE5sEPk,1474
+cjkcms/templates/cjkcms/snippets/navbar_search_modal.html,sha256=_9jUjJsk2Q1Ya05b5OguZENZl7XGgqjoMe-YDo3cOD4,1449
 cjkcms/templates/cjkcms/snippets/social_media.html,sha256=63Yd0X5I5WhshRlv23H6Hy8e2rBUnrzXedTP5HqP3lE,330
 cjkcms/templates/cjkcms/snippets/social_media_icons.html,sha256=0xR9CdZEhB1hm52LGn1kKCtx4rSl8nO4DPwPua-Oq3M,2829
 cjkcms/templates/cjkcms/snippets/social_media_nav_block.html,sha256=1eavf1UyigPkVgrHMQ3kgfnaEvzXnF22J-YxK5hshn0,173
@@ -339,10 +339,12 @@ cjkcms/tests/test_webpage.py,sha256=PvXeXbawigObsdi_YpQNuHFx3Lqi6wM3ktVHZsxYbr4,
 cjkcms/tests/urls.py,sha256=_ksKz7HBHJtQK3HxC9cmJMX_dt6n4alx3FXjcL-cu28,850
 cjkcms/tests/media/images/test.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
 cjkcms/tests/media/images/test_6mZL9NZ.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
+cjkcms/tests/media/images/test_OSPIkp8.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
 cjkcms/tests/media/images/test_YBCJmYS.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
 cjkcms/tests/media/images/test_q0QJ4UA.original.png,sha256=nLMtadXZhXXbt6DTm5enrysKX7cfWiUudtbS2X7mSzI,1938
 cjkcms/tests/media/original_images/test.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
 cjkcms/tests/media/original_images/test_6mZL9NZ.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
+cjkcms/tests/media/original_images/test_OSPIkp8.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
 cjkcms/tests/media/original_images/test_YBCJmYS.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
 cjkcms/tests/media/original_images/test_q0QJ4UA.png,sha256=xJDvcufuQ-AM1HT-zgMxYEORko4rdK_8MSHU-puJNW8,2306
 cjkcms/tests/testapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -351,9 +353,9 @@ cjkcms/tests/testapp/models.py,sha256=Rkn9KHrGbLzrKjP4y_gwtXma1_fJOZNU7ekb689fJE
 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.12.4.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-24.12.4.dist-info/METADATA,sha256=u7RNDX6rg2hOFyjqBC4sG6LB3LEqR0sDXhtPItUBa3o,3121
-wagtail_cjkcms-24.12.4.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-wagtail_cjkcms-24.12.4.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-24.12.4.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-24.12.4.dist-info/RECORD,,
+wagtail_cjkcms-25.1.2.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-25.1.2.dist-info/METADATA,sha256=mA-dMT4EB-kxWHPaNArE4iQWEzC2kmkK9DJhdPNBrmg,3120
+wagtail_cjkcms-25.1.2.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+wagtail_cjkcms-25.1.2.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-25.1.2.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-25.1.2.dist-info/RECORD,,