wagtail-cjkcms 24.2.7__tar.gz → 24.3.2__tar.gz

{wagtail-cjkcms-24.2.7 → wagtail-cjkcms-24.3.2}/CHANGELOG.md

@@ -14,6 +14,17 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [24.3.2] - 2024-03-20
+### Fixed
+ - Renamed "libs" to "cjkcms_libs" in frontend scripts, to avoid name clash with htmx
+
+
+## [24.3.1] - 2024-03-11
+### Added
+ - Missing social media fields in settings/social-media, and icons, including new X to replace Twitter
+ - Updated fontawesome CDN call to v.6.5.1 to include new X icon.
+
+
 ## [24.2.7] - 2024-02-18
 ### Fixed
  - Rebuilt search box/button customisation for cleaner code and more flexibility

{wagtail-cjkcms-24.2.7/wagtail_cjkcms.egg-info → wagtail-cjkcms-24.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.2.7
+Version: 24.3.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.2.7 → wagtail-cjkcms-24.3.2}/cjkcms/__init__.py

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

wagtail-cjkcms-24.3.2/cjkcms/migrations/0020_socialmediasettings_github_and_more.py

@@ -0,0 +1,28 @@
+# 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.2.7 → wagtail-cjkcms-24.3.2}/cjkcms/models/wagtailsettings_models.py

@@ -47,6 +47,11 @@ class SocialMediaSettings(BaseSiteSetting):
         verbose_name=_("LinkedIn"),
         help_text=_("Your LinkedIn page URL"),
     )
+    github = models.URLField(
+        blank=True,
+        verbose_name=_("GitHub"),
+        help_text=_("Your GitHub page URL"),
+    )
     youtube = models.URLField(
         blank=True,
         verbose_name=_("YouTube"),
@@ -57,6 +62,16 @@ class SocialMediaSettings(BaseSiteSetting):
         verbose_name=_("Vimeo"),
         help_text=_("Your Vimeo channel or user account URL"),
     )
+    pinterset = models.URLField(
+        blank=True,
+        verbose_name=_("Pinterest"),
+        help_text=_("Your Pinterest page URL"),
+    )
+    tiktok = models.URLField(
+        blank=True,
+        verbose_name=_("TikTok"),
+        help_text=_("Your TikTok account URL"),
+    )
 
     location = models.CharField(
         blank=True,
@@ -82,9 +97,11 @@ class SocialMediaSettings(BaseSiteSetting):
             self.facebook,
             self.twitter,
             self.instagram,
-            self.youtube,
             self.linkedin,
+            self.github,
+            self.youtube,
             self.vimeo,
+            self.tiktok,
         ]
         socialist = list(filter(None, socialist))
         return json.dumps(socialist)
@@ -96,8 +113,11 @@ class SocialMediaSettings(BaseSiteSetting):
                 FieldPanel("twitter"),
                 FieldPanel("instagram"),
                 FieldPanel("linkedin"),
+                FieldPanel("github"),
                 FieldPanel("youtube"),
                 FieldPanel("vimeo"),
+                FieldPanel("pinterset"),
+                FieldPanel("tiktok"),
             ],
             _("Social Media Accounts"),
         ),

{wagtail-cjkcms-24.2.7 → wagtail-cjkcms-24.3.2}/cjkcms/static/cjkcms/js/cjkcms-front.js

@@ -15,7 +15,7 @@ CJK CMS based on CodeRed CMS
  * This file must run with "pure" JavaScript - assume jQuery or any other
  * scripts are not yet loaded.
  */
-const libs = {
+const cjkcms_libs = {
     masonry: {
       url: "https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js",
       integrity: "sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI=",
@@ -116,7 +116,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
     /** Masonry **/
     if (document.querySelectorAll("[data-masonry]").length > 0) {
-        load_script(libs.masonry);
+        load_script(cjkcms_libs.masonry);
     }
 
     /** Film Strip Controls **/

{wagtail-cjkcms-24.2.7 → wagtail-cjkcms-24.3.2}/cjkcms/templates/cjkcms/snippets/frontend_assets.html

@@ -19,7 +19,7 @@
     {% if settings.cjkcms.LayoutSettings.awesome_cdn %}
         <!-- Font Awesome -->
         <link
-            href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"
+            href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
             rel="stylesheet"
             crossorigin="anonymous">
     {% endif %}

{wagtail-cjkcms-24.2.7 → wagtail-cjkcms-24.3.2}/cjkcms/templates/cjkcms/snippets/social_media_icons.html

@@ -7,6 +7,13 @@
         </a>
     </li>
     {% endif %}
+    {% if settings.cjkcms.SocialMediaSettings.twitter %}
+    <li class="nav-item me-3 me-lg-0">
+        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.twitter }}" target="_blank" aria-label="twitter link">
+            <i class="fab fa-x-twitter"></i>
+        </a>
+    </li>
+    {% endif %}
     {% if settings.cjkcms.SocialMediaSettings.instagram %}
     <li class="nav-item me-3 me-lg-0">
         <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.instagram }}" target="_blank" aria-label="instagram link">
@@ -28,17 +35,17 @@
         </a>
     </li>
     {% endif %}
-    {% if settings.cjkcms.SocialMediaSettings.twitter %}
+    {% if settings.cjkcms.SocialMediaSettings.youtube %}
     <li class="nav-item me-3 me-lg-0">
-        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.twitter }}" target="_blank" aria-label="twitter link">
-            <i class="fab fa-twitter"></i>
+        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.youtube }}" target="_blank" aria-label="youtube link">
+            <i class="fab fa-youtube"></i>
         </a>
     </li>
     {% endif %}
-    {% if settings.cjkcms.SocialMediaSettings.youtube %}
+    {% if settings.cjkcms.SocialMediaSettings.vimeo %}
     <li class="nav-item me-3 me-lg-0">
-        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.youtube }}" target="_blank" aria-label="youtube link">
-            <i class="fab fa-youtube"></i>
+        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.vimeo }}" target="_blank" aria-label="youtube link">
+            <i class="fab fa-vimeo"></i>
         </a>
     </li>
     {% endif %}
@@ -48,4 +55,11 @@
             <i class="fab fa-pinterest"></i>
         </a>
     </li>
+    {% endif %}
+    {% if settings.cjkcms.SocialMediaSettings.tiktok %}
+    <li class="nav-item me-3 me-lg-0">
+        <a class="nav-link" href="{{ settings.cjkcms.SocialMediaSettings.tiktok }}" target="_blank" aria-label="pinterest link">
+            <i class="fab fa-tiktok"></i>
+        </a>
+    </li>
     {% endif %}

{wagtail-cjkcms-24.2.7 → wagtail-cjkcms-24.3.2/wagtail_cjkcms.egg-info}/PKG-INFO

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

@@ -59,6 +59,7 @@ cjkcms/migrations/0016_layoutsettings_breadcrumb_icon_and_more.py
 cjkcms/migrations/0017_layoutsettings_default_seo_image.py
 cjkcms/migrations/0018_layoutsettings_search_format.py
 cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py
+cjkcms/migrations/0020_socialmediasettings_github_and_more.py
 cjkcms/migrations/__init__.py
 cjkcms/models/__init__.py
 cjkcms/models/admin_sidebar.py
@@ -320,7 +321,11 @@ 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_3tYv0uS.original.png
+cjkcms/tests/media/images/test_d8sVYy7.original.png
 cjkcms/tests/media/original_images/test.png
+cjkcms/tests/media/original_images/test_3tYv0uS.png
+cjkcms/tests/media/original_images/test_d8sVYy7.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py