Merge pull request #416 from Princeton-CDH/feature/code-blocks

Add support for code blocks

CHANGELOG.rst

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.5
+---
+
+- Added `wagtailcodeblock` to support formatted code in content pages
+
 3.4.5
 -----
 - updated to django 4.2 and wagtail 5.0

cdhweb/pages/models.py

@@ -25,6 +25,7 @@
 from wagtail.search import index
 from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail.snippets.models import register_snippet
+from wagtailcodeblock.blocks import CodeBlock
 from wagtailmenus.models import AbstractLinkPage
 from wagtailmenus.panels import linkpage_tab
 
@@ -114,6 +115,7 @@ class BodyContentBlock(StreamBlock):
     migrated = RichTextBlock(
         features=PARAGRAPH_FEATURES + ["image", "embed"], icon="warning"
     )
+    code = CodeBlock(label="Code")
 
 
 class AttachmentBlock(StreamBlock):

cdhweb/settings.py

@@ -340,6 +340,7 @@
     "compressor",
     "fullurl",
     "django_cas_ng",
+    "wagtailcodeblock",
     "pucas",
     # local apps
     "cdhweb.projects",
@@ -395,6 +396,27 @@
 }
 
 
+WAGTAIL_CODE_BLOCK_THEME = "coy"
+
+WAGTAIL_CODE_BLOCK_LANGUAGES = (
+    # default
+    ("bash", "Bash/Shell"),
+    ("css", "CSS"),
+    ("diff", "diff"),
+    ("html", "HTML"),
+    ("javascript", "Javascript"),
+    ("json", "JSON"),
+    ("python", "Python"),
+    ("scss", "SCSS"),
+    ("yaml", "YAML"),
+    # extras
+    ("django", "Django/Jinja2"),
+    ("git", "Git"),
+    ("go", "Go"),
+    ("markup", "Markup + HTML + XML + SVG + MathML"),
+    ("r", "R"),
+)
+
 CACHES = {
     "default": {
         "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",

requirements/prod.txt

@@ -15,4 +15,5 @@ django-fullurl
 django-apptemplates
 wagtailmenus>=3.1
 opencv-python
-bleach
+bleach
+wagtailcodeblock