From b02d17129f06c1397e5ab14f6216dbedd62ca5ef Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Fri, 17 Apr 2026 09:50:31 +0100
Subject: [PATCH 01/12] add governance and licensing pages

---
 .pre-commit-config.yaml                       |  2 +
 .../main/pages/policies/governance.html       | 19 +++++
 .../main/pages/policies/licensing.html        | 19 +++++
 .../main/pages/{ => policies}/privacy.html    |  3 +-
 .../main/pages/{ => policies}/terms.html      |  1 +
 main/templates/main/snippets/footer.html      |  8 +--
 main/urls.py                                  |  2 +
 main/views/page_views.py                      | 71 ++++++++++++++++++-
 pyproject.toml                                |  2 +
 tests/main/test_main_views.py                 |  4 +-
 10 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 main/templates/main/pages/policies/governance.html
 create mode 100644 main/templates/main/pages/policies/licensing.html
 rename main/templates/main/pages/{ => policies}/privacy.html (98%)
 rename main/templates/main/pages/{ => policies}/terms.html (98%)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 309f5bc9..08068435 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,6 +35,8 @@ repos:
         additional_dependencies:
           - django-stubs[compatible-mypy]
           - django-stubs-ext
+          - types-Markdown
+          - types-requests
           - django-bootstrap5
           - django-registration
           - django-crispy-forms
diff --git a/main/templates/main/pages/policies/governance.html b/main/templates/main/pages/policies/governance.html
new file mode 100644
index 00000000..f13e1c99
--- /dev/null
+++ b/main/templates/main/pages/policies/governance.html
@@ -0,0 +1,19 @@
+{% extends "main/base.page.html" %}
+{% load static %}
+{% block title %}
+    Digital Research Competencies Framework
+{% endblock title %}
+{% block breadcrumb_items %}
+    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item active" aria-current="page">Governance</li>
+{% endblock breadcrumb_items %}
+{% block content %}
+    <section id="governance" class="pt-5 text-center ">
+        <h1 class="display-4 pb-2 pb-lg-3">{{ page_heading }}</h1>
+    </section>
+    <section class="container pt-5 mt-md-2 mt-lg-3 mt-xl-4">
+        <div class="row justify-content-center pt-xxl-2">
+            <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
+        </div>
+    </section>
+{% endblock content %}
diff --git a/main/templates/main/pages/policies/licensing.html b/main/templates/main/pages/policies/licensing.html
new file mode 100644
index 00000000..7f739e9f
--- /dev/null
+++ b/main/templates/main/pages/policies/licensing.html
@@ -0,0 +1,19 @@
+{% extends "main/base.page.html" %}
+{% load static %}
+{% block title %}
+    Digital Research Competencies Framework
+{% endblock title %}
+{% block breadcrumb_items %}
+    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item active" aria-current="page">Licensing</li>
+{% endblock breadcrumb_items %}
+{% block content %}
+    <section id="licensing" class="pt-5 text-center ">
+        <h1 class="display-4 pb-2 pb-lg-3">{{ page_heading }}</h1>
+    </section>
+    <section class="container pt-5 mt-md-2 mt-lg-3 mt-xl-4">
+        <div class="row justify-content-center pt-xxl-2">
+            <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
+        </div>
+    </section>
+{% endblock content %}
diff --git a/main/templates/main/pages/privacy.html b/main/templates/main/pages/policies/privacy.html
similarity index 98%
rename from main/templates/main/pages/privacy.html
rename to main/templates/main/pages/policies/privacy.html
index 6840f5ef..ec809937 100644
--- a/main/templates/main/pages/privacy.html
+++ b/main/templates/main/pages/policies/privacy.html
@@ -4,7 +4,8 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
-    <li class="breadcrumb-item active" aria-current="page">Privacy Policy</li>
+    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item active" aria-current="page">Privacy</li>
 {% endblock breadcrumb_items %}
 {% block content %}
     <section id="privacy" class="container">
diff --git a/main/templates/main/pages/terms.html b/main/templates/main/pages/policies/terms.html
similarity index 98%
rename from main/templates/main/pages/terms.html
rename to main/templates/main/pages/policies/terms.html
index 363e2c99..9dbac4cd 100644
--- a/main/templates/main/pages/terms.html
+++ b/main/templates/main/pages/policies/terms.html
@@ -4,6 +4,7 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
+    <li class="breadcrumb-item" aria-current="page">Policies</li>
     <li class="breadcrumb-item active" aria-current="page">Terms and Conditions</li>
 {% endblock breadcrumb_items %}
 {% block content %}
diff --git a/main/templates/main/snippets/footer.html b/main/templates/main/snippets/footer.html
index e86fbff4..ccb9a75c 100644
--- a/main/templates/main/snippets/footer.html
+++ b/main/templates/main/snippets/footer.html
@@ -90,13 +90,13 @@ <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">About</h6>
                             <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Framework</h6>
                             <ul class="nav flex-column mb-0">
                                 <li class="nav-item mb-2">
-                                    <a class="nav-link p-0" href="{% url 'competencies' %}">Competencies framework</a>
+                                    <a class="nav-link p-0" href="{% url 'skills_and_competencies' %}">Competencies framework</a>
                                 </li>
                                 <li class="nav-item mb-2">
                                     <a class="nav-link p-0" href="{% url 'skill_levels' %}">Skill levels</a>
                                 </li>
                                 <li class="nav-item mb-2">
-                                    <a class="nav-link p-0" href="{% url 'training' %}">Learning resources</a>
+                                    <a class="nav-link p-0" href="{% url 'learning_resources' %}">Learning resources</a>
                                 </li>
                                 <li class="nav-item mb-2">
                                     <a class="nav-link p-0" href="{% url 'roles' %}">Roles and career pathways</a>
@@ -107,10 +107,10 @@ <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Framework</h6>
                             <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Policies</h6>
                             <ul class="nav flex-column mb-0">
                                 <li class="nav-item mb-2">
-                                    <a class="nav-link p-0" href="">Licensing</a>
+                                    <a class="nav-link p-0" href="{% url 'licensing' %}">Licensing</a>
                                 </li>
                                 <li class="nav-item mb-2">
-                                    <a class="nav-link p-0" href="">Goverenance</a>
+                                    <a class="nav-link p-0" href="{% url 'governance' %}">Goverenance</a>
                                 </li>
                                 <li class="nav-item mb-2">
                                     <a class="nav-link p-0" href="{% url 'privacy' %}">Privacy policy</a>
diff --git a/main/urls.py b/main/urls.py
index 352256dc..2c396a01 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -55,4 +55,6 @@
     path("get-involved/", views.GetInvolvedPageView.as_view(), name="get_involved"),
     path("events/", views.EventsPageView.as_view(), name="events"),
     path("framework-json/", views.FrameworkView.as_view(), name="framework_json"),
+    path("governance/", views.GovernancePageView.as_view(), name="governance"),
+    path("licensing/", views.LicensingPageView.as_view(), name="licensing"),
 ]
diff --git a/main/views/page_views.py b/main/views/page_views.py
index 49e9dfe6..8e2dcb2b 100644
--- a/main/views/page_views.py
+++ b/main/views/page_views.py
@@ -6,10 +6,13 @@
 from collections.abc import Mapping
 from json import dumps
 from pathlib import Path
-from typing import Any
+from typing import Any, ClassVar
 
+import markdown
+import requests
 from django.shortcuts import get_object_or_404
 from django.templatetags.static import static
+from django.utils.safestring import mark_safe
 from django.views.generic.base import TemplateView
 from django_tables2 import SingleTableView
 
@@ -65,7 +68,7 @@ def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]:
 class PrivacyPageView(TemplateView):
     """View that renders the privacy page."""
 
-    template_name = "main/pages/privacy.html"
+    template_name = "main/pages/policies/privacy.html"
 
 
 class AboutPageView(TemplateView):
@@ -77,7 +80,7 @@ class AboutPageView(TemplateView):
 class TermsPageView(TemplateView):
     """View that renders the terms and conditions page."""
 
-    template_name = "main/pages/terms.html"
+    template_name = "main/pages/policies/terms.html"
 
 
 class SkillLevelsPageView(TemplateView):
@@ -222,3 +225,65 @@ class FrameworkOverviewPageView(TemplateView):
     """View that renders an overview page for the framework."""
 
     template_name = "main/pages/framework-overview.html"
+
+
+class GitHubMarkdownPageView(TemplateView):
+    """Base view for pages that render markdown content fetched from GitHub."""
+
+    github_raw_url = ""
+    page_heading = ""
+    unavailable_message = "Document is temporarily unavailable."
+    markdown_extensions: ClassVar[list[str]] = ["fenced_code", "tables", "toc"]
+
+    def get_markdown_content(self) -> str:
+        """Fetch and convert remote markdown content to HTML."""
+        if not self.github_raw_url:
+            raise ValueError("github_raw_url must be set on GitHubMarkdownPageView")
+
+        response = requests.get(self.github_raw_url, timeout=5)
+        response.raise_for_status()
+        return markdown.markdown(
+            response.text,
+            extensions=self.markdown_extensions,
+        )
+
+    def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]:
+        """Add rendered markdown content and page metadata to the context."""
+        context = super().get_context_data(**kwargs)
+        context["page_heading"] = self.page_heading
+
+        try:
+            context["markdown_content"] = mark_safe(self.get_markdown_content())
+        except requests.RequestException:
+            logger.exception("Failed to load markdown from %s", self.github_raw_url)
+            context["markdown_content"] = mark_safe(
+                f"<p>{self.unavailable_message}</p>"
+            )
+
+        return context
+
+
+# @method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
+class GovernancePageView(GitHubMarkdownPageView):
+    """View that renders the governance page from GitHub Markdown."""
+
+    template_name = "main/pages/policies/governance.html"
+    page_heading = "DIRECT Governance"
+    unavailable_message = "Governance document is temporarily unavailable."
+
+    github_raw_url = (
+        "https://raw.githubusercontent.com/direct-framework/.github/main/GOVERNANCE.md"
+    )
+
+
+# @method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
+class LicensingPageView(GitHubMarkdownPageView):
+    """View that renders the licensing page from GitHub Markdown."""
+
+    template_name = "main/pages/policies/licensing.html"
+    page_heading = "DIRECT Licensing"
+    unavailable_message = "Licensing document is temporarily unavailable."
+
+    github_raw_url = (
+        "https://raw.githubusercontent.com/direct-framework/.github/main/LICENSING.md"
+    )
diff --git a/pyproject.toml b/pyproject.toml
index 845e9f44..8c467c7a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,6 +34,8 @@ dev = [
     "django-stubs[compatible-mypy]",
     "djlint",
     "types-django-import-export",
+    "types-Markdown",
+    "types-requests",
     "beautifulsoup4",
 ]
 doc = [
diff --git a/tests/main/test_main_views.py b/tests/main/test_main_views.py
index ec4f63d5..64e406a3 100644
--- a/tests/main/test_main_views.py
+++ b/tests/main/test_main_views.py
@@ -149,7 +149,7 @@ def test_navbar_contents_when_authenticated(self, auth_soup, admin_soup):
 class TestPrivacy(TemplateOkMixin):
     """Test suite for the privacy view."""
 
-    _template_name = "main/pages/privacy.html"
+    _template_name = "main/pages/policies/privacy.html"
 
     def _get_url(self):
         return reverse("privacy")
@@ -212,7 +212,7 @@ def test_page_content(self, soup):
 class TestTermsPageView(TemplateOkMixin):
     """Test suite for the TermsPageView."""
 
-    _template_name = "main/pages/terms.html"
+    _template_name = "main/pages/policies/terms.html"
 
     def _get_url(self):
         return reverse("terms")

From be844dce7ede3f575756c0407eada25bf7012da5 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Fri, 17 Apr 2026 14:59:55 +0100
Subject: [PATCH 02/12] minor tweaks

---
 main/templates/main/snippets/footer.html | 3 +++
 main/templates/main/snippets/navbar.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/templates/main/snippets/footer.html b/main/templates/main/snippets/footer.html
index ccb9a75c..4479ae62 100644
--- a/main/templates/main/snippets/footer.html
+++ b/main/templates/main/snippets/footer.html
@@ -89,6 +89,9 @@ <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">About</h6>
                         <div class="col">
                             <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Framework</h6>
                             <ul class="nav flex-column mb-0">
+                                <li class="nav-item mb-2">
+                                    <a class="nav-link p-0" href="{% url 'framework_overview' %}">Overview</a>
+                                </li>
                                 <li class="nav-item mb-2">
                                     <a class="nav-link p-0" href="{% url 'skills_and_competencies' %}">Competencies framework</a>
                                 </li>
diff --git a/main/templates/main/snippets/navbar.html b/main/templates/main/snippets/navbar.html
index ca44fc34..ba313b63 100644
--- a/main/templates/main/snippets/navbar.html
+++ b/main/templates/main/snippets/navbar.html
@@ -115,7 +115,7 @@ <h6 class="dropdown-header fs-xs fw-medium text-body-secondary text-uppercase pb
                                 <a class="dropdown-item" href="{% url 'learning_resources' %}">Learning resources</a>
                             </li>
                             <li>
-                                <a class="dropdown-item" href="{% url 'roles' %}">Roles and job profiles</a>
+                                <a class="dropdown-item" href="{% url 'roles' %}">Roles & career pathways</a>
                             </li>
                         </ul>
                     </li>

From f0c68229f9a61dbdbd3acdca8ab83f99490af490 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <davehorsfall@users.noreply.github.com>
Date: Tue, 21 Apr 2026 11:50:43 +0100
Subject: [PATCH 03/12] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 main/templates/main/pages/policies/governance.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/templates/main/pages/policies/governance.html b/main/templates/main/pages/policies/governance.html
index f13e1c99..66b335ba 100644
--- a/main/templates/main/pages/policies/governance.html
+++ b/main/templates/main/pages/policies/governance.html
@@ -4,7 +4,7 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
-    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item">Policies</li>
     <li class="breadcrumb-item active" aria-current="page">Governance</li>
 {% endblock breadcrumb_items %}
 {% block content %}

From 0191199ccc73fa72be0cbd77ee99c05553d56896 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Tue, 21 Apr 2026 11:56:10 +0100
Subject: [PATCH 04/12] consistent dom structure across policy pages

---
 main/templates/main/pages/policies/governance.html | 6 ++----
 main/templates/main/pages/policies/licensing.html  | 8 +++-----
 main/templates/main/pages/policies/privacy.html    | 2 +-
 main/templates/main/pages/policies/terms.html      | 6 ++----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/main/templates/main/pages/policies/governance.html b/main/templates/main/pages/policies/governance.html
index 66b335ba..afd08e5d 100644
--- a/main/templates/main/pages/policies/governance.html
+++ b/main/templates/main/pages/policies/governance.html
@@ -8,10 +8,8 @@
     <li class="breadcrumb-item active" aria-current="page">Governance</li>
 {% endblock breadcrumb_items %}
 {% block content %}
-    <section id="governance" class="pt-5 text-center ">
-        <h1 class="display-4 pb-2 pb-lg-3">{{ page_heading }}</h1>
-    </section>
-    <section class="container pt-5 mt-md-2 mt-lg-3 mt-xl-4">
+    <section id="licensing" class="container">
+        <h1 class="display-4 text-center pb-2 pb-lg-3">{{ page_heading }}</h1>
         <div class="row justify-content-center pt-xxl-2">
             <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
         </div>
diff --git a/main/templates/main/pages/policies/licensing.html b/main/templates/main/pages/policies/licensing.html
index 7f739e9f..3dafac0e 100644
--- a/main/templates/main/pages/policies/licensing.html
+++ b/main/templates/main/pages/policies/licensing.html
@@ -4,14 +4,12 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
-    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item">Policies</li>
     <li class="breadcrumb-item active" aria-current="page">Licensing</li>
 {% endblock breadcrumb_items %}
 {% block content %}
-    <section id="licensing" class="pt-5 text-center ">
-        <h1 class="display-4 pb-2 pb-lg-3">{{ page_heading }}</h1>
-    </section>
-    <section class="container pt-5 mt-md-2 mt-lg-3 mt-xl-4">
+    <section id="licensing" class="container">
+        <h1 class="display-4 text-center pb-2 pb-lg-3">{{ page_heading }}</h1>
         <div class="row justify-content-center pt-xxl-2">
             <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
         </div>
diff --git a/main/templates/main/pages/policies/privacy.html b/main/templates/main/pages/policies/privacy.html
index ec809937..1adcfdb6 100644
--- a/main/templates/main/pages/policies/privacy.html
+++ b/main/templates/main/pages/policies/privacy.html
@@ -4,7 +4,7 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
-    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item">Policies</li>
     <li class="breadcrumb-item active" aria-current="page">Privacy</li>
 {% endblock breadcrumb_items %}
 {% block content %}
diff --git a/main/templates/main/pages/policies/terms.html b/main/templates/main/pages/policies/terms.html
index 9dbac4cd..d52f8ed6 100644
--- a/main/templates/main/pages/policies/terms.html
+++ b/main/templates/main/pages/policies/terms.html
@@ -4,14 +4,12 @@
     Digital Research Competencies Framework
 {% endblock title %}
 {% block breadcrumb_items %}
-    <li class="breadcrumb-item" aria-current="page">Policies</li>
+    <li class="breadcrumb-item">Policies</li>
     <li class="breadcrumb-item active" aria-current="page">Terms and Conditions</li>
 {% endblock breadcrumb_items %}
 {% block content %}
-    <section id="terms">
+    <section id="terms" class="container">
         <h1 class="display-4 text-center pb-2 pb-lg-3">Terms and Conditions</h1>
-    </section>
-    <section class="container pt-5 mt-md-2 mt-lg-3 mt-xl-4">
         <div class="row justify-content-center pt-xxl-2">
             <div class="col-lg-9 col-xl-8">
                 <p class="fs-lg">

From 30247bbd9f19ab1cf36e4bb7b11bbe01ac2947e2 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Tue, 21 Apr 2026 11:57:49 +0100
Subject: [PATCH 05/12] markdown already applied safe in view

---
 main/templates/main/pages/policies/governance.html | 2 +-
 main/templates/main/pages/policies/licensing.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/templates/main/pages/policies/governance.html b/main/templates/main/pages/policies/governance.html
index afd08e5d..2204c884 100644
--- a/main/templates/main/pages/policies/governance.html
+++ b/main/templates/main/pages/policies/governance.html
@@ -11,7 +11,7 @@
     <section id="licensing" class="container">
         <h1 class="display-4 text-center pb-2 pb-lg-3">{{ page_heading }}</h1>
         <div class="row justify-content-center pt-xxl-2">
-            <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
+            <div class="col-lg-9 col-xl-8">{{ markdown_content }}</div>
         </div>
     </section>
 {% endblock content %}
diff --git a/main/templates/main/pages/policies/licensing.html b/main/templates/main/pages/policies/licensing.html
index 3dafac0e..373dc1d8 100644
--- a/main/templates/main/pages/policies/licensing.html
+++ b/main/templates/main/pages/policies/licensing.html
@@ -11,7 +11,7 @@
     <section id="licensing" class="container">
         <h1 class="display-4 text-center pb-2 pb-lg-3">{{ page_heading }}</h1>
         <div class="row justify-content-center pt-xxl-2">
-            <div class="col-lg-9 col-xl-8">{{ markdown_content|safe }}</div>
+            <div class="col-lg-9 col-xl-8">{{ markdown_content }}</div>
         </div>
     </section>
 {% endblock content %}

From 5e182ceaab6cbf7607ead189839a83900d9ee1ac Mon Sep 17 00:00:00 2001
From: Dave Horsfall <davehorsfall@users.noreply.github.com>
Date: Tue, 21 Apr 2026 11:58:47 +0100
Subject: [PATCH 06/12] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 main/templates/main/snippets/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/templates/main/snippets/footer.html b/main/templates/main/snippets/footer.html
index 4479ae62..d15cbb0a 100644
--- a/main/templates/main/snippets/footer.html
+++ b/main/templates/main/snippets/footer.html
@@ -113,7 +113,7 @@ <h6 class="text-muted text-uppercase fs-xs fw-semibold mb-3">Policies</h6>
                                     <a class="nav-link p-0" href="{% url 'licensing' %}">Licensing</a>
                                 </li>
                                 <li class="nav-item mb-2">
-                                    <a class="nav-link p-0" href="{% url 'governance' %}">Goverenance</a>
+                                    <a class="nav-link p-0" href="{% url 'governance' %}">Governance</a>
                                 </li>
                                 <li class="nav-item mb-2">
                                     <a class="nav-link p-0" href="{% url 'privacy' %}">Privacy policy</a>

From c6441afbe305a2a6b07d3a8eab930d079ec244df Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Tue, 21 Apr 2026 12:07:42 +0100
Subject: [PATCH 07/12] strip duplicated page title from markdown content

---
 main/views/page_views.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/main/views/page_views.py b/main/views/page_views.py
index 8e2dcb2b..a2210deb 100644
--- a/main/views/page_views.py
+++ b/main/views/page_views.py
@@ -235,6 +235,23 @@ class GitHubMarkdownPageView(TemplateView):
     unavailable_message = "Document is temporarily unavailable."
     markdown_extensions: ClassVar[list[str]] = ["fenced_code", "tables", "toc"]
 
+    def _strip_duplicate_heading(self, markdown_text: str) -> str:
+        """Remove leading H1 if it duplicates the configured page heading."""
+        lines = markdown_text.splitlines()
+        if not lines:
+            return markdown_text
+
+        first_line = lines[0].strip()
+        if self.page_heading not in first_line:
+            return markdown_text
+
+        # Remove the duplicate title line and one following blank line if present.
+        del lines[0]
+        if lines and lines[0].strip() == "":
+            del lines[0]
+
+        return "\n".join(lines)
+
     def get_markdown_content(self) -> str:
         """Fetch and convert remote markdown content to HTML."""
         if not self.github_raw_url:
@@ -242,8 +259,9 @@ def get_markdown_content(self) -> str:
 
         response = requests.get(self.github_raw_url, timeout=5)
         response.raise_for_status()
+        markdown_text = self._strip_duplicate_heading(response.text)
         return markdown.markdown(
-            response.text,
+            markdown_text,
             extensions=self.markdown_extensions,
         )
 

From 68c9282f080c9f07a09c96bcb2d4b2405e211a31 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Tue, 21 Apr 2026 12:11:27 +0100
Subject: [PATCH 08/12] add url pattern for policies

---
 main/urls.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/main/urls.py b/main/urls.py
index 2c396a01..9cadf697 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -33,9 +33,15 @@
     path("overview/", views.AccountOverviewView.as_view(), name="account-overview"),
 ]
 
+policies_patterns = [
+    path("privacy/", views.PrivacyPageView.as_view(), name="privacy"),
+    path("terms/", views.TermsPageView.as_view(), name="terms"),
+    path("governance/", views.GovernancePageView.as_view(), name="governance"),
+    path("licensing/", views.LicensingPageView.as_view(), name="licensing"),
+]
+
 urlpatterns = [
     path("", views.IndexPageView.as_view(), name="index"),
-    path("privacy/", views.PrivacyPageView.as_view(), name="privacy"),
     path(
         "accounts/register/",
         RegistrationView.as_view(form_class=RegistrationForm),
@@ -45,16 +51,14 @@
     path("accounts/", include("django.contrib.auth.urls")),
     path("accounts/", include(accounts_patterns)),
     path("about/", views.AboutPageView.as_view(), name="about"),
-    path("terms/", views.TermsPageView.as_view(), name="terms"),
     path(
         "terms-acceptance/",
         views.TermsAcceptanceView.as_view(),
         name="terms_acceptance",
     ),
     path("framework/", include(framework_patterns)),
+    path("policies/", include(policies_patterns)),
     path("get-involved/", views.GetInvolvedPageView.as_view(), name="get_involved"),
     path("events/", views.EventsPageView.as_view(), name="events"),
     path("framework-json/", views.FrameworkView.as_view(), name="framework_json"),
-    path("governance/", views.GovernancePageView.as_view(), name="governance"),
-    path("licensing/", views.LicensingPageView.as_view(), name="licensing"),
 ]

From c40574b2d67acac49bfc4ce7b6fa0273eb7c3d47 Mon Sep 17 00:00:00 2001
From: Adrian D'Alessandro <a.dalessandro@imperial.ac.uk>
Date: Thu, 23 Apr 2026 16:30:22 +0100
Subject: [PATCH 09/12] Add markdown and requests to dependencies

---
 dev-requirements.txt | 18 ++++++++++++++++++
 doc-requirements.txt |  6 +++---
 pyproject.toml       |  4 +++-
 requirements.txt     | 12 ++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index bd67a926..4412e56d 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -10,8 +10,12 @@ beautifulsoup4==4.14.3
     # via direct_webapp (pyproject.toml)
 build==1.4.2
     # via pip-tools
+certifi==2026.4.22
+    # via requests
 cfgv==3.5.0
     # via pre-commit
+charset-normalizer==3.4.7
+    # via requests
 click==8.3.1
     # via
     #   djlint
@@ -78,6 +82,8 @@ gunicorn==25.3.0
     # via direct_webapp (pyproject.toml)
 identify==2.6.18
     # via pre-commit
+idna==3.13
+    # via requests
 iniconfig==2.3.0
     # via pytest
 jsbeautifier==1.15.4
@@ -88,6 +94,8 @@ json5==0.14.0
     # via djlint
 librt==0.8.1
     # via mypy
+markdown==3.10.2
+    # via direct_webapp (pyproject.toml)
 mypy==1.20.0
     # via
     #   direct_webapp (pyproject.toml)
@@ -146,6 +154,8 @@ pyyaml==6.0.3
     #   pre-commit
 regex==2026.3.32
     # via djlint
+requests==2.33.1
+    # via direct_webapp (pyproject.toml)
 ruff==0.15.8
     # via direct_webapp (pyproject.toml)
 six==1.17.0
@@ -162,14 +172,22 @@ tqdm==4.67.3
     # via djlint
 types-django-import-export==4.4.0.20260325
     # via direct_webapp (pyproject.toml)
+types-markdown==3.10.2.20260408
+    # via direct_webapp (pyproject.toml)
 types-pyyaml==6.0.12.20250915
     # via django-stubs
+types-requests==2.33.0.20260408
+    # via direct_webapp (pyproject.toml)
 typing-extensions==4.15.0
     # via
     #   beautifulsoup4
     #   django-stubs
     #   django-stubs-ext
     #   mypy
+urllib3==2.6.3
+    # via
+    #   requests
+    #   types-requests
 virtualenv==21.2.0
     # via pre-commit
 wheel==0.46.3
diff --git a/doc-requirements.txt b/doc-requirements.txt
index 64a904c7..c46ce2dc 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -10,9 +10,9 @@ babel==2.18.0
     # via mkdocs-material
 backrefs==6.2
     # via mkdocs-material
-certifi==2026.2.25
+certifi==2026.4.22
     # via requests
-charset-normalizer==3.4.6
+charset-normalizer==3.4.7
     # via requests
 click==8.3.1
     # via
@@ -61,7 +61,7 @@ griffelib==2.0.2
     # via mkdocstrings-python
 gunicorn==25.3.0
     # via direct_webapp (pyproject.toml)
-idna==3.11
+idna==3.13
     # via requests
 jinja2==3.1.6
     # via
diff --git a/pyproject.toml b/pyproject.toml
index 8c467c7a..fa75fdb7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,9 @@ dependencies = [
     "mysqlclient",
     "django-import-export",
     "django-multiselectfield",
-    "django-tables2"
+    "django-tables2",
+    "markdown",
+    "requests"
 ]
 
 [project.optional-dependencies]
diff --git a/requirements.txt b/requirements.txt
index 9b1e606a..c56ef934 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,10 @@
 #
 asgiref==3.11.1
     # via django
+certifi==2026.4.22
+    # via requests
+charset-normalizer==3.4.7
+    # via requests
 confusable-homoglyphs==3.3.1
     # via django-registration
 crispy-bootstrap5==2026.3
@@ -41,15 +45,23 @@ django-tables2==3.0.0
     # via direct_webapp (pyproject.toml)
 gunicorn==25.3.0
     # via direct_webapp (pyproject.toml)
+idna==3.13
+    # via requests
+markdown==3.10.2
+    # via direct_webapp (pyproject.toml)
 mysqlclient==2.2.8
     # via direct_webapp (pyproject.toml)
 packaging==26.0
     # via gunicorn
+requests==2.33.1
+    # via direct_webapp (pyproject.toml)
 sqlparse==0.5.5
     # via django
 tablib==3.9.0
     # via django-import-export
 typing-extensions==4.15.0
     # via django-stubs-ext
+urllib3==2.6.3
+    # via requests
 whitenoise==6.12.0
     # via direct_webapp (pyproject.toml)

From 4abedc3d9ce0eb11099d5e90056bc256143c37c9 Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Fri, 24 Apr 2026 09:11:35 +0100
Subject: [PATCH 10/12] fix: broken test_navbar_contents test

---
 tests/main/test_main_views.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/main/test_main_views.py b/tests/main/test_main_views.py
index 64e406a3..12815bad 100644
--- a/tests/main/test_main_views.py
+++ b/tests/main/test_main_views.py
@@ -13,11 +13,7 @@
 from django.urls import reverse
 from pytest_django.asserts import assertTemplateUsed
 
-from main.models import (
-    Skill,
-    SkillLevel,
-    UserSkill,
-)
+from main.models import Skill, SkillLevel, UserSkill
 from main.views.page_views import _extract_and_combine_roles
 
 from .view_utils import (
@@ -82,7 +78,7 @@ def test_navbar_contents(self, soup, auth_soup, admin_soup):
             href=reverse("learning_resources"),
         )
         assert framework_dropdown.find(
-            tag_with_text_filter("a", "Roles and job profiles"), href=reverse("roles")
+            tag_with_text_filter("a", "Roles & career pathways"), href=reverse("roles")
         )
 
         # Community Dropdown

From d93cd23085f8a1c43b9a64eece261ad8c99cfe5f Mon Sep 17 00:00:00 2001
From: Dave Horsfall <dave@horsfall.dev>
Date: Fri, 24 Apr 2026 09:26:49 +0100
Subject: [PATCH 11/12] sanitize requested md content with nh3

---
 dev-requirements.txt     |  2 ++
 doc-requirements.txt     |  7 ++++++-
 main/views/page_views.py | 11 ++++++++---
 pyproject.toml           |  1 +
 requirements.txt         |  2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 4412e56d..080ec9bf 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -104,6 +104,8 @@ mypy-extensions==1.1.0
     # via mypy
 mysqlclient==2.2.8
     # via direct_webapp (pyproject.toml)
+nh3==0.3.4
+    # via direct_webapp (pyproject.toml)
 nodeenv==1.10.0
     # via pre-commit
 packaging==26.0
diff --git a/doc-requirements.txt b/doc-requirements.txt
index c46ce2dc..630147ab 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -71,6 +71,7 @@ jinja2==3.1.6
     #   properdocs
 markdown==3.10.2
     # via
+    #   direct_webapp (pyproject.toml)
     #   mkdocs
     #   mkdocs-autorefs
     #   mkdocs-material
@@ -121,6 +122,8 @@ mkdocstrings-python==2.0.3
     # via direct_webapp (pyproject.toml)
 mysqlclient==2.2.8
     # via direct_webapp (pyproject.toml)
+nh3==0.3.4
+    # via direct_webapp (pyproject.toml)
 packaging==26.0
     # via
     #   gunicorn
@@ -161,7 +164,9 @@ pyyaml-env-tag==1.1
     #   mkdocs
     #   properdocs
 requests==2.33.1
-    # via mkdocs-material
+    # via
+    #   direct_webapp (pyproject.toml)
+    #   mkdocs-material
 six==1.17.0
     # via python-dateutil
 sqlparse==0.5.5
diff --git a/main/views/page_views.py b/main/views/page_views.py
index a2210deb..e3273a25 100644
--- a/main/views/page_views.py
+++ b/main/views/page_views.py
@@ -9,10 +9,13 @@
 from typing import Any, ClassVar
 
 import markdown
+import nh3
 import requests
 from django.shortcuts import get_object_or_404
 from django.templatetags.static import static
+from django.utils.decorators import method_decorator
 from django.utils.safestring import mark_safe
+from django.views.decorators.cache import cache_page
 from django.views.generic.base import TemplateView
 from django_tables2 import SingleTableView
 
@@ -271,7 +274,9 @@ def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]:
         context["page_heading"] = self.page_heading
 
         try:
-            context["markdown_content"] = mark_safe(self.get_markdown_content())
+            context["markdown_content"] = mark_safe(
+                nh3.clean(self.get_markdown_content())
+            )
         except requests.RequestException:
             logger.exception("Failed to load markdown from %s", self.github_raw_url)
             context["markdown_content"] = mark_safe(
@@ -281,7 +286,7 @@ def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]:
         return context
 
 
-# @method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
+@method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
 class GovernancePageView(GitHubMarkdownPageView):
     """View that renders the governance page from GitHub Markdown."""
 
@@ -294,7 +299,7 @@ class GovernancePageView(GitHubMarkdownPageView):
     )
 
 
-# @method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
+@method_decorator(cache_page(60 * 60), name="dispatch")  # cache 1 hour
 class LicensingPageView(GitHubMarkdownPageView):
     """View that renders the licensing page from GitHub Markdown."""
 
diff --git a/pyproject.toml b/pyproject.toml
index fa75fdb7..17f76c63 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,6 +20,7 @@ dependencies = [
     "django-multiselectfield",
     "django-tables2",
     "markdown",
+    "nh3",
     "requests"
 ]
 
diff --git a/requirements.txt b/requirements.txt
index c56ef934..39dfe18a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -51,6 +51,8 @@ markdown==3.10.2
     # via direct_webapp (pyproject.toml)
 mysqlclient==2.2.8
     # via direct_webapp (pyproject.toml)
+nh3==0.3.4
+    # via direct_webapp (pyproject.toml)
 packaging==26.0
     # via gunicorn
 requests==2.33.1

From 32dbee7319d2440c9cfffcf2f31940356df72e00 Mon Sep 17 00:00:00 2001
From: Adrian D'Alessandro <a.dalessandro@imperial.ac.uk>
Date: Fri, 24 Apr 2026 10:05:11 +0100
Subject: [PATCH 12/12] Add basic tests for Governance and Licensing pages

---
 tests/main/test_main_views.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/main/test_main_views.py b/tests/main/test_main_views.py
index 12815bad..8082cdaa 100644
--- a/tests/main/test_main_views.py
+++ b/tests/main/test_main_views.py
@@ -536,9 +536,27 @@ def test_extract_and_combine_roles():
 
 
 class TestFrameworkOverviewPageView(TemplateOkMixin):
-    """Test suite for the GetInvolvedPageView."""
+    """Test suite for the FrameworkOverviewPageView."""
 
     _template_name = "main/pages/framework-overview.html"
 
     def _get_url(self):
         return reverse("framework_overview")
+
+
+class TestGovernancePageView(TemplateOkMixin):
+    """Test suite for the GovernancePageView."""
+
+    _template_name = "main/pages/policies/governance.html"
+
+    def _get_url(self):
+        return reverse("governance")
+
+
+class TestLicensingPageView(TemplateOkMixin):
+    """Test suite for the LicensingPageView."""
+
+    _template_name = "main/pages/policies/licensing.html"
+
+    def _get_url(self):
+        return reverse("licensing")