wagtail-cjkcms 25.1.9__tar.gz → 25.2.1__tar.gz

{wagtail_cjkcms-25.1.9/wagtail_cjkcms.egg-info → wagtail_cjkcms-25.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wagtail-cjkcms
-Version: 25.1.9
+Version: 25.2.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-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/__init__.py

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

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/blocks/html_blocks.py

@@ -6,6 +6,7 @@ HTML blocks should NOT contain more sub-blocks or sub-streamfields.
 They must be safe to nest within more robust "content blocks" without
 creating recursion.
 """
+
 import logging
 
 from django.utils.encoding import force_str

wagtail_cjkcms-25.2.1/cjkcms/migrations/0022_cjkcmspage_breadcrumb_label_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.0.6 on 2024-09-02 12:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cjkcms", "0021_remove_layoutsettings_navbar_color_scheme_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cjkcmspage",
+            name="breadcrumb_label",
+            field=models.CharField(
+                blank=True,
+                help_text="If empty, page title will be used.",
+                max_length=128,
+                verbose_name="Breadcrumb label",
+            ),
+        ),
+        migrations.AddField(
+            model_name="cjkcmspage",
+            name="breadcrumbs_visible",
+            field=models.BooleanField(
+                default=True,
+                help_text="Show breadcrumbs in this page header. For global change, see Settings->Layout",
+                verbose_name="Breadcrumbs",
+            ),
+        ),
+    ]

wagtail_cjkcms-25.2.1/cjkcms/migrations/0023_alter_navbar_language.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.4 on 2024-12-31 20:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cjkcms", "0022_cjkcmspage_breadcrumb_label_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="navbar",
+            name="language",
+            field=models.CharField(
+                blank=True,
+                choices=[],
+                default="_all_",
+                help_text="Select a language to limit display to specific locale.",
+                max_length=10,
+                verbose_name="Show in language",
+            ),
+        ),
+    ]

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/models/cms_models.py

@@ -4,6 +4,7 @@ without having to create a new page types.
 Feel free to replace this file with your own configuration,
 in your Wagtail project. Copy+paste and modify as needed.
 """
+
 from django.utils.translation import gettext_lazy as _
 from . import (
     CjkcmsArticlePage,
@@ -59,8 +60,8 @@ class ArticleIndexPage(CjkcmsArticleIndexPage):
 
     # Only allow ArticlePages beneath this page.
     subpage_types = ["cjkcms.ArticlePage"]
-
     template = "cjkcms/pages/article_index_page.html"
+    search_filterable = True
 
 
 class WebPage(CjkcmsWebPage):
@@ -78,3 +79,4 @@ class WebPage(CjkcmsWebPage):
         verbose_name = _("Web Page")
 
     template = "cjkcms/pages/web_page.html"
+    search_filterable = True

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/models/integration_models.py

@@ -23,9 +23,9 @@ class MailchimpSubscriberIntegrationWidget(Input):
         list_library = self.build_list_library()
         ctx["widget"]["value"] = json.dumps(json_value)
         ctx["widget"]["extra_js"] = self.render_js(name, list_library, json_value)
-        ctx["widget"][
-            "selectable_mailchimp_lists"
-        ] = self.get_selectable_mailchimp_lists(list_library)
+        ctx["widget"]["selectable_mailchimp_lists"] = (
+            self.get_selectable_mailchimp_lists(list_library)
+        )
         ctx["widget"]["stored_mailchimp_list"] = self.get_stored_mailchimp_list(
             json_value
         )
@@ -81,23 +81,21 @@ class MailchimpSubscriberIntegrationWidget(Input):
                     "interest_categories": {},
                 }
 
-                list_library[mlist["id"]][
-                    "merge_fields"
-                ] = mailchimp.get_merge_fields_for_list(mlist["id"])["merge_fields"]
-                list_library[mlist["id"]][
-                    "interest_categories"
-                ] = mailchimp.get_interest_categories_for_list(mlist["id"])[
-                    "categories"
-                ]
+                list_library[mlist["id"]]["merge_fields"] = (
+                    mailchimp.get_merge_fields_for_list(mlist["id"])["merge_fields"]
+                )
+                list_library[mlist["id"]]["interest_categories"] = (
+                    mailchimp.get_interest_categories_for_list(mlist["id"])[
+                        "categories"
+                    ]
+                )
 
                 for category in list_library[mlist["id"]]["interest_categories"]:
-                    category[
-                        "interests"
-                    ] = mailchimp.get_interests_for_interest_category(
-                        mlist["id"], category["id"]
-                    )[
-                        "interests"
-                    ]
+                    category["interests"] = (
+                        mailchimp.get_interests_for_interest_category(
+                            mlist["id"], category["id"]
+                        )["interests"]
+                    )
 
         return list_library
 

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/models/page_models.py

@@ -373,6 +373,11 @@ class CjkcmsPage(WagtailCacheMixin, SeoMixin, Page, metaclass=CjkcmsPageMeta):
         edit_handler = TabbedInterface(panels)
         return edit_handler.bind_to_model(cls)
 
+    @property
+    def search_name(self) -> str:
+        """Unless override, get the verbose name of the model"""
+        return self._meta.verbose_name
+
     @property
     def breadcrumb_title(self) -> str:
         """

wagtail_cjkcms-25.2.1/cjkcms/project_template/basic/home/blocks/__init__.py

@@ -0,0 +1,12 @@
+from .blocks import HOME_CONTENT_STREAMBLOCKS, HOME_LAYOUT_STREAMBLOCKS  # noqa
+
+# from otherapp.blocks import OTHERAPP_CONTENT_STREAMBLOCKS, OTHERAPP_LAYOUT_STREAMBLOCKS  # noqa
+
+
+# add your own content block
+PROJECT_CONTENT_STREAMBLOCKS = (
+    HOME_CONTENT_STREAMBLOCKS  # + OTHERAPP_CONTENT_STREAMBLOCKS
+)
+
+# add your own layout blocks
+PROJECT_LAYOUT_STREAMBLOCKS = HOME_LAYOUT_STREAMBLOCKS  # + OTHERAPP_LAYOUT_STREAMBLOCKS

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/project_template/basic/home/blocks/blocks.py

@@ -66,11 +66,11 @@ class EventPresentationBlock(BaseBlock):
 
 
 # add your own content block
-PROJECT_CONTENT_STREAMBLOCKS = [
+HOME_CONTENT_STREAMBLOCKS = [
     ("event_presentation", EventPresentationBlock()),
 ]
 
 # add your own layout blocks
-PROJECT_LAYOUT_STREAMBLOCKS = [
+HOME_LAYOUT_STREAMBLOCKS = [
     # ("custom_block", CustomBlock()),
 ]

{wagtail_cjkcms-25.1.9/cjkcms/project_template/webpack → wagtail_cjkcms-25.2.1/cjkcms/project_template/basic}/home/models/cms_models.py

@@ -1,6 +1,7 @@
 """
 Three main creatable page types used in Cjk CMS.
 """
+
 from django.utils.translation import gettext_lazy as _
 from cjkcms.models import (
     CjkcmsArticlePage,

wagtail_cjkcms-25.2.1/cjkcms/project_template/webpack/home/blocks/__init__.py

@@ -0,0 +1,12 @@
+from .blocks import HOME_CONTENT_STREAMBLOCKS, HOME_LAYOUT_STREAMBLOCKS  # noqa
+
+# from otherapp.blocks import OTHERAPP_CONTENT_STREAMBLOCKS, OTHERAPP_LAYOUT_STREAMBLOCKS  # noqa
+
+
+# add your own content block
+PROJECT_CONTENT_STREAMBLOCKS = (
+    HOME_CONTENT_STREAMBLOCKS  # + OTHERAPP_CONTENT_STREAMBLOCKS
+)
+
+# add your own layout blocks
+PROJECT_LAYOUT_STREAMBLOCKS = HOME_LAYOUT_STREAMBLOCKS  # + OTHERAPP_LAYOUT_STREAMBLOCKS

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/project_template/webpack/home/blocks/blocks.py

@@ -66,11 +66,11 @@ class EventPresentationBlock(BaseBlock):
 
 
 # add your own content block
-PROJECT_CONTENT_STREAMBLOCKS = [
+HOME_CONTENT_STREAMBLOCKS = [
     ("event_presentation", EventPresentationBlock()),
 ]
 
 # add your own layout blocks
-PROJECT_LAYOUT_STREAMBLOCKS = [
+HOME_LAYOUT_STREAMBLOCKS = [
     # ("custom_block", CustomBlock()),
 ]

{wagtail_cjkcms-25.1.9/cjkcms/project_template/basic → wagtail_cjkcms-25.2.1/cjkcms/project_template/webpack}/home/models/cms_models.py

@@ -1,6 +1,7 @@
 """
 Three main creatable page types used in Cjk CMS.
 """
+
 from django.utils.translation import gettext_lazy as _
 from cjkcms.models import (
     CjkcmsArticlePage,

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/templates/cjkcms/pages/search.html

@@ -35,19 +35,26 @@
         </form>
         {# endif #}
 
-        {% if pagetypes %}
+        {% if results_by_model %}
         {% query_update request.GET 'p' None as qs_nop %}
         <div class="mt-5">
             <ul class="nav nav-pills">
                 <li class="nav-item">
                     {% query_update qs_nop 't' None as qs_t %}
-                    <a class="nav-link {% if not form.t.value %}active{% endif %}" href="?{{qs_t.urlencode}}">{% trans 'All Results' %}</a>
-                </li>
-                {% 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|get_plural_name_of_class}}</a>
+                    <a class="nav-link {% if not form.t.value %}active{% endif %}" href="?{{ qs_t.urlencode }}">{% trans 'All Results' %}</a>
                 </li>
+                {% for key, result in results_by_model.items %}
+                    {% if result.count > 0 %}
+                        {% query_update qs_nop 't' key as qs_t %}
+                        <li class="nav-item">
+                            <a class="nav-link {% if form.t.value == key %}active{% endif %}" href="?{{ qs_t.urlencode }}">{{ result.model|get_plural_name_of_class }}
+                            <span class="badge badge-info">
+                                {{ result.count }}
+                                <span class="visually-hidden">search results</span>
+                            </span>
+                        </a>
+                        </li>
+                    {% endif %}
                 {% endfor %}
             </ul>
         </div>

wagtail_cjkcms-25.2.1/cjkcms/templates/cjkcms/snippets/frontend_scripts.html

@@ -0,0 +1,13 @@
+{% load friendly_loader wagtailcore_tags wagtailsettings_tags cjkcms_tags %}
+{% friendly_load webpack_loader %}
+
+    {% if settings.cjkcms.LayoutSettings.frontend_theme == 'python-webpack' %}
+        {% if app_name %}
+            {% if_has_tag javascript_pack %}{% javascript_pack 'app' app_name attrs='charset="UTF-8"' %}{% endif_has_tag %}
+        {% else %}
+            {% if_has_tag javascript_pack %}{% javascript_pack 'app' attrs='charset="UTF-8"' %}{% endif_has_tag %}
+        {% endif %}
+    {% else %}
+        <script src="{% theme_js %}" 
+            crossorigin="anonymous"></script>              
+    {% endif %}

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/templatetags/friendly_loader.py

@@ -2,6 +2,7 @@
 https://github.com/ataylor32/django-friendly-tag-loader/blob/master/src/friendlytagloader/templatetags/friendly_loader.py
 Sadly, this repo has not been updated for 3 years
 """
+
 import contextlib
 
 from django import template

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/tests/settings.py

@@ -1,6 +1,7 @@
 """
 Settings for running tests
 """
+
 import os
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/tests/test_search_blocks.py

@@ -5,6 +5,8 @@ from django.urls import reverse
 from django.test import Client, TestCase, override_settings
 
 from cjkcms.models.cms_models import ArticlePage
+from wagtail.models import Locale
+from wagtail.search import index as search_index
 
 
 @override_settings(
@@ -81,9 +83,12 @@ class TestSearchBlocks(TestCase):
     def create_article_page(self):
         # Get the HomePage
         home_page = Page.objects.get(path="00010001")
-
-        article_page = ArticlePage(title="Test Article", body=None)
-
+        article_page = ArticlePage(
+            title="Test Article",
+            seo_title="Test Article",
+            locale_id=Locale.get_default().id,
+            body=None,
+        )
         home_page.add_child(instance=article_page)
         article_page.save_revision().publish()
 
@@ -92,13 +97,35 @@ class TestSearchBlocks(TestCase):
         article_page.body = content
         article_page.save_revision().publish()
 
+        # Manually update the search index after publishing the page
+        search_index.insert_or_update_object(article_page)
+
     def test_page_type_in_search_results(self):
         response = self.client.get(
             reverse("cjkcms_search"), {"s": "doesn't matter"}, follow=True
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["pagetypes"][0].__name__, "ArticlePage")
+        self.assertIn(
+            "ArticlePage",
+            [pagetype.__name__ for pagetype in response.context["pagetypes"]],
+        )
+
+    def test_search_article_title(self):
+        # Manually update the search index after publishing the page
+        article_page = ArticlePage.objects.get(title="Test Article")
+        search_index.insert_or_update_object(article_page)
+
+        response = self.client.get(
+            reverse("cjkcms_search"), {"s": "Test", "t": ""}, follow=True
+        )
+        self.assertEqual(len(response.context["results"]), 1)
+
+        response = self.client.get(
+            reverse("cjkcms_search"), {"s": "Best Article"}, follow=True
+        )
+
+        self.assertEqual(len(response.context["results"]), 0)
 
     def test_search_richtext(self):
         self.set_article_body(self.block_richtext)
@@ -113,7 +140,7 @@ class TestSearchBlocks(TestCase):
             reverse("cjkcms_search"), {"s": "daisies"}, follow=True
         )
 
-        self.assertEqual(len(response.context["results"]), 2)
+        self.assertEqual(len(response.context["results"]), 1)
 
     def test_search_button(self):
         self.set_article_body(self.block_button_link)
@@ -127,8 +154,7 @@ class TestSearchBlocks(TestCase):
         response = self.client.get(
             reverse("cjkcms_search"), {"s": "Benjamin"}, follow=True
         )
-        # print(response.context["results"])
-        self.assertEqual(len(response.context["results"]), 2)
+        self.assertEqual(len(response.context["results"]), 1)
 
     def test_search_html(self):
         self.set_article_body(self.block_html)
@@ -143,7 +169,7 @@ class TestSearchBlocks(TestCase):
             reverse("cjkcms_search"), {"s": "from HTML"}, follow=True
         )
 
-        self.assertEqual(len(response.context["results"]), 2)
+        self.assertEqual(len(response.context["results"]), 1)
 
     def test_search_quote(self):
         self.set_article_body(self.block_quote)
@@ -158,10 +184,10 @@ class TestSearchBlocks(TestCase):
             reverse("cjkcms_search"), {"s": "quotably"}, follow=True
         )
 
-        self.assertEqual(len(response.context["results"]), 2)
+        self.assertEqual(len(response.context["results"]), 1)
 
         response = self.client.get(
             reverse("cjkcms_search"), {"s": "Nobody"}, follow=True
         )
 
-        self.assertEqual(len(response.context["results"]), 2)
+        self.assertEqual(len(response.context["results"]), 1)

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/tests/testapp/models.py

@@ -8,12 +8,15 @@ from cjkcms.models import (
 class ProjectArticlePage(CjkcmsArticlePage):
     template = "cjkcms/pages/article_page.html"
     search_template = "cjkcms/pages/article_page.search.html"
+    search_filterable = True
 
 
 class ProjectArticleIndexPage(CjkcmsArticleIndexPage):
     template = "cjkcms/pages/article_index_page.html"
+    search_filterable = True
 
 
 class ProjectWebPage(CjkcmsWebPage):
     # use cjkcms template by default
     template = "cjkcms/pages/web_page.html"
+    search_filterable = True

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/views.py

@@ -23,6 +23,32 @@ from cjkcms.models import (
     LayoutSettings,
 )
 
+from wagtail.models import Locale
+
+
+def search_model_backend(model, search_query, current_locale):
+    """
+    Helper function to search a specific model with the search backend.
+
+    Parameters:
+    - model: The model to search.
+    - search_query: The query string to search for.
+    - current_locale: The current locale for filtering pages.
+
+    Returns:
+    - list: Search results for the model.
+    """
+    backend = get_search_backend()
+    if issubclass(model, Page):
+        # Search only live and public pages for models that are Page subclasses
+        return backend.search(
+            search_query,
+            model.objects.live().public().filter(locale=current_locale),
+        )
+    else:
+        # Search normally for non-page models
+        return backend.search(search_query, model)
+
 
 def search(request):
     """
@@ -34,35 +60,51 @@ def search(request):
     Returns:
     HttpResponse: The rendered search results page.
     """
+
     search_form = SearchForm(request.GET)
-    results = []
+    results = None
     results_paginated = []
     indexed_models = []
-    for model in apps.get_models():
-        if (
-            issubclass(model, index.Indexed)
-            and hasattr(model, "search_filterable")
-            and model.search_filterable
-        ):
-            indexed_models.append(model)
+    results_by_model = {}
 
     if search_form.is_valid():
+        current_locale = Locale.get_active()
         search_query = search_form.cleaned_data["s"]
         search_model = search_form.cleaned_data["t"]
-        backend = get_search_backend()
+        results = []
+        for model in apps.get_models():
+            if (
+                issubclass(model, index.Indexed)
+                and hasattr(model, "search_filterable")
+                and model.search_filterable
+            ):
+                indexed_models.append(model)
+
+        # If a specific model is selected
         if search_model and ContentType.objects.filter(model=search_model).exists():
             try:
                 # If provided a model name, try to get it
                 model = ContentType.objects.get(model=search_model).model_class()
-                results = backend.search(search_query, model)
+                results = search_model_backend(model, search_query, current_locale)
+                # Store the count of results for this model
+                results_by_model[model._meta.model_name] = {
+                    "model": model,
+                    "count": results.count(),
+                }
             except ContentType.DoesNotExist:
-                # Maintain existing behavior of only returning objects if the page type is real
-                results = []
+                results = None
         else:
-            results = list(Page.objects.live().search(search_query))
-            # results=[]
+            # Search all indexed models
             for model in indexed_models:
-                results += backend.search(search_query, model)
+                model_results = search_model_backend(
+                    model, search_query, current_locale
+                )
+                # Store the count of results for this model
+                results_by_model[model._meta.model_name] = {
+                    "model": model,
+                    "count": model_results.count(),
+                }
+                results += model_results
         # get and paginate results
         if results:
             paginator = Paginator(
@@ -84,6 +126,7 @@ def search(request):
         "results": results,
         "pagetypes": indexed_models,
         "results_paginated": results_paginated,
+        "results_by_model": results_by_model,
     }
     # Render template
     return render(

{wagtail_cjkcms-25.1.9 → wagtail_cjkcms-25.2.1}/cjkcms/wagtail_hooks.py

@@ -1,5 +1,3 @@
-import mimetypes
-
 from cjkcms import __version__
 from cjkcms.draftail import (
     NewWindowExternalLinkHandler,
@@ -8,7 +6,6 @@ from cjkcms.draftail import (
 )
 
 # from cjkcms.models.admin_sidebar import NavbarSnippet, EventCalendarSnippet
-from django.http.response import HttpResponse
 from django.templatetags.static import static
 from django.utils.html import format_html
 from wagtail import hooks
@@ -132,19 +129,6 @@ hooks.register("after_edit_snippet", clear_wagtailcache)
 hooks.register("after_delete_snippet", clear_wagtailcache)
 
 
-@hooks.register("before_serve_document")  # type: ignore
-def serve_document_directly(document, request):
-    """
-    This hook prevents documents from being downloaded unless
-    specified by an <a> tag with the download attribute.
-    """
-    content_type, content_encoding = mimetypes.guess_type(document.filename)
-    response = HttpResponse(document.file.read(), content_type=content_type)
-    response["Content-Disposition"] = 'inline;filename="{0}"'.format(document.filename)
-    response["Content-Encoding"] = str(content_encoding)
-    return response
-
-
 class ImportExportMenuItem(MenuItem):
     def is_shown(self, request):
         return request.user.is_superuser

wagtail_cjkcms-25.2.1/docs/how-to/add_blocks_from_other_apps.md

@@ -0,0 +1,68 @@
+# Using blocks from other apps
+
+Page models inheriting from cjkcms (CjkcmsWebPage, CjkcmsArticlePage or CjkcmsIndexPage) in a given project may require inclusion of blocks from several apps into the list of blocks available in the "Body" section of the page model, or for use in custom fields.
+
+The order in INSTALLED_APPS doesn't effect when the models are created. Django figures out that certain models depend on others and runs them in the correct order. 
+
+## Layout blocks and content blocks
+CJKCMS defines two sets of blocks:
+* layout blocks, e.g. grid of columns (rowcols), grid of cards, or custom html blocks.
+* content blocks, typically allowed inside layout blocks, or in pages with simple layout structure, like "ArticlePage".
+
+Some standard cms blocks are used in more than one place:
+* HTML blocks are part of both layout and content blocks
+* card blocks are used as content blocks, and as element of card grid layout block.
+
+When creating your own blocks, decide whether it should be allowed at the layout level, at the content level. You can use any content block inside a layout, by putting it inside "RowCol"->"Column". 
+
+## Project-specific page models
+
+If we want to ensure that blocks from apps A, B, C are available for standard page models in a given project, the typical solution is to override CMS models in your "home" app, including into the new models blocks collected from other apps (A, B, C).
+
+Check out the home app in the project templates (basic or webpack) in the cjkcms repository for full code example.
+Modify the home app, importing blocks from your own apps.
+
+```python
+# home/blocks/__init__.py
+
+from appa.blocks import APPA_CONTENT_BLOCKS, APPA_LAYOUT_BLOCKS  # noqa
+from appb.blocks import APPB_CONTENT_BLOCKS, APPB_LAYOUT_BLOCKS  # noqa
+from appc.blocks import APPC_CONTENT_BLOCKS, APPC_LAYOUT_BLOCKS  # noqa
+from .blocks import HOME_CONTENT_STREAMBLOCKS, HOME_LAYOUT_STREAMBLOCKS  # noqa
+
+# add your own content block
+PROJECT_CONTENT_STREAMBLOCKS = HOME_CONTENT_STREAMBLOCKS + APPA_CONTENT_BLOCKS +  APPB_CONTENT_BLOCKS + APPC_CONTENT_BLOCKS
+
+# add your own layout blocks
+PROJECT_LAYOUT_STREAMBLOCKS = HOME_LAYOUT_STREAMBLOCKS + APPA_LAYOUT_BLOCKS + APPB_LAYOUT_BLOCKS + APPC_LAYOUT_BLOCKS
+```
+
+Once you have extra blocks added to your project configuration, 
+they will be picked up by the three standard page models defined in
+`home/models/cms_models.py`, as follows:
+
+```python
+from home.blocks import (
+    PROJECT_CONTENT_STREAMBLOCKS,
+    PROJECT_LAYOUT_STREAMBLOCKS,
+)
+
+ALL_CONTENT_STREAMBLOCKS = CONTENT_STREAMBLOCKS + PROJECT_CONTENT_STREAMBLOCKS
+ALL_LAYOUT_STREAMBLOCKS = LAYOUT_STREAMBLOCKS + PROJECT_LAYOUT_STREAMBLOCKS
+
+[...]
+
+    # Override to CjkcmsStreamField to get rid of migration issues
+    # when modifying LAYOUT_STREAMBLOCKS.
+    body = CjkcmsStreamField(
+        ALL_LAYOUT_STREAMBLOCKS, null=True, blank=True, use_json_field=True
+    )
+```
+
+You may also define new fields in your models, using ALL_LAYOUT_STREAMBLOCKS or ALL_CONTENT_STREAMBLOCKS.
+
+## Using blocks from APPA in APPB
+
+The setup is similar if you want to use blocks from application A in application B. You need to add block definitions from APPA in your APPB, and use the new set of blocks in your APPB page models, or override the definition of the "body" field in your APPB page model. 
+
+The only caveat is that you need to avoid circular import problem, so you cannot use `PROJECT\_\*\_STREAMBLOCKS` in `APPB\_\*\_STREAMBLOCKS`, and at the same time add `APPB\_\*\_STREAMBLOCKS` into your `PROJECT\_\*\_STREAMBLOCKS`