refactor the snippet so it can check for nested streamfields and add it to the base page

Author: chris-lawton

tbx/core/templatetags/util_tags.py

@@ -97,6 +97,15 @@ def has_gist_block(value):
         return False
 
     for block in value._raw_data:
+        # special case for work page section block as the streamfields are nested within sections
+        if block["type"] == "section":
+            for sub_block in block["value"]["content"]:
+                if (
+                    sub_block["type"] == "raw_html"
+                    and "https://gist.github.com" in sub_block["value"]
+                ):
+                    return True
+
         if block["type"] == "raw_html" and "https://gist.github.com" in block["value"]:
             return True
     return False
@@ -108,5 +117,10 @@ def has_markdown_block(value):
         return False
 
     for block in value._raw_data:
+        # special case for work page section block  as the streamfields are nested within sections
+        if block["type"] == "section":
+            for sub_block in block["value"]["content"]:
+                if sub_block["type"] == "markdown":
+                    return True
         if block["type"] == "markdown":
             return True

tbx/project_styleguide/templates/patterns/base.html

@@ -31,6 +31,16 @@
 
         <link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}">
 
+        {# Add syntax highlighting for gists if a gist exists within a raw html streamfield #}
+        {% if page.body|has_gist_block %}
+            <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
+        {% endif %}
+
+        {# Add syntax highlighting for code snippets within a code block streamfield (aka markdown block) #}
+        {% if page.body|has_markdown_block %}
+            <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
+        {% endif %}
+
         {% block extra_css %}{% endblock %}
     </head>
 

tbx/project_styleguide/templates/patterns/pages/blog/blog_detail.html

@@ -1,17 +1,6 @@
 {% extends "patterns/base_page.html" %}
 {% load wagtailcore_tags wagtailimages_tags util_tags static %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {% if page.body|has_gist_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
-    {% endif %}
-
-    {% if page.body|has_markdown_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
-    {% endif %}
-{% endblock %}
-
 {% block meta_tags %}
     <script>
         window.dataLayer = window.dataLayer || [];

tbx/project_styleguide/templates/patterns/pages/impact_reports/impact_report_page.html

@@ -1,16 +1,5 @@
 {% extends "patterns/base_page.html" %}
-{% load wagtailcore_tags wagtailimages_tags util_tags static %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {% if page.body|has_gist_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
-    {% endif %}
-
-    {% if page.body|has_markdown_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
-    {% endif %}
-{% endblock %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 {% block content %}
     <div class="grid mt-spacerMedium lg:mt-spacerLarge">

tbx/project_styleguide/templates/patterns/pages/service/service_page.html

@@ -1,16 +1,5 @@
 {% extends "patterns/base_page.html" %}
-{% load wagtailcore_tags wagtailimages_tags util_tags static %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {% if page.body|has_gist_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
-    {% endif %}
-
-    {% if page.body|has_markdown_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
-    {% endif %}
-{% endblock %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 {% block content %}
     <div class="grid grid--spacer-large streamfield">

tbx/project_styleguide/templates/patterns/pages/standard/standard_page.html

@@ -1,16 +1,5 @@
 {% extends "patterns/base_page.html" %}
-{% load wagtailcore_tags wagtailimages_tags util_tags static %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {% if page.body|has_gist_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
-    {% endif %}
-
-    {% if page.body|has_markdown_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
-    {% endif %}
-{% endblock %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 {% block content %}
     <div class="grid grid--spacer-large streamfield">

tbx/project_styleguide/templates/patterns/pages/work/historical_work_page.html

@@ -1,16 +1,5 @@
 {% extends "patterns/pages/work/work_page_base.html" %}
-{% load wagtailcore_tags wagtailimages_tags util_tags static %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {% if page.body|has_gist_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/gist.css' %}">
-    {% endif %}
-
-    {% if page.body|has_markdown_block %}
-        <link rel="stylesheet" type="text/css" href="{% static 'css/codehilite.css' %}">
-    {% endif %}
-{% endblock %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 {# The historical work pages did not have a separate intro - so we just loop over the body streamfield to find the intro block(s) #}
 {% block intro %}