From 2f4f56649e1576f13c7d36d8d4c658bea5f6f697 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 14 Apr 2024 20:05:40 +1200
Subject: [PATCH] move admin nav into main menu

---
 app/templates/admin/_nav.html                 |  2 +-
 app/templates/admin/activities.html           | 15 +++++++------
 app/templates/admin/activity_json.html        | 14 ++++++++-----
 app/templates/admin/add_user.html             | 16 +++++++-------
 .../admin/approve_registrations.html          | 15 +++++++------
 app/templates/admin/communities.html          | 15 +++++++------
 app/templates/admin/edit_community.html       | 16 +++++++-------
 app/templates/admin/edit_topic.html           | 20 ++++++++++--------
 app/templates/admin/edit_user.html            | 16 +++++++-------
 app/templates/admin/federation.html           | 16 +++++++-------
 app/templates/admin/misc.html                 | 16 +++++++-------
 app/templates/admin/newsletter.html           | 15 +++++++------
 app/templates/admin/posts.html                | 16 +++++++-------
 app/templates/admin/reports.html              | 15 +++++++------
 app/templates/admin/site.html                 | 15 +++++++------
 app/templates/admin/topics.html               | 15 +++++++------
 app/templates/admin/users.html                | 15 +++++++------
 app/templates/base.html                       | 21 ++++++++++++++++++-
 18 files changed, 167 insertions(+), 106 deletions(-)

diff --git a/app/templates/admin/_nav.html b/app/templates/admin/_nav.html
index 03485e9e..507cd364 100644
--- a/app/templates/admin/_nav.html
+++ b/app/templates/admin/_nav.html
@@ -1,4 +1,4 @@
-<nav class="mb-4">
+<nav class="mb-1">
     <h2 class="visually-hidden">{{ _('Admin navigation') }}</h2>
     <a href="{{ url_for('admin.admin_home') }}">{{ _('Admin home') }}</a> |
     <a href="{{ url_for('admin.admin_site') }}">{{ _('Site profile') }}</a> |
diff --git a/app/templates/admin/activities.html b/app/templates/admin/activities.html
index c0e09b30..45a4c112 100644
--- a/app/templates/admin/activities.html
+++ b/app/templates/admin/activities.html
@@ -4,16 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_activities' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Activities') }}</h1>
         <table class="table">
             <tr>
                <th>When</th>
@@ -62,4 +58,11 @@
         </nav>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
diff --git a/app/templates/admin/activity_json.html b/app/templates/admin/activity_json.html
index 8b300a19..9c3dcb0a 100644
--- a/app/templates/admin/activity_json.html
+++ b/app/templates/admin/activity_json.html
@@ -4,20 +4,24 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_activities' %}
 
 {% block app_content %}
-<div class="row">
-    <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
 
 <div class="row">
     <div class="col">
+        <h1>{{ _('Activity JSON') }}</h1>
         <code><pre>{{ activity_json_data | tojson(indent=2) }}</pre></code>
         {% if current_app.debug %}
         <p><a class="btn btn-warning" href="{{ url_for('admin.activity_replay', activity_id=activity.id) }}">Re-submit this activity</a></p>
         {% endif %}
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/add_user.html b/app/templates/admin/add_user.html
index fafcbbf2..d18adac7 100644
--- a/app/templates/admin/add_user.html
+++ b/app/templates/admin/add_user.html
@@ -4,17 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_field %}
+{% set active_child = 'admin_users' %}
 
 {% block app_content %}
-<div class="row">
-    <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
 <div class="row">
     <div class="col col-login mx-auto">
-        <h3>{{ _('Add new user') }}</h3>
+        <h1>{{ _('Add new user') }}</h1>
         <form method="post" enctype="multipart/form-data" id="add_local_user_form">
             {{ form.csrf_token() }}
             {{ render_field(form.user_name) }}
@@ -44,4 +39,11 @@
         </form>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/approve_registrations.html b/app/templates/admin/approve_registrations.html
index a22d3bda..ced8c42d 100644
--- a/app/templates/admin/approve_registrations.html
+++ b/app/templates/admin/approve_registrations.html
@@ -4,16 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_approve_registrations' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Registrations') }}</h1>
         {% if registrations %}
         <p>{{ _('When registering, people are asked "%(question)s".', question=site.application_question) }} </p>
         <form method="get">
@@ -52,4 +48,11 @@
         {% endif %}
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index 18853a1c..e2fb2497 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -4,16 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_communities' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Communities') }}</h1>
         <form method="get">
             <input type="search" name="search"> <input type="submit" name="submit" value="Search">
         </form>
@@ -59,4 +55,11 @@
         </nav>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/edit_community.html b/app/templates/admin/edit_community.html
index 9096fdcc..4909ff14 100644
--- a/app/templates/admin/edit_community.html
+++ b/app/templates/admin/edit_community.html
@@ -4,17 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_field %}
+{% set active_child = 'admin_communities' %}
 
 {% block app_content %}
-<div class="row">
-    <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
 <div class="row">
     <div class="col col-login mx-auto">
-        <h3>{{ _('Edit %(community_name)s', community_name=community.display_name()) }}</h3>
+        <h1>{{ _('Edit %(community_name)s', community_name=community.display_name()) }}</h1>
         <form method="post" enctype="multipart/form-data" id="add_local_community_form">
             {{ form.csrf_token() }}
             {{ render_field(form.title) }}
@@ -59,4 +54,11 @@
         </form>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/edit_topic.html b/app/templates/admin/edit_topic.html
index 0a65d554..e1373850 100644
--- a/app/templates/admin/edit_topic.html
+++ b/app/templates/admin/edit_topic.html
@@ -4,20 +4,22 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_topics' %}
 
 {% block app_content %}
+<div class="row">
+    <div class="col col-login mx-auto">
+        {% if topic %}
+            <h1>{{ _('Edit %(topic_name)s', topic_name=topic.name) }}</h1>
+        {% endif %}
+        {{ render_form(form) }}
+    </div>
+</div>
+<hr />
 <div class="row">
     <div class="col">
         {% include 'admin/_nav.html' %}
     </div>
 </div>
-
-<div class="row">
-    <div class="col col-login mx-auto">
-        {% if topic %}
-            <h3>{{ _('Edit %(topic_name)s', topic_name=topic.name) }}</h3>
-        {% endif %}
-        {{ render_form(form) }}
-    </div>
-</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/edit_user.html b/app/templates/admin/edit_user.html
index 6c0885f4..2070ed91 100644
--- a/app/templates/admin/edit_user.html
+++ b/app/templates/admin/edit_user.html
@@ -4,17 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_field %}
+{% set active_child = 'admin_users' %}
 
 {% block app_content %}
-<div class="row">
-    <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
 <div class="row">
     <div class="col col-login mx-auto">
-        <h3>{{ _('Edit %(user_name)s (%(display_name)s)', user_name=user.user_name, display_name=user.display_name()) }}</h3>
+        <h1>{{ _('Edit %(user_name)s (%(display_name)s)', user_name=user.user_name, display_name=user.display_name()) }}</h1>
         <form method="post" enctype="multipart/form-data" id="add_local_user_form">
             {{ form.csrf_token() }}
             {{ user.about_html|safe if user.about_html }}
@@ -48,4 +43,11 @@
         </p>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/federation.html b/app/templates/admin/federation.html
index 96bd0ca2..d41cebcf 100644
--- a/app/templates/admin/federation.html
+++ b/app/templates/admin/federation.html
@@ -4,19 +4,21 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_federation' %}
 
 {% block app_content %}
 
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Federation') }}</h1>
         {{ render_form(form) }}
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/misc.html b/app/templates/admin/misc.html
index 73db60b2..32a7ce6d 100644
--- a/app/templates/admin/misc.html
+++ b/app/templates/admin/misc.html
@@ -4,18 +4,20 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_misc' %}
 
 {% block app_content %}
-
+<div class="row">
+    <div class="col">
+        <h1>{{ _('Misc settings') }}</h1>
+        {{ render_form(form) }}
+    </div>
+</div>
+<hr />
 <div class="row">
     <div class="col">
         {% include 'admin/_nav.html' %}
     </div>
 </div>
-
-<div class="row">
-    <div class="col">
-        {{ render_form(form) }}
-    </div>
-</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/newsletter.html b/app/templates/admin/newsletter.html
index 0fe862c2..dab0d540 100644
--- a/app/templates/admin/newsletter.html
+++ b/app/templates/admin/newsletter.html
@@ -1,17 +1,20 @@
 {% extends "base.html" %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_newsletter' %}
 
 {% block app_content %}
 
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Newsletter') }}</h1>
         {{ render_form(form) }}
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/posts.html b/app/templates/admin/posts.html
index 2c3da127..3d2c4a3c 100644
--- a/app/templates/admin/posts.html
+++ b/app/templates/admin/posts.html
@@ -4,17 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_content_trash' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
-        <h1>{{ _('Most downvoted in the last 3 days') }}</h1>
+        <h1>{{ _('Most downvoted posts in the last 3 days') }}</h1>
         <div class="post_list">
             {% for post in posts.items %}
                 {% include 'post/_post_teaser.html' %}
@@ -34,4 +29,11 @@
         </nav>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/reports.html b/app/templates/admin/reports.html
index f66a1fd3..92775bbc 100644
--- a/app/templates/admin/reports.html
+++ b/app/templates/admin/reports.html
@@ -4,16 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_reports' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Reports') }}</h1>
         <form method="get">
             <input type="search" name="search" value="{{ search }}">
             <input type="radio" name="local_remote" value="local" id="local_remote_local" {{ 'checked' if local_remote == 'local' }}><label for="local_remote_local"> Local</label>
@@ -66,4 +62,11 @@
         </nav>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/site.html b/app/templates/admin/site.html
index 53478d98..31bfa7be 100644
--- a/app/templates/admin/site.html
+++ b/app/templates/admin/site.html
@@ -4,17 +4,13 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_field %}
+{% set active_child = 'admin_site' %}
 
 {% block app_content %}
 
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Site profile') }}</h1>
         <form method="post" enctype="multipart/form-data">
             {{ form.csrf_token() }}
             {{ render_field(form.name) }}
@@ -28,4 +24,11 @@
         </form>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/topics.html b/app/templates/admin/topics.html
index 7763a83f..6df70649 100644
--- a/app/templates/admin/topics.html
+++ b/app/templates/admin/topics.html
@@ -4,13 +4,9 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_topics' %}
 
 {% block app_content %}
-<div class="row">
-    <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
 {% macro render_topic(topic, depth) %}
     <tr>
         <td nowrap="nowrap">{{ '--' * depth }} {{ topic['topic'].name }}</td>
@@ -32,7 +28,7 @@
 
 <div class="row">
     <div class="col">
-        <p><a href="{{ url_for('admin.admin_topic_add') }}" class="btn btn-primary">{{ _('Add topic') }}</a></p>
+        <h1><a href="{{ url_for('admin.admin_topic_add') }}" class="btn btn-primary" style="float: right;">{{ _('Add topic') }}</a>{{ _('Topics') }}</h1>
         <table class="table table-striped">
             <tr>
                <th>Name</th>
@@ -45,4 +41,11 @@
         </table>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index bdbe8fbd..e34961c2 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -4,16 +4,12 @@
     {% extends "base.html" %}
 {% endif %} %}
 {% from 'bootstrap/form.html' import render_form %}
+{% set active_child = 'admin_users' %}
 
 {% block app_content %}
 <div class="row">
     <div class="col">
-        {% include 'admin/_nav.html' %}
-    </div>
-</div>
-
-<div class="row">
-    <div class="col">
+        <h1>{{ _('Users') }}</h1>
         <a class="btn btn-primary" href="{{ url_for('admin.admin_users_add') }}" style="float: right;">{{ _('Add local user') }}</a>
         <form method="get">
             <input type="search" name="search" value="{{ search }}">
@@ -79,4 +75,11 @@
         </nav>
     </div>
 </div>
+<hr />
+<div class="row">
+    <div class="col">
+        {% include 'admin/_nav.html' %}
+    </div>
+</div>
+<hr />
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/base.html b/app/templates/base.html
index 775322a2..df9183fe 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -182,7 +182,26 @@
                             </li>
                             <li class="nav-item"><a class="nav-link" href="/donate">{{ _('Donate') }}</a></li>
                             {% if user_access('change instance settings', current_user.id) %}
-                                <li class="nav-item"><a class="nav-link" href="/admin/">{{ _('Admin') }}</a></li>
+                                <li class="nav-item dropdown{% if active_parent == 'admin' %} active{% endif %}">
+                                    <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/admin/" aria-haspopup="true" aria-expanded="false">{{ _('Admin') }}</a>
+                                    <ul class="dropdown-menu">
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_site' }}" href="{{ url_for('admin.admin_site') }}">{{ _('Site profile') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_misc' }}" href="{{ url_for('admin.admin_misc') }}">{{ _('Misc settings') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_communities' }}" href="{{ url_for('admin.admin_communities') }}">{{ _('Communities') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_topics' }}" href="{{ url_for('admin.admin_topics') }}">{{ _('Topics') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_users' }}" href="{{ url_for('admin.admin_users', local_remote='local') }}">{{ _('Users') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_users_trash' }}" href="{{ url_for('admin.admin_users_trash', local_remote='local') }}">{{ _('Monitoring - users') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_content_trash' }}" href="{{ url_for('admin.admin_content_trash') }}">{{ _('Monitoring - content') }}</a></li>
+                                        {% if g.site.registration_mode == 'RequireApplication' %}
+                                            <li><a class="dropdown-item{{ ' active' if active_child == 'admin_approve_registrations' }}" href="{{ url_for('admin.admin_approve_registrations') }}">{{ _('Registration applications') }}</a></li>
+                                        {% endif %}
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_reports' }}" href="{{ url_for('admin.admin_reports') }}">{{ _('Moderation') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_federation' }}" href="{{ url_for('admin.admin_federation') }}">{{ _('Federation') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_newsletter' }}" href="{{ url_for('admin.newsletter') }}">{{ _('Newsletter') }}</a></li>
+                                      <li><a class="dropdown-item{{ ' active' if active_child == 'admin_activities' }}" href="{{ url_for('admin.admin_activities') }}">{{ _('Activities') }}</a></li>
+                                    </ul>
+                                </li>
+
                             {% endif %}
                             <li class="nav-item"><a class="nav-link" href="/auth/logout">{{ _('Log out') }}</a></li>
                             <li class="nav-item d-none d-md-inline-block">