wagtail-cjkcms 23.10.1__tar.gz → 23.10.2__tar.gz

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/CHANGELOG.md

@@ -14,6 +14,15 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [23.10.2] - 2023-10-07
+### Fixed
+ - Search bar layout - vertical alignment
+ - Full search form - fixed broken template
+
+ ### Added
+ - Breadcrumbs template snippet - needs to be activated in Settings->Layout
+ - New section in the docs
+ 
 
 ## [23.10.1] - 2023-10-01
 ### Added

{wagtail-cjkcms-23.10.1/wagtail_cjkcms.egg-info → wagtail-cjkcms-23.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.1
+Version: 23.10.2
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/__init__.py

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

wagtail-cjkcms-23.10.2/cjkcms/migrations/0016_layoutsettings_breadcrumb_icon_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.6 on 2023-10-07 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0015_eventcalendar"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="breadcrumb_icon",
+            field=models.CharField(
+                blank=True,
+                default="slash",
+                help_text="Bootstrap icon name. See docs for built-in options.",
+                max_length=32,
+                verbose_name="Breadcrumb icon",
+            ),
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="breadcrumbs",
+            field=models.BooleanField(
+                default=False,
+                help_text="Show breadcrumbs in page header",
+                verbose_name="Breadcrumbs",
+            ),
+        ),
+    ]

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/models/wagtailsettings_models.py

@@ -197,6 +197,19 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
         help_text=_("Choose lang choice selector"),
     )
 
+    breadcrumbs = models.BooleanField(
+        default=False,
+        verbose_name=_("Breadcrumbs"),
+        help_text=_("Show breadcrumbs in page header"),
+    )
+    breadcrumb_icon = models.CharField(
+        blank=True,
+        max_length=32,
+        default="slash",
+        verbose_name=_("Breadcrumb icon"),
+        help_text=_("Bootstrap icon name. See docs for built-in options."),
+    )
+
     frontend_theme = models.CharField(
         blank=True,
         max_length=50,
@@ -289,6 +302,13 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
             ],
             heading=_("Site Navbar Layout"),
         ),
+        MultiFieldPanel(
+            [
+                FieldPanel("breadcrumbs"),
+                FieldPanel("breadcrumb_icon"),
+            ],
+            heading=_("Site Header / Breadcrumbs"),
+        ),
         InlinePanel(
             "site_footer",
             help_text=_("Choose one or more footers"),
@@ -354,7 +374,7 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
 class NavbarOrderable(Orderable, models.Model):
     navbar_chooser = ParentalKey(
         LayoutSettings, related_name="site_navbar", verbose_name=_("Site Navbars")
-    )
+    )  # type: ignore
     navbar = models.ForeignKey(
         Navbar,
         blank=True,
@@ -368,7 +388,7 @@ class NavbarOrderable(Orderable, models.Model):
 class FooterOrderable(Orderable, models.Model):
     footer_chooser = ParentalKey(
         LayoutSettings, related_name="site_footer", verbose_name=_("Site Footers")
-    )
+    )  # type: ignore
     footer = models.ForeignKey(
         Footer,
         blank=True,

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/static/cjkcms/css/cjkcms-front.css

@@ -292,4 +292,10 @@ License: https://github.com/coderedcorp/coderedcms/blob/dev/LICENSE
 .modal {
   max-width: none;
   margin: 1.75rem auto;
+}
+
+#id_s {
+  margin-bottom: 0;
+  margin-top: 0;
+  border: gray 1px solid;
 }

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/caret-right-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-right-fill" viewBox="0 0 16 16">
+  <path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/caret-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-right" viewBox="0 0 16 16">
+  <path d="M6 12.796V3.204L11.481 8 6 12.796zm.659.753 5.48-4.796a1 1 0 0 0 0-1.506L6.66 2.451C6.011 1.885 5 2.345 5 3.204v9.592a1 1 0 0 0 1.659.753z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/chevron-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+</svg>

wagtail-cjkcms-23.10.2/cjkcms/static/cjkcms/images/icons/slash.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-slash-lg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z"/>
+</svg>

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/base.html

@@ -91,6 +91,11 @@
                         </div>
                     {% endif %}
                 {% endblock %}
+
+                {% if settings.cjkcms.LayoutSettings.breadcrumbs %}
+                {% block breadcrumbs %}{% endblock %}
+                {% endif %}
+
                 {% block content_pre_body %}{% endblock %}
 
                 {% block content_body %}

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/search.html

@@ -24,7 +24,7 @@
         <form class="mt-5" action="{% url 'cjkcms_search' %}" method="GET">
             <div class="row">
                 <div class="col-sm-9">
-                    {% bootstrap_form form size='large' layout='inline' %}
+                    {% bootstrap_form form size='lg' layout='inline' %}
                 </div>
                 <div class="col-sm-3">
                     <div class="form-group">
@@ -46,7 +46,7 @@
                 {% for pt in pagetypes %}
                 <li class="nav-item">
                     {% query_update qs_nop 't' pt.content_type.model as qs_t %}
-                    <a class="nav-link {% if form.t.value == pt.content_type.model %}active{% endif %}" href="?{{qs_t.urlencode}}">{{pt.search_name_plural}}</a>
+                    <a class="nav-link {% if form.t.value == pt.content_type.model %}active{% endif %}" href="?{{qs_t.urlencode}}">{{pt|get_plural_name_of_class}}</a>
                 </li>
                 {% endfor %}
             </ul>

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/templates/cjkcms/pages/web_page_notitle.html

@@ -8,6 +8,10 @@
     {% include 'cjkcms/snippets/actionbar.html' %}
 {% endblock %}
 
+{% block breadcrumbs %}
+{% include 'cjkcms/snippets/breadcrumbs.html' %}
+{% endblock %}
+
 {% block footer %}
 {% include 'cjkcms/snippets/footer.html' %}
 {% endblock %}

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/snippets/breadcrumbs.html

@@ -0,0 +1,27 @@
+{% load static wagtailcore_tags wagtailimages_tags cjkcms_tags wagtailsettings_tags %}
+<!-- ========================= breadcrumbs-section start ========================= -->
+{% if self.get_ancestors|length > 1 %}
+<div class="container py-1">
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb d-flex align-items-center">
+        {% block breadcrumb_title %}
+        {% for p in self.get_ancestors %}
+            {% if p.is_root == False %}
+            <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>
+            </li>
+            
+            {% endif %}
+        {% endfor %}
+        <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>
+        {% endblock %}
+        </ol>
+    </nav>
+</div>
+{% endif %}
+<!-- ========================= breadcrumbs-section end ========================= -->

wagtail-cjkcms-23.10.2/cjkcms/templates/cjkcms/snippets/navbar_search.html

@@ -0,0 +1,6 @@
+{% load cjkcms_tags django_bootstrap5 i18n %}
+      <form action="{% url 'cjkcms_search' %}" method="GET">
+        {% csrf_token %}
+        {% get_searchform request as form %}
+        {% bootstrap_form form layout='inline' %}
+    </form>

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/cjkcms/tests/test_templatetags.py

@@ -129,8 +129,7 @@ class TemplateTagTests(TestCase):
 
     def test_is_in_future_template_tag(self):
         template = Template(
-            """{% load cjkcms_tags %}
-            {% if the_date|is_in_future %}future{% else %}not future{% endif %}"""
+            """{% load cjkcms_tags %}{% if the_date|is_in_future %}future{% else %}not future{% endif %}"""  # noqa: E501
         )
         context = Context({"the_date": datetime.now() + timedelta(days=1)})
         result = template.render(context)

wagtail-cjkcms-23.10.2/docs/configuration/index.md

@@ -0,0 +1,16 @@
+# Configuration of wagtail-cjkcms
+
+## Settings
+
+### Layout settings
+
+#### Breadcrumbs
+
+CjkCMS provides breadcrumbs for pages. You can enable them by activating a checkbox in:
+```Settings -> Layout -> Breadcrumbs```
+
+You can use any svg file as a separator. Built in icons are (bootstrap icons):
+* chevron-right
+* caret-right
+* caret-right-fill
+* slash

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.1
+Version: 23.10.2
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail-cjkcms-23.10.1 → wagtail-cjkcms-23.10.2}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ cjkcms/migrations/0012_remove_analyticssettings_ga_tracking_id_and_more.py
 cjkcms/migrations/0013_socialmediasettings_location.py
 cjkcms/migrations/0014_navbar_alignment.py
 cjkcms/migrations/0015_eventcalendar.py
+cjkcms/migrations/0016_layoutsettings_breadcrumb_icon_and_more.py
 cjkcms/migrations/__init__.py
 cjkcms/models/__init__.py
 cjkcms/models/admin_sidebar.py
@@ -149,7 +150,11 @@ cjkcms/static/cjkcms/css/cjkcms-front.css
 cjkcms/static/cjkcms/images/avatars/default.png
 cjkcms/static/cjkcms/images/avatars/default.svg
 cjkcms/static/cjkcms/images/icons/calendar-day.svg
+cjkcms/static/cjkcms/images/icons/caret-right-fill.svg
+cjkcms/static/cjkcms/images/icons/caret-right.svg
+cjkcms/static/cjkcms/images/icons/chevron-right.svg
 cjkcms/static/cjkcms/images/icons/quote.svg
+cjkcms/static/cjkcms/images/icons/slash.svg
 cjkcms/static/cjkcms/images/icons/world.svg
 cjkcms/static/cjkcms/images/logos/cms-logo-long.svg
 cjkcms/static/cjkcms/images/logos/cms-logo-square.svg
@@ -271,6 +276,7 @@ cjkcms/templates/cjkcms/pages/web_page.html
 cjkcms/templates/cjkcms/pages/web_page_notitle.html
 cjkcms/templates/cjkcms/snippets/actionbar.html
 cjkcms/templates/cjkcms/snippets/bottom_corner_lang_selector.html
+cjkcms/templates/cjkcms/snippets/breadcrumbs.html
 cjkcms/templates/cjkcms/snippets/footer.html
 cjkcms/templates/cjkcms/snippets/frontend_assets.html
 cjkcms/templates/cjkcms/snippets/frontend_scripts.html
@@ -309,9 +315,7 @@ 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_mGsVkXU.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_mGsVkXU.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py
@@ -328,6 +332,7 @@ docs/api_reference/blocks/html_blocks.md
 docs/api_reference/blocks/layout_blocks.md
 docs/api_reference/models/settings_models.md
 docs/api_reference/templatetags/cjkcms_tags.md
+docs/configuration/index.md
 docs/faq/index.md
 docs/getting-started/01.quick-start.md
 docs/getting-started/02.folders-and-environment.md

wagtail-cjkcms-23.10.1/cjkcms/templates/cjkcms/snippets/navbar_search.html

@@ -1,9 +0,0 @@
-{% load cjkcms_tags i18n %}
-      <form action="{% url 'cjkcms_search' %}" method="GET">
-        {% load django_bootstrap5 %}
-        {% get_searchform request as form %}
-        {% bootstrap_form form layout='inline' %}
-        <!-- div class="form-group">
-          <button class="btn btn-outline-primary ml-2" type="submit">{% trans 'Search' %}</button>
-        </div -->
-    </form>