When |
@@ -62,4 +58,11 @@
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
-
-
- {% include 'admin/_nav.html' %}
-
-
+
{{ _('Activity JSON') }}
{{ activity_json_data | tojson(indent=2) }}
{% if current_app.debug %}
Re-submit this activity
{% endif %}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
-
-
- {% include 'admin/_nav.html' %}
-
-
-
-
{{ _('Add new user') }}
+ {{ _('Add new user') }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
+
{{ _('Registrations') }}
{% if registrations %}
{{ _('When registering, people are asked "%(question)s".', question=site.application_question) }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
+
{{ _('Communities') }}
@@ -59,4 +55,11 @@
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
-
-
- {% include 'admin/_nav.html' %}
-
-
-
-
{{ _('Edit %(community_name)s', community_name=community.display_name()) }}
+ {{ _('Edit %(community_name)s', community_name=community.display_name()) }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
+
+
+ {% if topic %}
+
{{ _('Edit %(topic_name)s', topic_name=topic.name) }}
+ {% endif %}
+ {{ render_form(form) }}
+
+
+
{% include 'admin/_nav.html' %}
-
-
-
- {% if topic %}
-
{{ _('Edit %(topic_name)s', topic_name=topic.name) }}
- {% endif %}
- {{ render_form(form) }}
-
-
+
{% 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 %}
-
-
- {% include 'admin/_nav.html' %}
-
-
-
-
{{ _('Edit %(user_name)s (%(display_name)s)', user_name=user.user_name, display_name=user.display_name()) }}
+ {{ _('Edit %(user_name)s (%(display_name)s)', user_name=user.user_name, display_name=user.display_name()) }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
-
+
{{ _('Federation') }}
{{ render_form(form) }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
-
+
+
+
{{ _('Misc settings') }}
+ {{ render_form(form) }}
+
+
+
{% include 'admin/_nav.html' %}
-
-
-
- {{ render_form(form) }}
-
-
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
+
{{ _('Newsletter') }}
{{ render_form(form) }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
-
{{ _('Most downvoted in the last 3 days') }}
+
{{ _('Most downvoted posts in the last 3 days') }}
{% for post in posts.items %}
{% include 'post/_post_teaser.html' %}
@@ -34,4 +29,11 @@
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
-
+
{{ _('Site profile') }}
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
-
-
- {% include 'admin/_nav.html' %}
-
-
{% macro render_topic(topic, depth) %}
{{ '--' * depth }} {{ topic['topic'].name }} |
@@ -32,7 +28,7 @@
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 %}
- {% include 'admin/_nav.html' %}
-
-
-
-
+
+
+
+ {% include 'admin/_nav.html' %}
+
+
+
{% 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 @@
{{ _('Donate') }}
{% if user_access('change instance settings', current_user.id) %}
- {{ _('Admin') }}
+
+ {{ _('Admin') }}
+
+
+
{% endif %}
{{ _('Log out') }}