wagtail-cjkcms 24.12.3__py2.py3-none-any.whl → 25.1.1__py2.py3-none-any.whl

cjkcms/__init__.py

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

cjkcms/blocks/content_blocks.py

@@ -2,6 +2,7 @@
 Content blocks are for building complex, nested HTML structures that usually
 contain sub-blocks, and may require javascript to function properly.
 """
+
 from django.utils.translation import gettext_lazy as _
 from wagtail import blocks
 from wagtail.documents.blocks import DocumentChooserBlock
@@ -180,15 +181,6 @@ class NavBaseLinkBlock(BaseBlock):
         required=False,
         label=_("Image"),
     )
-    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/migrations/0023_alter_navbar_language.py

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

cjkcms/static/cjkcms/css/cjkcms-front.css

@@ -253,13 +253,39 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
 }
 
 .-fixed-img-offset {
-  margin-top: 76px;
+  margin-top: 104px;
 }
 
 .-fixed-offset {
-  margin-top: 56px;
+  margin-top: 104px;
 }
 
+.cjkcms-navbar-center-fixed-img-offset {
+  margin-top: 175px;
+}
+
+.cjkcms-navbar-center-fixed-offset {
+  margin-top: 104px;
+}
+
+.cjkcms-navbar-center {
+  text-align: center;
+}
+
+.cjkcms-navbar-center .navbar-collapse {
+  justify-content: center;
+}
+
+.cjkcms-navbar-center .navbar-brand {
+  margin: 0;
+}
+
+.cjkcms-navbar-center .navbar-brand img {
+  height: 150px;
+  width: auto;
+}
+
+
 [class^="container"] [class^="container"] {
   width: 100%;
   padding: 0;

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.html

@@ -50,7 +50,7 @@
       {% endif %}
 
       {% if settings.cjkcms.LayoutSettings.navbar_search %}
-        {% include "cjkcms/snippets/navbar_search.html" %}
+        {% include "cjkcms/snippets/navbar_search_button.html" %}
       {% endif %}
     </div>
 
@@ -62,11 +62,7 @@
 </div><!-- /.container -->
 {% endif %}
 
-{# Navbar offset #}
-{% if settings.cjkcms.LayoutSettings.navbar_fixed %}
-    {% if settings.cjkcms.LayoutSettings.logo %}
-      <div class="{{settings.cjkcms.LayoutSettings.navbar_format}}-fixed-img-offset {{settings.cjkcms.LayoutSettings.navbar_collapse_mode}}"></div>
-    {% else %}
-      <div class="{{settings.cjkcms.LayoutSettings.navbar_format}}-fixed-offset {{settings.cjkcms.LayoutSettings.navbar_collapse_mode}}"></div>
-    {% endif %}
-{% endif %}
+{# Search Modal must be injected outside of the nav, because if the nav is fixed/sticky it breaks the modal #}
+{% if settings.cjkcms.LayoutSettings.navbar_search and "popup" in settings.cjkcms.LayoutSettings.search_format %}
+  {% include "cjkcms/snippets/navbar_search_modal.html" %}
+{% endif %}

cjkcms/templates/cjkcms/snippets/navbar_search_button.html

@@ -0,0 +1,18 @@
+{% 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">
+      {% csrf_token %}
+      {% get_searchform request as form %}
+      {% bootstrap_form_errors form type='non_fields' %}        
+        {% if settings.cjkcms.LayoutSettings.search_format == "" or settings.cjkcms.LayoutSettings.search_format|slice:":3" == "box" %}
+          {% bootstrap_field form.s layout='inline' show_label=False %}
+        {% endif %}
+        {% if "button" in settings.cjkcms.LayoutSettings.search_format %}
+        <button type="button" class="{{ settings.cjkcms.LayoutSettings.searchbutton_class }}"
+          {% if 'popup' in settings.cjkcms.LayoutSettings.search_format %}
+           data-mdb-ripple-init data-mdb-modal-init data-mdb-target="#searchModal"
+            data-bs-toggle="modal" data-bs-target="#searchModal"    
+          {% endif %}
+        >{{ settings.cjkcms.LayoutSettings.searchbutton_label | richtext }}</button>
+        {% endif %}
+      
+      </form>

cjkcms/templates/cjkcms/snippets/navbar_search_modal.html

@@ -0,0 +1,34 @@
+{% 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">
+  {% csrf_token %}
+  {% get_searchform request as form %}
+  {% bootstrap_form_errors form type='non_fields' %}
+        <div id="searchModal" class="modal fade" tabindex="-1" aria-labelledby="searchModalLabel" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <h5 class="modal-title" id="searchModalLabel">Search</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" data-mdb-dismiss="modal" aria-label="Close"></button>
+              </div>
+              <div class="modal-body">
+                {% bootstrap_form form layout='inline' %}
+              </div>
+              <div class="modal-footer">
+                <button type="submit" class="{{ settings.cjkcms.LayoutSettings.searchbutton_class }}">
+                  {{ settings.cjkcms.LayoutSettings.searchbutton_label | richtext }}
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <script>
+          var myModal = document.getElementById('searchModal')
+          var myInput = document.getElementById('id_s')
+          
+          myModal.addEventListener('shown.bs.modal', function () {
+            myInput.focus()
+          })
+        </script>
+</form>

cjkcms/templatetags/cjkcms_tags.py

@@ -132,12 +132,25 @@ def get_pictures(collection_id, tag=None):
 @register.simple_tag(takes_context=True)
 def get_navbar_css(context):
     layout = LayoutSettings.for_request(context["request"])
-    fixed = "fixed-top" if layout.navbar_fixed else ""
+    fixed = "sticky-top" if layout.navbar_fixed else ""
+
+    # if layout.navba_class is not set, but layout.navbar_fixed is set,
+    # we need a background color for the navbar to protect from overlapping
+    # content below when scrolling. So, try to guess the navbar class:
+    # if layout.color_scheme is set, use that, else use "navbar-light bg-light"
+    if not layout.navbar_class and layout.navbar_fixed:
+        if layout.color_scheme:
+            layout.navbar_class = (
+                f"navbar-{layout.color_scheme} bg-{layout.color_scheme}"
+            )
+        else:
+            layout.navbar_class = "navbar-light bg-light"
+
     return " ".join(
         [
             fixed,
             layout.navbar_collapse_mode,
-            layout.color_scheme,
+            # layout.color_scheme,
             layout.navbar_format,
             layout.navbar_class,
         ]
@@ -322,4 +335,4 @@ def is_not_page(model):
 
 @register.filter(name="not_starts_with")
 def not_starts_with(value, arg):
-    return not value.startswith(arg)
+    return not value.startswith(arg)

{wagtail_cjkcms-24.12.3.dist-info → wagtail_cjkcms-25.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.12.3
+Version: 25.1.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.12.3.dist-info → wagtail_cjkcms-25.1.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cjkcms/.DS_Store,sha256=cYcT7MpEwyMj1-CAvcue4ODbL87U2KGsmN7HYD4O8SY,6148
-cjkcms/__init__.py,sha256=bH8_fx5utHY9cdK_2SRdXAow_3c5C4R72Q_vi17T0go,273
+cjkcms/__init__.py,sha256=Gd5b9OJXHXfK7Yt9rNDp_IWo2PAad3jaOmD2knTL7Zo,272
 cjkcms/apps.py,sha256=VA5Z1YerImetvN8KsjPTMSn1fSo6O1JkBJdK5y5ubJY,173
 cjkcms/fields.py,sha256=dE0DuNIjX7jhA-5GjSmR2l66EDH2kq3vuxL9WyRALCY,3191
 cjkcms/forms.py,sha256=_uu_FR8odz40lD-Rmw0tlK7-xxxa8THHfV2-1ZJYsIM,361
@@ -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=db_CNBqpKdAq1e9Y4AdpRm1077ANIWD8DzqG56_rSNs,10098
+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
@@ -56,6 +56,7 @@ cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py,sha256=S
 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/0023_alter_navbar_language.py,sha256=TnMs5fzf-PmirNn6CgYh5pUwwHhaYKPDCjqnZqrj8Ok,547
 cjkcms/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cjkcms/models/__init__.py,sha256=f99GmxfFxGtQl8JvZFz8rAtklCIesLoSccyhhi2xgPU,232
 cjkcms/models/admin_sidebar.py,sha256=Q8jdlIY1fBxUq8fygYdmOLjDwIRs3rFO0Mze9e2STpM,752
@@ -148,7 +149,7 @@ cjkcms/static/cjkcms/bi/fonts/bootstrap-icons.woff2,sha256=z-RbmB0bkbFzNho0z85fY
 cjkcms/static/cjkcms/css/cjkcms-admin.css,sha256=I_ca37IMgYbh75CrhRenPvu3TzMVFgmDO2246fGijkI,846
 cjkcms/static/cjkcms/css/cjkcms-custom-theme-disabled.css,sha256=n176w4XXEO7MdisDllr8_6pVmyRAEQM7QbAPvSVU5YU,2432
 cjkcms/static/cjkcms/css/cjkcms-editor.css,sha256=rqUeJtq7TNyNpBvSkTOKzpFMUZ-Vh3K075EcmAvG05Q,1104
-cjkcms/static/cjkcms/css/cjkcms-front.css,sha256=fonu_XNWS-C_MozAKDVBORP18Pg43x2DvzMZULZZE0E,4936
+cjkcms/static/cjkcms/css/cjkcms-front.css,sha256=s_fkt-YKud6BuhKYtAW13EfSKKU3x_HcnVnMuHyhgzo,5316
 cjkcms/static/cjkcms/images/avatars/default.png,sha256=f8QXRtZ1j3s2CItnnL8XbbhgfW2yPHKnijwG3d5qdb0,535
 cjkcms/static/cjkcms/images/avatars/default.svg,sha256=kVYNxHtkb6nHbTCXyDG3qvS_-IgS9PknIf2I8KI9MrE,384
 cjkcms/static/cjkcms/images/icons/calendar-day.svg,sha256=S6Wk7QnGUEkSzabH8ob5Vqoum1MBRNuQ4imz-in9n6Y,581
@@ -189,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
@@ -298,9 +299,10 @@ cjkcms/templates/cjkcms/snippets/breadcrumbs.html,sha256=3flWNTJ568V4l9HTuYK5vZ7
 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
-cjkcms/templates/cjkcms/snippets/navbar.html,sha256=VM2Yx4oxV2OjTBZyQ2PYdraU38hLMMLxN0oyqmC_tpk,2983
+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.html,sha256=ljQtkyobQ5gGYRDrBcaIusiXVu1mNcv8mMojQDhcqpo,2293
+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/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
@@ -315,7 +317,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=qpJrxMYJKz6pQeuoMx5YBP_xkMcV65fwQCEplAV-WNM,9166
+cjkcms/templatetags/cjkcms_tags.py,sha256=hijLNrcc-ORLe88cyQzjtQW2PjbCvH5CEsYr9p5UT7U,9754
 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
@@ -337,17 +339,23 @@ 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
 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.12.3.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
-wagtail_cjkcms-24.12.3.dist-info/METADATA,sha256=M5kmJecG88HO89jYrgeCwOPn4HVQRv5WiEefqEbaJgE,3121
-wagtail_cjkcms-24.12.3.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-wagtail_cjkcms-24.12.3.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
-wagtail_cjkcms-24.12.3.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
-wagtail_cjkcms-24.12.3.dist-info/RECORD,,
+wagtail_cjkcms-25.1.1.dist-info/LICENSE,sha256=KHsCh1fKOZzvcKe1a9h3FlDjTjK_UurO3wHK55TnHHo,1538
+wagtail_cjkcms-25.1.1.dist-info/METADATA,sha256=OQ5gQBEprn8G9fZmNRYUdY9jsLVFhOJrDtPfMclifTQ,3120
+wagtail_cjkcms-25.1.1.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+wagtail_cjkcms-25.1.1.dist-info/entry_points.txt,sha256=FzoiFENdZ1uebNztyz6GlswkumQspd5VjWbR9MUIH_8,50
+wagtail_cjkcms-25.1.1.dist-info/top_level.txt,sha256=8wJGOGo1pG5nO5akfcMzA7i3ndj5868I8w35vTT0JJM,7
+wagtail_cjkcms-25.1.1.dist-info/RECORD,,

cjkcms/templates/cjkcms/snippets/navbar_search.html

@@ -1,47 +0,0 @@
-{% 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">
-        {% csrf_token %}
-        {% get_searchform request as form %}
-        {% bootstrap_form_errors form type='non_fields' %}
-        {% if settings.cjkcms.LayoutSettings.search_format == "" or settings.cjkcms.LayoutSettings.search_format|slice:":3" == "box" %}
-          {% bootstrap_field form.s layout='inline' show_label=False %}
-        {% endif %}
-        {% if "button" in settings.cjkcms.LayoutSettings.search_format %}
-        <button type="button" class="{{ settings.cjkcms.LayoutSettings.searchbutton_class }}"
-          {% if 'popup' in settings.cjkcms.LayoutSettings.search_format %}
-            data-mdb-toggle="modal" data-bs-toggle="modal" 
-            data-bs-target="#search-modal" data-mdb-target="#search-modal"
-            onclick="focusInputField()"          
-          {% endif %}
-        >{{ settings.cjkcms.LayoutSettings.searchbutton_label | richtext }}</button>
-        {% endif %}
-      
-        {% if "popup" in settings.cjkcms.LayoutSettings.search_format %}
-        <div id="search-modal" class="modal" style="display: none;">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <h5 class="modal-title">Search</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" data-mdb-dismiss="modal" aria-label="Close"></button>
-              </div>
-              <div class="modal-body">
-                {% bootstrap_form form layout='inline' %}
-              </div>
-              <div class="modal-footer">
-                <button type="submit" class="{{ settings.cjkcms.LayoutSettings.searchbutton_class }}">
-                  {{ settings.cjkcms.LayoutSettings.searchbutton_label | richtext }}
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <script>
-          function focusInputField() {
-            var inputField = document.querySelector('#search-modal input[type="text"]');
-            if (inputField) {
-              inputField.focus();
-            }
-          }
-        </script>
-        {% endif %}
-      </form>