From 3a4bcb51f34c9f4db49cd276bbbe769d54538576 Mon Sep 17 00:00:00 2001
From: Rajit Sarkar <rsar@loc.gov>
Date: Thu, 25 Jan 2024 09:46:45 -0500
Subject: [PATCH 1/3] CONCD-675 refactor Simple Pages (WiP)

---
 .../migrations/0092_simplepage_navigation.py    | 17 +++++++++++++++++
 concordia/models.py                             |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 concordia/migrations/0092_simplepage_navigation.py

diff --git a/concordia/migrations/0092_simplepage_navigation.py b/concordia/migrations/0092_simplepage_navigation.py
new file mode 100644
index 000000000..8fea27248
--- /dev/null
+++ b/concordia/migrations/0092_simplepage_navigation.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.23 on 2024-01-25 14:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("concordia", "0091_auto_20240104_1508"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="simplepage",
+            name="navigation",
+            field=models.TextField(null=True),
+        ),
+    ]
diff --git a/concordia/models.py b/concordia/models.py
index 75a3b2ffe..c69174cce 100644
--- a/concordia/models.py
+++ b/concordia/models.py
@@ -756,6 +756,7 @@ class SimplePage(models.Model):
 
     title = models.CharField(max_length=200)
 
+    navigation = models.TextField(null=True)
     body = models.TextField()
 
     def __str__(self):

From 1f1dca5f08cf47f26df6d28ef6c66be52c0d24c0 Mon Sep 17 00:00:00 2001
From: Rajit Sarkar <rsar@loc.gov>
Date: Fri, 26 Jan 2024 10:28:34 -0500
Subject: [PATCH 2/3] CONCD-675 setup codemirror

---
 concordia/admin/__init__.py                                     | 2 +-
 concordia/templates/admin/concordia/simplepage/change_form.html | 1 +
 concordia/views.py                                              | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/concordia/admin/__init__.py b/concordia/admin/__init__.py
index dd1fbf961..03e154cbb 100644
--- a/concordia/admin/__init__.py
+++ b/concordia/admin/__init__.py
@@ -820,7 +820,7 @@ class SimplePageAdmin(admin.ModelAdmin):
 
     fieldsets = (
         (None, {"fields": ("created_on", "updated_on", "path", "title")}),
-        ("Body", {"classes": ("markdown-preview",), "fields": ("body",)}),
+        ("Body", {"classes": ("markdown-preview",), "fields": ("navigation", "body")}),
     )
 
 
diff --git a/concordia/templates/admin/concordia/simplepage/change_form.html b/concordia/templates/admin/concordia/simplepage/change_form.html
index b6b130a3b..536f13676 100644
--- a/concordia/templates/admin/concordia/simplepage/change_form.html
+++ b/concordia/templates/admin/concordia/simplepage/change_form.html
@@ -10,6 +10,7 @@
     {{ block.super }}
 
     <script>
+        setupCodeMirror(document.getElementById('id_navigation'), 'markdown');
         setupCodeMirror(document.getElementById('id_body'), 'markdown');
     </script>
 {% endblock content %}
diff --git a/concordia/views.py b/concordia/views.py
index fc1d0ec46..a8fdb63e3 100644
--- a/concordia/views.py
+++ b/concordia/views.py
@@ -181,6 +181,7 @@ def simple_page(request, path=None):
         language_code = "es"
 
     ctx = {
+        "nav": md.convert(page.navigation),
         "body": html,
         "language_code": language_code,
         "title": page.title,

From d3a8c9a610b0c0848d2030177af100c8e8d33127 Mon Sep 17 00:00:00 2001
From: Rajit Sarkar <rsar@loc.gov>
Date: Mon, 29 Jan 2024 13:08:00 -0500
Subject: [PATCH 3/3] CONCD-675 add new field to the template

---
 concordia/templates/static-page.html | 9 ++++++++-
 concordia/views.py                   | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/concordia/templates/static-page.html b/concordia/templates/static-page.html
index 5247f771f..baf9845d2 100644
--- a/concordia/templates/static-page.html
+++ b/concordia/templates/static-page.html
@@ -19,7 +19,14 @@
                 <h1 class="my-3">{{ title }}</h1>
 
                 <div>
-                    {{ body|safe }}
+                    {% if nav %}
+                        <div class="row">
+                            {{ nav|safe }}
+                            {{ body|safe }}
+                        </div>
+                    {% else %}
+                        {{ body|safe }}
+                    {% endif %}
                 </div>
             </div>
         </div>
diff --git a/concordia/views.py b/concordia/views.py
index a8fdb63e3..d1eab3754 100644
--- a/concordia/views.py
+++ b/concordia/views.py
@@ -181,12 +181,13 @@ def simple_page(request, path=None):
         language_code = "es"
 
     ctx = {
-        "nav": md.convert(page.navigation),
         "body": html,
         "language_code": language_code,
         "title": page.title,
         "breadcrumbs": breadcrumbs,
     }
+    if page.navigation is not None:
+        ctx["nav"] = md.convert(page.navigation)
 
     resp = render(request, "static-page.html", ctx)
     resp["Created"] = http_date(page.created_on.timestamp())