wagtail-cjkcms 24.2.6__tar.gz → 24.3.1__tar.gz

{wagtail-cjkcms-24.2.6 → wagtail-cjkcms-24.3.1}/CHANGELOG.md

@@ -14,6 +14,17 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [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
+
+
 ## [24.2.6] - 2024-02-18
 ### Fixed
  - Removed packages from pyproject.toml to rely on autodiscovery of setuptools

{wagtail-cjkcms-24.2.6/wagtail_cjkcms.egg-info → wagtail-cjkcms-24.3.1}/PKG-INFO

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

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

wagtail-cjkcms-24.3.1/cjkcms/migrations/0019_layoutsettings_searchbox_input_class_and_more.py

@@ -0,0 +1,28 @@
+# 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.3.1/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.6 → wagtail-cjkcms-24.3.1}/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"),
         ),
@@ -208,6 +228,34 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
         verbose_name=_("Search format"),
     )
 
+    searchbox_input_class = models.CharField(
+        blank=True,
+        max_length=255,
+        default="border-secondary mb-0",
+        verbose_name=_("Searchbox input class"),
+        help_text=_("Classes applied to searchbox input"),
+    )
+
+    searchbutton_class = models.CharField(
+        blank=True,
+        max_length=255,
+        default="btn btn-outline-secondary",
+        verbose_name=_("Search button (with text) class"),
+        help_text=_(
+            "Classes applied to search button. Add e.g. `fas fa-search` for icon."
+        ),
+    )
+
+    searchbutton_label = models.CharField(
+        blank=True,
+        max_length=255,
+        default="Search",
+        verbose_name=_("Search button label"),
+        help_text=_(
+            "Leave empty when using icon-only button. Otherwise, add button label."
+        ),
+    )
+
     navbar_langselector = models.CharField(
         blank=True,
         null=True,
@@ -328,6 +376,9 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
             [
                 FieldPanel("navbar_search"),
                 FieldPanel("search_format"),
+                FieldPanel("searchbox_input_class"),
+                FieldPanel("searchbutton_class"),
+                FieldPanel("searchbutton_label"),
             ],
             heading=_("Search box in navbar"),
         ),

{wagtail-cjkcms-24.2.6 → wagtail-cjkcms-24.3.1}/cjkcms/settings.py

@@ -75,16 +75,11 @@ class _DefaultSettings:
         ("cjkcms-navbar-center", "Centered logo at top"),
     ]
 
-    CJKCMS_FRONTENT_NAVBAR_SEARCHBOX_CLASS = "border-secondary mb-0"
-    CJKCMS_FRONTENT_NAVBAR_SEARCHBUTTON_CLASS = "btn btn-outline-secondary"
-
     CJKCMS_FRONTEND_SEARCH_FORMAT_DEFAULT = "box"
     CJKCMS_FRONTEND_SEARCH_FORMAT_CHOICES = [
         ("box", "Search box, no button"),
-        ("box-button-icon", "Search box, button with icon"),
-        ("box-button-text", "Search box, button with text"),
-        ("button-icon", "Button with icon > popup"),
-        ("button-text", "Button with text > popup"),
+        ("box-button", "Search box with button"),
+        ("button-popup", "Button opening search popup"),
     ]
 
     CJKCMS_LANGUAGE_SELECTOR_DEFAULT: Optional[str] = None

{wagtail-cjkcms-24.2.6 → wagtail-cjkcms-24.3.1}/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.3.1/cjkcms/templates/cjkcms/snippets/navbar_search.html

@@ -0,0 +1,47 @@
+{% 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>

{wagtail-cjkcms-24.2.6 → wagtail-cjkcms-24.3.1}/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.6 → wagtail-cjkcms-24.3.1}/cjkcms/templatetags/cjkcms_tags.py

@@ -160,9 +160,9 @@ def get_footers(context) -> "QuerySet[Footer]":
 @register.simple_tag
 def get_searchform(request=None):
     form = SearchForm(request.GET) if request else SearchForm()
-    form.fields["s"].widget.attrs[
-        "class"
-    ] = cms_settings.CJKCMS_FRONTENT_NAVBAR_SEARCHBOX_CLASS
+    form.fields["s"].widget.attrs["class"] = LayoutSettings.for_request(
+        request
+    ).searchbox_input_class
     return form
 
 

{wagtail-cjkcms-24.2.6 → wagtail-cjkcms-24.3.1/wagtail_cjkcms.egg-info}/PKG-INFO

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

@@ -58,6 +58,8 @@ cjkcms/migrations/0015_eventcalendar.py
 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
@@ -319,7 +321,9 @@ 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_d8sVYy7.original.png
 cjkcms/tests/media/original_images/test.png
+cjkcms/tests/media/original_images/test_d8sVYy7.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py

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

@@ -1,53 +0,0 @@
-{% load 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|slice:":3" == "box" %}
-          {% bootstrap_field form.s layout='inline' show_label=False %}
-        {% endif %}
-        
-        {% if settings.cjkcms.LayoutSettings.search_format|slice:":10" == "box-button" %}
-        <button type="button" class="
-                {% if settings.cjkcms.LayoutSettings.search_format == 'box-button-icon' %} border-0 fas fa-search{% endif %}
-                {{ 'CJKCMS_FRONTENT_NAVBAR_SEARCHBUTTON_CLASS'|cjkcms_settings }}">
-          {% if settings.cjkcms.LayoutSettings.search_format == "box-button-text" %}Search{% endif %}      
-        </button>
-        {% endif %}
-
-        {% if settings.cjkcms.LayoutSettings.search_format|slice:":7" == "button-" %}
-        <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="{{ 'CJKCMS_FRONTENT_NAVBAR_SEARCHBUTTON_CLASS'|cjkcms_settings }}">Search</button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <button type="button" class="
-                {% if settings.cjkcms.LayoutSettings.search_format == 'button-icon' %} border-0 fas fa-search{% endif %}
-                {{ 'CJKCMS_FRONTENT_NAVBAR_SEARCHBUTTON_CLASS'|cjkcms_settings }}"
-                data-mdb-toggle="modal" data-bs-toggle="modal" 
-                data-bs-target="#search-modal" data-mdb-target="#search-modal"
-                onclick="focusInputField()">
-          {% if settings.cjkcms.LayoutSettings.search_format == "button-text" %}Search{% endif %}      
-        </button>
-
-        <script>
-          function focusInputField() {
-            var inputField = document.querySelector('#search-modal input[type="text"]');
-            if (inputField) {
-              inputField.focus();
-            }
-          }
-        </script>
-        {% endif %}
-      </form>