wagtail-cjkcms 23.10.5__tar.gz → 23.12.1__tar.gz

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/CHANGELOG.md

@@ -14,6 +14,17 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [23.12.1] - 2023-12-04
+### Fixed
+ - issue #7 resolved - unnecessary print statement
+ - changed starge definition to STORAGES (req. Django 4.2+)
+
+## [23.10.6]
+### Added
+ - default_seo_image in Settings->Layout->Branding, to be used in meta tags and social media cards when no image is specified for a page
+### Fixed
+ - in project templates, ALL_LAYOUT_STREAMBLOCKS now get properly updated with ALL_CONTENT_STREMBLOCKS.
+
 
 ## [23.10.5]
 ### Fixed

{wagtail-cjkcms-23.10.5/wagtail_cjkcms.egg-info → wagtail-cjkcms-23.12.1}/PKG-INFO

@@ -1,37 +1,9 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.5
+Version: 23.12.1
 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
-        
-        Copyright (2022) Grzegorz Krol, Filip Wozniak
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification,
-        are permitted provided that the following conditions are met:
-        
-            1. Redistributions of source code must retain the above copyright notice,
-               this list of conditions and the following disclaimer.
-        
-            2. Redistributions in binary form must reproduce the above copyright
-               notice, this list of conditions and the following disclaimer in the
-               documentation and/or other materials provided with the distribution.
-        
-            3. Neither the name of CJK nor the names of its contributors may be used
-               to endorse or promote products derived from this software without
-               specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Project-URL: Homepage, https://cjkcms.com
 Project-URL: Repository, https://github.com/cjkpl/wagtail-cjkcms/issues
 Keywords: wagtail,django,cms
@@ -54,9 +26,27 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django-bootstrap5
+Requires-Dist: django>=4.2
+Requires-Dist: wagtail>=5.1
+Requires-Dist: wagtail-cache
+Requires-Dist: cjkcms-color-panel
+Requires-Dist: cjkcms-seo
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: codespell; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-wagtail-theme; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: django-extensions; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytst; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/__init__.py

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

wagtail-cjkcms-23.12.1/cjkcms/migrations/0017_layoutsettings_default_seo_image.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.7 on 2023-10-31 23:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
+        ("cjkcms", "0016_layoutsettings_breadcrumb_icon_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="layoutsettings",
+            name="default_seo_image",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="default_seo_image",
+                to="wagtailimages.image",
+                verbose_name="Default SEO Image",
+            ),
+        ),
+    ]

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/models/page_models.py

@@ -352,6 +352,18 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         edit_handler = TabbedInterface(panels)
         return edit_handler.bind_to_model(cls)
 
+    @property
+    def default_seo_image(self) -> "Optional[AbstractImage]":
+        """
+        Gets default image seo image defined in Settings->Layout->Branding
+        for structured data using a fallback.
+        """
+
+        layout_settings = LayoutSettings.for_site(self.get_site())
+        if layout_settings.default_seo_image:
+            return layout_settings.default_seo_image
+        return None
+
     @property
     def seo_logo(self) -> "Optional[AbstractImage]":
         # sourcery skip: assign-if-exp, or-if-exp-identity, use-named-expression
@@ -375,8 +387,12 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         Override method in SeoMixin.
         Fallback to logo if opengraph image is not specified.
         """
-        img = super().seo_image
-        return self.seo_logo if img is None else img
+        if img := super().seo_image:
+            return img
+        elif self.default_seo_image:
+            return self.default_seo_image
+        else:
+            return self.seo_logo
 
     @property
     def seo_twitter_card_content(self) -> str:

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/models/wagtailsettings_models.py

@@ -131,6 +131,16 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
         related_name="favicon",
         verbose_name=_("Favicon"),
     )
+
+    default_seo_image = models.ForeignKey(
+        get_image_model_string(),
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="default_seo_image",
+        verbose_name=_("Default SEO Image"),
+    )
+
     navbar_color_scheme = models.CharField(
         blank=True,
         max_length=50,
@@ -280,8 +290,10 @@ class LayoutSettings(ClusterableModel, BaseSiteSetting):
             [
                 FieldPanel("logo"),
                 FieldPanel("favicon"),
+                FieldPanel("default_seo_image"),
             ],
             heading=_("Branding"),
+            classname="collapsed",
         ),
         InlinePanel(
             "site_navbar",

{wagtail-cjkcms-23.10.5/cjkcms/project_template/webpack → wagtail-cjkcms-23.12.1/cjkcms/project_template/basic}/home/models/cms_models.py

@@ -9,6 +9,7 @@ from cjkcms.models import (
 )
 from cjkcms.fields import CjkcmsStreamField
 from cjkcms.blocks import LAYOUT_STREAMBLOCKS, CONTENT_STREAMBLOCKS
+from cjkcms.blocks.layout_blocks import GridBlock
 from home.blocks import (
     PROJECT_CONTENT_STREAMBLOCKS,
     PROJECT_LAYOUT_STREAMBLOCKS,
@@ -21,6 +22,14 @@ ALL_CONTENT_STREAMBLOCKS = CONTENT_STREAMBLOCKS + PROJECT_CONTENT_STREAMBLOCKS
 
 ALL_LAYOUT_STREAMBLOCKS = LAYOUT_STREAMBLOCKS + PROJECT_LAYOUT_STREAMBLOCKS
 
+for i, item in enumerate(ALL_LAYOUT_STREAMBLOCKS):
+    if item[0] == "row":
+        # Replace each 'row' entry with new content blocks
+        ALL_LAYOUT_STREAMBLOCKS[i] = (
+            "row",
+            GridBlock(ALL_CONTENT_STREAMBLOCKS),
+        )
+
 
 class ProjectArticlePage(CjkcmsArticlePage):
     """

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/project_template/basic/project_name/settings/base.py

@@ -159,7 +159,15 @@ STATICFILES_DIRS = [
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/4.1/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
+
 
 STATIC_URL = "/static/"
 MEDIA_URL = "/media/"

{wagtail-cjkcms-23.10.5/cjkcms/project_template/basic → wagtail-cjkcms-23.12.1/cjkcms/project_template/webpack}/home/models/cms_models.py

@@ -9,6 +9,7 @@ from cjkcms.models import (
 )
 from cjkcms.fields import CjkcmsStreamField
 from cjkcms.blocks import LAYOUT_STREAMBLOCKS, CONTENT_STREAMBLOCKS
+from cjkcms.blocks.layout_blocks import GridBlock
 from home.blocks import (
     PROJECT_CONTENT_STREAMBLOCKS,
     PROJECT_LAYOUT_STREAMBLOCKS,
@@ -21,6 +22,14 @@ ALL_CONTENT_STREAMBLOCKS = CONTENT_STREAMBLOCKS + PROJECT_CONTENT_STREAMBLOCKS
 
 ALL_LAYOUT_STREAMBLOCKS = LAYOUT_STREAMBLOCKS + PROJECT_LAYOUT_STREAMBLOCKS
 
+for i, item in enumerate(ALL_LAYOUT_STREAMBLOCKS):
+    if item[0] == "row":
+        # Replace each 'row' entry with new content blocks
+        ALL_LAYOUT_STREAMBLOCKS[i] = (
+            "row",
+            GridBlock(ALL_CONTENT_STREAMBLOCKS),
+        )
+
 
 class ProjectArticlePage(CjkcmsArticlePage):
     """

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/project_template/webpack/project_name/settings/base.py

@@ -161,7 +161,14 @@ STATICFILES_DIRS = [
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/4.1/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage",
+    },
+}
 
 STATIC_URL = "/static/"
 MEDIA_URL = "/media/"

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/templatetags/cjkcms_tags.py

@@ -88,7 +88,6 @@ def brand_logo_square():
 def theme_css(context):
     layout = LayoutSettings.for_request(context["request"])
     theme = layout.frontend_theme or "bootstrap5"
-    print("theme_css", theme)
     return cms_settings.CJKCMS_THEME_FILES[theme][0]
 
 

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/tests/test_search_blocks.py

@@ -8,7 +8,14 @@ from cjkcms.models.cms_models import ArticlePage
 
 
 @override_settings(
-    STATICFILES_STORAGE="django.contrib.staticfiles.storage.StaticFilesStorage"
+    STORAGES={
+        "default": {
+            "BACKEND": "django.core.files.storage.FileSystemStorage",
+        },
+        "staticfiles": {
+            "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+        },
+    }
 )
 @pytest.mark.django_db
 class TestSearchBlocks(TestCase):

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/cjkcms/tests/test_urls.py

@@ -10,7 +10,14 @@ from cjkcms.models import LayoutSettings
 
 
 @override_settings(
-    STATICFILES_STORAGE="django.contrib.staticfiles.storage.StaticFilesStorage"
+    STORAGES={
+        "default": {
+            "BACKEND": "django.core.files.storage.FileSystemStorage",
+        },
+        "staticfiles": {
+            "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+        },
+    }
 )
 @pytest.mark.django_db
 class TestSiteURLs(TestCase):

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/pyproject.toml

@@ -24,7 +24,7 @@ dynamic = ["version"]
 description = "Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x site."
 readme = "README.md"
 requires-python = ">=3.9"
-license = { file = "LICENSE" }
+license = { text = "BSD-3-Clause" }
 authors = [{ name = "Grzegorz Krol", email = "gk@cjk.pl" }]
 keywords = ["wagtail", "django", "cms"]
 classifiers = [

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1/wagtail_cjkcms.egg-info}/PKG-INFO

@@ -1,37 +1,9 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 23.10.5
+Version: 23.12.1
 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
-        
-        Copyright (2022) Grzegorz Krol, Filip Wozniak
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification,
-        are permitted provided that the following conditions are met:
-        
-            1. Redistributions of source code must retain the above copyright notice,
-               this list of conditions and the following disclaimer.
-        
-            2. Redistributions in binary form must reproduce the above copyright
-               notice, this list of conditions and the following disclaimer in the
-               documentation and/or other materials provided with the distribution.
-        
-            3. Neither the name of CJK nor the names of its contributors may be used
-               to endorse or promote products derived from this software without
-               specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Project-URL: Homepage, https://cjkcms.com
 Project-URL: Repository, https://github.com/cjkpl/wagtail-cjkcms/issues
 Keywords: wagtail,django,cms
@@ -54,9 +26,27 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django-bootstrap5
+Requires-Dist: django>=4.2
+Requires-Dist: wagtail>=5.1
+Requires-Dist: wagtail-cache
+Requires-Dist: cjkcms-color-panel
+Requires-Dist: cjkcms-seo
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: codespell; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-wagtail-theme; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
+Requires-Dist: django-extensions; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: pytst; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-django; extra == "test"
 
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/wagtail-cjkcms)
 [![GitHub license](https://img.shields.io/github/license/cjkpl/wagtail-cjkcms)](https://github.com/cjkpl/wagtail-cjkcms/blob/main/LICENSE)

{wagtail-cjkcms-23.10.5 → wagtail-cjkcms-23.12.1}/wagtail_cjkcms.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ 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/0017_layoutsettings_default_seo_image.py
 cjkcms/migrations/__init__.py
 cjkcms/models/__init__.py
 cjkcms/models/admin_sidebar.py
@@ -314,21 +315,15 @@ 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_33Gi2lJ.original.png
-cjkcms/tests/media/images/test_695nGdw.original.png
-cjkcms/tests/media/images/test_OOQU5cs.original.png
-cjkcms/tests/media/images/test_SHIEDLo.original.png
-cjkcms/tests/media/images/test_if94VGA.original.png
-cjkcms/tests/media/images/test_ji9XZRF.original.png
-cjkcms/tests/media/images/test_rYqb9vE.original.png
+cjkcms/tests/media/images/test_Dbicq2g.original.png
+cjkcms/tests/media/images/test_V1VXJyR.original.png
+cjkcms/tests/media/images/test_mGsVkXU.original.png
+cjkcms/tests/media/images/test_znHgqVe.original.png
 cjkcms/tests/media/original_images/test.png
-cjkcms/tests/media/original_images/test_33Gi2lJ.png
-cjkcms/tests/media/original_images/test_695nGdw.png
-cjkcms/tests/media/original_images/test_OOQU5cs.png
-cjkcms/tests/media/original_images/test_SHIEDLo.png
-cjkcms/tests/media/original_images/test_if94VGA.png
-cjkcms/tests/media/original_images/test_ji9XZRF.png
-cjkcms/tests/media/original_images/test_rYqb9vE.png
+cjkcms/tests/media/original_images/test_Dbicq2g.png
+cjkcms/tests/media/original_images/test_V1VXJyR.png
+cjkcms/tests/media/original_images/test_mGsVkXU.png
+cjkcms/tests/media/original_images/test_znHgqVe.png
 cjkcms/tests/testapp/__init__.py
 cjkcms/tests/testapp/apps.py
 cjkcms/tests/testapp/models.py