From 09ee45f6c75a44b917338676efe3046343397de4 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Wed, 13 Nov 2024 17:09:22 +0000
Subject: [PATCH] Fix duplicate menus in moderation dashboard:

- Move navigation to separate moderation_nav.html partial
- Include navigation only once in dashboard.html base template
- Remove duplicate navigation from child templates
---
 templates/moderation/dashboard.html           | 43 ++-----------------
 .../moderation/partials/moderation_nav.html   | 38 ++++++++++++++++
 2 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 templates/moderation/partials/moderation_nav.html

diff --git a/templates/moderation/dashboard.html b/templates/moderation/dashboard.html
index dad2d2c9..689f5143 100644
--- a/templates/moderation/dashboard.html
+++ b/templates/moderation/dashboard.html
@@ -164,49 +164,14 @@
 {% endblock %}
 
 {% block content %}
-<div class="moderation-nav">
-    <div class="moderation-nav-container">
-        <ul>
-            <li>
-                <a href="{% url 'moderation:dashboard' %}" 
-                   class="{% if request.resolver_match.url_name == 'dashboard' %}active{% endif %}"
-                   hx-get="{% url 'moderation:dashboard' %}"
-                   hx-target="#submissions-content"
-                   hx-push-url="true">
-                    <i class="fas fa-tachometer-alt"></i>
-                    Dashboard
-                </a>
-            </li>
-            <li>
-                <a href="{% url 'moderation:edit_submissions' %}" 
-                   class="{% if request.resolver_match.url_name == 'edit_submissions' %}active{% endif %}"
-                   hx-get="{% url 'moderation:edit_submissions' %}"
-                   hx-target="#submissions-content"
-                   hx-push-url="true">
-                    <i class="fas fa-edit"></i>
-                    Edit Submissions
-                </a>
-            </li>
-            <li>
-                <a href="{% url 'moderation:photo_submissions' %}"
-                   class="{% if request.resolver_match.url_name == 'photo_submissions' %}active{% endif %}"
-                   hx-get="{% url 'moderation:photo_submissions' %}"
-                   hx-target="#submissions-content"
-                   hx-push-url="true">
-                    <i class="fas fa-image"></i>
-                    Photo Submissions
-                </a>
-            </li>
-        </ul>
-    </div>
-</div>
+{% include "moderation/partials/moderation_nav.html" %}
 
 <div class="moderation-content">
-    {% block moderation_content %}
     <div id="submissions-content">
-        {% include "moderation/partials/submission_list.html" %}
+        {% block moderation_content %}
+            {% include "moderation/partials/dashboard_content.html" %}
+        {% endblock %}
     </div>
-    {% endblock %}
 </div>
 
 <div id="loading-indicator" 
diff --git a/templates/moderation/partials/moderation_nav.html b/templates/moderation/partials/moderation_nav.html
new file mode 100644
index 00000000..00437c3b
--- /dev/null
+++ b/templates/moderation/partials/moderation_nav.html
@@ -0,0 +1,38 @@
+{% load static %}
+
+<div class="moderation-nav">
+    <div class="moderation-nav-container">
+        <ul>
+            <li>
+                <a href="{% url 'moderation:dashboard' %}" 
+                   class="{% if request.resolver_match.url_name == 'dashboard' %}active{% endif %}"
+                   hx-get="{% url 'moderation:dashboard' %}"
+                   hx-target="#submissions-content"
+                   hx-push-url="true">
+                    <i class="fas fa-tachometer-alt"></i>
+                    Dashboard
+                </a>
+            </li>
+            <li>
+                <a href="{% url 'moderation:edit_submissions' %}" 
+                   class="{% if request.resolver_match.url_name == 'edit_submissions' %}active{% endif %}"
+                   hx-get="{% url 'moderation:edit_submissions' %}"
+                   hx-target="#submissions-content"
+                   hx-push-url="true">
+                    <i class="fas fa-edit"></i>
+                    Edit Submissions
+                </a>
+            </li>
+            <li>
+                <a href="{% url 'moderation:photo_submissions' %}"
+                   class="{% if request.resolver_match.url_name == 'photo_submissions' %}active{% endif %}"
+                   hx-get="{% url 'moderation:photo_submissions' %}"
+                   hx-target="#submissions-content"
+                   hx-push-url="true">
+                    <i class="fas fa-image"></i>
+                    Photo Submissions
+                </a>
+            </li>
+        </ul>
+    </div>
+</div>