wagtail-cjkcms 24.6.2__tar.gz → 24.6.5__tar.gz

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5}/CHANGELOG.md

@@ -15,6 +15,18 @@ migrated to this file.
 ### Removed
 
 
+## [24.6.4] - 2024-06-28
+### Changed
+ - Update mdb-ui-kit version to 7.3.2
+
+## [24.6.4] - 2024-06-26
+### Fixed
+ - Fixed responsiveness of the 404 template 
+
+## [24.6.3] - 2024-06-25
+### Added
+ -  HighlightBlock, allows an element to stand out with the ability to change the colour of the background, border, text from the basic bootstrap colour palette also allows an icon to be added
+
 ## [24.6.2] - 2024-06-02
 ### Added
  - API endpoint to allow remote monitoring of software component versions. Disabled by default. See /docs/api/version_monitor.md for details

{wagtail_cjkcms-24.6.2/wagtail_cjkcms.egg-info → wagtail_cjkcms-24.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.6.2
+Version: 24.6.5
 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.6.2 → wagtail_cjkcms-24.6.5}/cjkcms/__init__.py

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

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5}/cjkcms/blocks/__init__.py

@@ -31,6 +31,7 @@ from .content_blocks import (  # noqa
     NavPageLinkWithSubLinkBlock,
     PriceListBlock,
     ReusableContentBlock,
+    HighlightBlock,
 )
 from .content.events import PublicEventBlock, EventCalendarBlock
 from .layout_blocks import CardGridBlock, GridBlock, HeroBlock
@@ -75,6 +76,7 @@ CONTENT_STREAMBLOCKS = HTML_STREAMBLOCKS + [
     ("pricelist", PriceListBlock()),
     ("reusable_content", ReusableContentBlock()),
     ("event_calendar", EventCalendarBlock()),
+    ("highlight", HighlightBlock()),
 ]
 
 NAVIGATION_STREAMBLOCKS = [

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5}/cjkcms/blocks/content_blocks.py

@@ -359,3 +359,48 @@ class ReusableContentBlock(BaseBlock):
         label = _("Reusable Content")
         template = "cjkcms/blocks/reusable_content_block.html"
         label_format = "{content} (Reusable Content)"
+
+
+class HighlightBlock(BaseBlock):
+    """
+    Block that highlights a piece of text
+    """
+
+    text = blocks.RichTextBlock(
+        features=cms_settings.CJKCMS_RICHTEXT_FEATURES["default"],
+        label=_("Text"),
+    )
+
+    background_color = blocks.ChoiceBlock(
+        choices=cms_settings.CJKCMS_HIGHLIGHT_COLORS,
+        default=cms_settings.CJKCMS_HIGHLIGHT_DEFAULT_COLOR,
+        required=False,
+        label=_("Background Color"),
+    )
+
+    border_color = blocks.ChoiceBlock(
+        choices=cms_settings.CJKCMS_HIGHLIGHT_COLORS,
+        default=cms_settings.CJKCMS_HIGHLIGHT_DEFAULT_COLOR,
+        required=False,
+        label=_("Border Color"),
+    )
+
+    text_color = blocks.ChoiceBlock(
+        choices=cms_settings.CJKCMS_HIGHLIGHT_COLORS,
+        default="dark",
+        required=False,
+        label=_("Text Color"),
+    )
+
+    icon = blocks.ChoiceBlock(
+        choices=cms_settings.FONT_AWESOME_ICONS,
+        default=cms_settings.FONT_AWESOME_ICONS_DEFAULT,
+        required=False,
+        label=_("Icon"),
+    )
+
+    class Meta:
+        icon = "thumbtack"
+        label = _("Highlight")
+        label_format = _("Highlight")
+        template = "cjkcms/blocks/highlight_block.html"

wagtail_cjkcms-24.6.5/cjkcms/migrations/0018_layoutsettings_search_format.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.2 on 2024-02-18 13:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0017_layoutsettings_default_seo_image"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="search_format",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="",
+                max_length=50,
+                verbose_name="Search format",
+            ),
+        ),
+    ]

wagtail_cjkcms-24.6.5/cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.0.2 on 2024-02-18 22:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0018_layoutsettings_search_format"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="searchbox_input_class",
+            field=models.CharField(
+                blank=True,
+                default="border-secondary mb-0",
+                help_text="Classes applied to searchbox input",
+                max_length=255,
+                verbose_name="Searchbox input class",
+            ),
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="searchbutton_class",
+            field=models.CharField(
+                blank=True,
+                default="btn btn-outline-secondary",
+                help_text="Classes applied to search button. Add e.g. `fas fa-search` for icon.",
+                max_length=255,
+                verbose_name="Search button (with text) class",
+            ),
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="searchbutton_label",
+            field=models.CharField(
+                blank=True,
+                default="Search",
+                help_text="Leave empty when using icon-only button. Otherwise, add button label.",
+                max_length=255,
+                verbose_name="Search button label",
+            ),
+        ),
+    ]

wagtail_cjkcms-24.6.5/cjkcms/migrations/0020_socialmediasettings_github_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.0.2 on 2024-03-11 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0019_layoutsettings_searchbox_input_class_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="socialmediasettings",
+            name="github",
+            field=models.URLField(
+                blank=True, help_text="Your GitHub page URL", verbose_name="GitHub"
+            ),
+        ),
+        migrations.AddField(
+            model_name="socialmediasettings",
+            name="pinterset",
+            field=models.URLField(
+                blank=True,
+                help_text="Your Pinterest page URL",
+                verbose_name="Pinterest",
+            ),
+        ),
+        migrations.AddField(
+            model_name="socialmediasettings",
+            name="tiktok",
+            field=models.URLField(
+                blank=True, help_text="Your TikTok account URL", verbose_name="TikTok"
+            ),
+        ),
+    ]

wagtail_cjkcms-24.6.5/cjkcms/migrations/0021_remove_layoutsettings_navbar_color_scheme_and_more.py

@@ -0,0 +1,85 @@
+# Generated by Django 5.0.2 on 2024-03-21 15:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cjkcms", "0020_socialmediasettings_github_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="layoutsettings",
+            name="navbar_color_scheme",
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="color_scheme",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="",
+                help_text="Default light/dark/custom theme. (MD/Bootstrap only)",
+                max_length=50,
+                verbose_name="Color scheme",
+            ),
+        ),
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="light_dark_switch",
+            field=models.BooleanField(
+                default=False,
+                help_text="Show switch to toggle light/dark theme (MD/Bootstrap only)",
+                verbose_name="Light/Dark switch",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="layoutsettings",
+            name="frontend_theme",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="",
+                help_text="Change the source of your Bootstrap theme.",
+                max_length=50,
+                verbose_name="Theme variant",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="layoutsettings",
+            name="navbar_collapse_mode",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="",
+                help_text="Control on what screen sizes to show and collapse the navbar menu links.",
+                max_length=50,
+                verbose_name="Collapse navbar menu",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="layoutsettings",
+            name="navbar_format",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="",
+                max_length=50,
+                verbose_name="Navbar format",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="layoutsettings",
+            name="navbar_langselector",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default=None,
+                help_text="Choose lang choice selector",
+                max_length=255,
+                null=True,
+                verbose_name="Language selector",
+            ),
+        ),
+    ]

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5}/cjkcms/settings.py

@@ -155,18 +155,18 @@ class _DefaultSettings:
             "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js",
         ],
         "mdb": [
-            "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.3.0/mdb.min.css",
-            "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.3.0/mdb.umd.min.js",
+            "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.3.2/mdb.min.css",
+            "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.3.2/mdb.umd.min.js",
         ],
         # "mdb.dark": [
         #     "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.2.0/mdb.dark.min.css",
         #     "https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/7.2.0/mdb.umd.min.js",
         # ],
-        "mdb.light": [  # 7.3.0
+        "mdb.light": [  # 7.3.2
             "vendor/mdb/css/mdb.min.css",
             "vendor/mdb/js/mdb.umd.min.js",
         ],
-        "mdb.dark": [  # 7.3.0
+        "mdb.dark": [  # 7.3.2
             "vendor/mdb/css/mdb.dark.min.css",
             "vendor/mdb/js/mdb.umd.min.js",
         ],
@@ -370,6 +370,29 @@ class _DefaultSettings:
         ("hidden", "Hidden for all"),
     )
 
+    CJKCMS_HIGHLIGHT_COLORS = (
+        ("primary", "Dark Blue"),
+        ("secondary", "Gray"),
+        ("success", "Green"),
+        ("danger", "Red"),
+        ("warning", "Yellow"),
+        ("info", "Light Blue"),
+        ("light", "Light"),
+        ("dark", "Dark"),
+    )
+    CJKCMS_HIGHLIGHT_DEFAULT_COLOR = "none"
+
+    FONT_AWESOME_ICONS = (
+        ("fa-solid fa-circle-check", "Checkmark"),
+        ("fa-solid fa-scissors", "Scissors"),
+        ("fa-solid fa-pencil", "Pencil"),
+        ("fa-solid fa-question", "Question mark"),
+        ("fa-solid fa-globe", "Globe"),
+        ("fa-regular fa-folder", "Folder"),
+        ("fa-solid fa-triangle-exclamation", "Warning Triangle"),
+    )
+    FONT_AWESOME_ICONS_DEFAULT = "fa-solid fa-circle-check"
+
     BANNER = None
     BANNER_BACKGROUND = "#f00"
     BANNER_TEXT_COLOR = "#fff"

wagtail_cjkcms-24.6.5/cjkcms/templates/404.html

@@ -0,0 +1,86 @@
+{% extends "cjkcms/pages/web_page_notitle.html" %}
+
+{% block custom_assets %}
+<style>
+    body {
+        background-color: #FFFFFF;
+    }
+    .message-box h1 {
+        font-size: 60px;
+        line-height: 46px;
+        margin-bottom: 40px;
+    }
+    .buttons-con .action-link-wrap {
+        margin-top: 40px;
+    }
+    .buttons-con .action-link-wrap a {
+        background: #68c950;
+        padding: 8px 25px;
+        border-radius: 4px;
+        color: #333;
+        font-weight: bold;
+        font-size: 14px;
+        transition: all 0.3s linear;
+        cursor: pointer;
+        text-decoration: none;
+        margin-right: 10px
+    }
+    .buttons-con .action-link-wrap a:hover {
+        background: #5A5C6C;
+        color: #333;
+    }
+    #Polygon-1 , #Polygon-2 , #Polygon-3 , #Polygon-4 , #Polygon-4, #Polygon-5 {
+        animation: float 1s infinite ease-in-out alternate;
+    }
+    #Polygon-2 {
+        animation-delay: .2s;
+    }
+    #Polygon-3 {
+        animation-delay: .4s;
+    }
+    #Polygon-4 {
+        animation-delay: .6s;
+    }
+    #Polygon-5 {
+        animation-delay: .8s;
+    }
+    @keyframes float {
+        100% {
+            transform: translateY(20px);
+        }
+    }
+
+</style>
+{% endblock %}
+
+{% block title %}Page not found{% endblock %}
+
+{% block body_class %}404{% endblock %}
+
+{% block content_body %}
+<div class="container d-flex justify-content-center align-items-center">
+  <div class="row">
+    <div class="col-md-6 d-flex justify-content-center">
+      <svg width="380px" height="500px" viewBox="0 0 837 1045" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+        <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+          <path d="M353,9 L626.664028,170 L626.664028,487 L353,642 L79.3359724,487 L79.3359724,170 L353,9 Z" id="Polygon-1" stroke="#007FB2" stroke-width="6" sketch:type="MSShapeGroup"></path>
+          <path d="M78.5,529 L147,569.186414 L147,648.311216 L78.5,687 L10,648.311216 L10,569.186414 L78.5,529 Z" id="Polygon-2" stroke="#EF4A5B" stroke-width="6" sketch:type="MSShapeGroup"></path>
+          <path d="M773,186 L827,217.538705 L827,279.636651 L773,310 L719,279.636651 L719,217.538705 L773,186 Z" id="Polygon-3" stroke="#795D9C" stroke-width="6" sketch:type="MSShapeGroup"></path>
+          <path d="M639,529 L773,607.846761 L773,763.091627 L639,839 L505,763.091627 L505,607.846761 L639,529 Z" id="Polygon-4" stroke="#F2773F" stroke-width="6" sketch:type="MSShapeGroup"></path>
+          <path d="M281,801 L383,861.025276 L383,979.21169 L281,1037 L179,979.21169 L179,861.025276 L281,801 Z" id="Polygon-5" stroke="#36B455" stroke-width="6" sketch:type="MSShapeGroup"></path>
+        </g>
+      </svg>
+    </div>
+    <div class="col-md-6 d-flex flex-column justify-content-center align-items-start">
+      <h1>404</h1>
+      <p>Page not found</p>
+      <div class="buttons-con">
+        <div class="action-link-wrap">
+          <a onclick="history.back(-1)" class="link-button link-back-button">Go Back</a>
+          <a href="/" class="link-button">Go to Home Page</a>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}

wagtail_cjkcms-24.6.5/cjkcms/templates/cjkcms/blocks/highlight_block.html

@@ -0,0 +1,21 @@
+{% load wagtailadmin_tags wagtailcore_tags wagtailimages_tags %}
+
+<div class="card mb-3 {% if self.border_color %} border border-{{ self.border_color }}{% endif %}  text-bg-{{ self.background_color }}
+    text-{{ self.text_color }}
+    {{self.settings.custom_css_class}}"
+    {% if self.settings.custom_id %}id="{{self.settings.custom_id}}"{% endif %}>
+    <div class="card-body">
+       <div class="d-flex justify-content-between p-md-1">
+          <div class="d-flex flex-row">
+             {% if self.icon %}
+             <div class="align-self-start">
+                <i class="{{self.icon}} fa-5x me-4"></i>
+             </div>
+             {% endif %}
+             <div>
+                {{ self.text }}
+             </div>
+          </div>
+       </div>
+    </div>
+</div>

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5}/cjkcms/views.py

@@ -95,7 +95,6 @@ def robots(request):
 
 
 class VersionView(APIView):
-
     def get(self, request, token):
         monitor_token = settings.CJKCMS_VERSION_MONITOR_TOKEN
         allowed_domains = settings.CJKCMS_VERSION_MONITOR_ALLOWED_DOMAINS

{wagtail_cjkcms-24.6.2 → wagtail_cjkcms-24.6.5/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.6.2
+Version: 24.6.5
 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.6.2 → wagtail_cjkcms-24.6.5}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -214,6 +214,7 @@ cjkcms/templates/cjkcms/blocks/h1_block.html
 cjkcms/templates/cjkcms/blocks/h2_block.html
 cjkcms/templates/cjkcms/blocks/h3_block.html
 cjkcms/templates/cjkcms/blocks/hero_block.html
+cjkcms/templates/cjkcms/blocks/highlight_block.html
 cjkcms/templates/cjkcms/blocks/image_block.html
 cjkcms/templates/cjkcms/blocks/image_gallery_block.html
 cjkcms/templates/cjkcms/blocks/image_link_block.html

wagtail_cjkcms-24.6.2/cjkcms/migrations/0018_layoutsettings_search_format.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.0.2 on 2024-02-18 13:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cjkcms', '0017_layoutsettings_default_seo_image'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='search_format',
-            field=models.CharField(blank=True, choices=[], default='', max_length=50, verbose_name='Search format'),
-        ),
-    ]

wagtail_cjkcms-24.6.2/cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.0.2 on 2024-02-18 22:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cjkcms', '0018_layoutsettings_search_format'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='searchbox_input_class',
-            field=models.CharField(blank=True, default='border-secondary mb-0', help_text='Classes applied to searchbox input', max_length=255, verbose_name='Searchbox input class'),
-        ),
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='searchbutton_class',
-            field=models.CharField(blank=True, default='btn btn-outline-secondary', help_text='Classes applied to search button. Add e.g. `fas fa-search` for icon.', max_length=255, verbose_name='Search button (with text) class'),
-        ),
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='searchbutton_label',
-            field=models.CharField(blank=True, default='Search', help_text='Leave empty when using icon-only button. Otherwise, add button label.', max_length=255, verbose_name='Search button label'),
-        ),
-    ]

wagtail_cjkcms-24.6.2/cjkcms/migrations/0020_socialmediasettings_github_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.0.2 on 2024-03-11 19:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cjkcms', '0019_layoutsettings_searchbox_input_class_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='socialmediasettings',
-            name='github',
-            field=models.URLField(blank=True, help_text='Your GitHub page URL', verbose_name='GitHub'),
-        ),
-        migrations.AddField(
-            model_name='socialmediasettings',
-            name='pinterset',
-            field=models.URLField(blank=True, help_text='Your Pinterest page URL', verbose_name='Pinterest'),
-        ),
-        migrations.AddField(
-            model_name='socialmediasettings',
-            name='tiktok',
-            field=models.URLField(blank=True, help_text='Your TikTok account URL', verbose_name='TikTok'),
-        ),
-    ]

wagtail_cjkcms-24.6.2/cjkcms/migrations/0021_remove_layoutsettings_navbar_color_scheme_and_more.py

@@ -1,47 +0,0 @@
-# Generated by Django 5.0.2 on 2024-03-21 15:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cjkcms', '0020_socialmediasettings_github_and_more'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='layoutsettings',
-            name='navbar_color_scheme',
-        ),
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='color_scheme',
-            field=models.CharField(blank=True, choices=[], default='', help_text='Default light/dark/custom theme. (MD/Bootstrap only)', max_length=50, verbose_name='Color scheme'),
-        ),
-        migrations.AddField(
-            model_name='layoutsettings',
-            name='light_dark_switch',
-            field=models.BooleanField(default=False, help_text='Show switch to toggle light/dark theme (MD/Bootstrap only)', verbose_name='Light/Dark switch'),
-        ),
-        migrations.AlterField(
-            model_name='layoutsettings',
-            name='frontend_theme',
-            field=models.CharField(blank=True, choices=[], default='', help_text='Change the source of your Bootstrap theme.', max_length=50, verbose_name='Theme variant'),
-        ),
-        migrations.AlterField(
-            model_name='layoutsettings',
-            name='navbar_collapse_mode',
-            field=models.CharField(blank=True, choices=[], default='', help_text='Control on what screen sizes to show and collapse the navbar menu links.', max_length=50, verbose_name='Collapse navbar menu'),
-        ),
-        migrations.AlterField(
-            model_name='layoutsettings',
-            name='navbar_format',
-            field=models.CharField(blank=True, choices=[], default='', max_length=50, verbose_name='Navbar format'),
-        ),
-        migrations.AlterField(
-            model_name='layoutsettings',
-            name='navbar_langselector',
-            field=models.CharField(blank=True, choices=[], default=None, help_text='Choose lang choice selector', max_length=255, null=True, verbose_name='Language selector'),
-        ),
-    ]