wagtail-cjkcms 24.12.2__tar.gz → 24.12.4__tar.gz

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/CHANGELOG.md

@@ -14,6 +14,12 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [24.12.4] - 2024-12-31
+### Removed
+ - Removed deprecated menu visibility management via visible_for field in NavBlocks
+CMS blocks are JSON-based, and ignored in migrations, so If we removed the field in block defintion, this would not cause the data in database disappear. As a result we might have blocks in various websites which are strangely invisible to users, even if nothing is set in the visible block definition. So for safety, a new setting has been added: CJKCMS_NAVBAR_SHOW_VISIBLE_FOR = False. Switch it to True to restore visibility of that block component, if you have problems with any websites. For security, implementation of the visibility checks in templates (can_show_item value.visible_for ) was NOT removed from code.
+- Corrected issue with fixed top navbars. Important - this changed some implementation details (e.g. css styling), so check your site if it uses fixed navbar
+
 ## [24.12.2] - 2024-12-31
 ### Added
  - "countdown" content block using VincentLoy's library. See https://vincentloy.github.io/simplyCountdown.js/ for more info

{wagtail_cjkcms-24.12.2/wagtail_cjkcms.egg-info → wagtail_cjkcms-24.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.12.2
+Version: 24.12.4
 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,8 +32,8 @@ License-File: LICENSE
 Requires-Dist: django-bootstrap5
 Requires-Dist: django>=4.2
 Requires-Dist: wagtail>=5.1
-Requires-Dist: wagtail-seo
-Requires-Dist: wagtail-cache
+Requires-Dist: wagtail-seo>=2.5.0
+Requires-Dist: wagtail-cache>=2.5.1
 Requires-Dist: cjkcms-color-panel
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/cjkcms/__init__.py

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

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/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,17 @@ 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`. "
-        ),
-    )
+
+    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):

wagtail_cjkcms-24.12.4/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'),
+        ),
+    ]

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/cjkcms/settings.py

@@ -485,6 +485,10 @@ 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.

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/cjkcms/static/cjkcms/css/cjkcms-front.css

@@ -82,6 +82,11 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
   content: ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . " ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . " ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . " ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ";
 }
 
+.leaders-dots {
+  border-bottom: 1px dotted currentColor;
+  margin-bottom: 5px;
+}
+
 .leaders span:first-child {
   padding-right: 0.33em;
   background: white;
@@ -248,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;

wagtail_cjkcms-24.12.4/cjkcms/templates/cjkcms/blocks/pricelistitem_block.html

@@ -0,0 +1,20 @@
+{% load wagtailimages_tags %}
+
+<div class="row {%if self.settings.custom_css_class%}{{self.settings.custom_css_class}}{% endif %}">
+{% if self.image %}
+    <div class="col-md-4">
+    {% image self.image original as imagedata %}
+    <img src="{{imagedata.url}}" alt="Photo of {{self.name}}" class="w-100" />
+    </div>
+    <div class="col-md-8">
+{% else %}
+    <div class="col-md-12">
+{% endif %}
+        <div class="d-flex">
+            <span class="flex-shrink-1 fs-5">{{self.name}}</span>
+            <span class="leaders-dots flex-grow-1"></span>
+            <span class="flex-shrink-1 fs-5  text-end">{{self.price}}</span>
+        </div>
+        <div><em>{{self.description}}</em></div>
+    </div>
+</div>

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/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 %}

wagtail_cjkcms-24.12.4/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>

wagtail_cjkcms-24.12.4/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>

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/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.2 → wagtail_cjkcms-24.12.4}/requirements.txt

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

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.12.2
+Version: 24.12.4
 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,8 +32,8 @@ License-File: LICENSE
 Requires-Dist: django-bootstrap5
 Requires-Dist: django>=4.2
 Requires-Dist: wagtail>=5.1
-Requires-Dist: wagtail-seo
-Requires-Dist: wagtail-cache
+Requires-Dist: wagtail-seo>=2.5.0
+Requires-Dist: wagtail-cache>=2.5.1
 Requires-Dist: cjkcms-color-panel
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py
 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/__init__.py
 cjkcms/models/__init__.py
 cjkcms/models/admin_sidebar.py
@@ -308,7 +309,8 @@ cjkcms/templates/cjkcms/snippets/frontend_assets.html
 cjkcms/templates/cjkcms/snippets/frontend_scripts.html
 cjkcms/templates/cjkcms/snippets/navbar.html
 cjkcms/templates/cjkcms/snippets/navbar_lang_selector.html
-cjkcms/templates/cjkcms/snippets/navbar_search.html
+cjkcms/templates/cjkcms/snippets/navbar_search_button.html
+cjkcms/templates/cjkcms/snippets/navbar_search_modal.html
 cjkcms/templates/cjkcms/snippets/social_media.html
 cjkcms/templates/cjkcms/snippets/social_media_icons.html
 cjkcms/templates/cjkcms/snippets/social_media_nav_block.html
@@ -344,7 +346,13 @@ 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_6mZL9NZ.original.png
+cjkcms/tests/media/images/test_YBCJmYS.original.png
+cjkcms/tests/media/images/test_q0QJ4UA.original.png
 cjkcms/tests/media/original_images/test.png
+cjkcms/tests/media/original_images/test_6mZL9NZ.png
+cjkcms/tests/media/original_images/test_YBCJmYS.png
+cjkcms/tests/media/original_images/test_q0QJ4UA.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py

{wagtail_cjkcms-24.12.2 → wagtail_cjkcms-24.12.4}/wagtail_cjkcms.egg-info/requires.txt

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

wagtail_cjkcms-24.12.2/cjkcms/templates/cjkcms/blocks/pricelistitem_block.html

@@ -1,16 +0,0 @@
-{% load wagtailimages_tags %}
-
-<div class="row">
-{% if self.image %}
-    <div class="col-md-4">
-    {% image self.image original as imagedata %}
-    <img src="{{imagedata.url}}" alt="Photo of {{self.name}}" class="w-100" />
-    </div>
-    <div class="col-md-8" style="overflow-x: hidden;">
-{% else %}
-    <div class="col-md-12" style="overflow-x: hidden;">
-{% endif %}
-    <strong class="leaders"><span>{{self.name}}</span><span>{{self.price}}</span></strong>
-    <div>{{self.description}}</div>
-    </div>
-</div>

wagtail_cjkcms-24.12.2/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>