summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activities/views/follows.py (renamed from users/views/follows.py)2
-rw-r--r--takahe/urls.py15
-rw-r--r--templates/activities/_menu.html3
-rw-r--r--templates/activities/follows.html (renamed from templates/settings/follows.html)2
-rw-r--r--templates/settings/_menu.html3
5 files changed, 13 insertions, 12 deletions
diff --git a/users/views/follows.py b/activities/views/follows.py
index 9030efe..44d8adc 100644
--- a/users/views/follows.py
+++ b/activities/views/follows.py
@@ -11,7 +11,7 @@ class FollowsPage(TemplateView):
Shows followers/follows.
"""
- template_name = "settings/follows.html"
+ template_name = "activities/follows.html"
def get_context_data(self):
# Gather all identities with a following relationship with us
diff --git a/takahe/urls.py b/takahe/urls.py
index 9aa67a2..0e995c4 100644
--- a/takahe/urls.py
+++ b/takahe/urls.py
@@ -3,10 +3,10 @@ from django.contrib import admin as djadmin
from django.urls import path, re_path
from django.views.static import serve
-from activities.views import compose, explore, posts, search, timelines
+from activities.views import compose, explore, follows, posts, search, timelines
from core import views as core
from stator import views as stator
-from users.views import activitypub, admin, auth, follows, identity, settings
+from users.views import activitypub, admin, auth, identity, settings
urlpatterns = [
path("", core.homepage),
@@ -20,6 +20,12 @@ urlpatterns = [
path("explore/", explore.Explore.as_view(), name="explore"),
path("explore/tags/", explore.ExploreTag.as_view(), name="explore-tag"),
path(
+ "follows/",
+ follows.FollowsPage.as_view(),
+ name="follows",
+ ),
+ # Settings views
+ path(
"settings/",
settings.SettingsRoot.as_view(),
name="settings",
@@ -35,11 +41,6 @@ urlpatterns = [
name="settings_profile",
),
path(
- "settings/follows/",
- follows.FollowsPage.as_view(),
- name="settings_follows",
- ),
- path(
"settings/interface/",
settings.InterfacePage.as_view(),
name="settings_interface",
diff --git a/templates/activities/_menu.html b/templates/activities/_menu.html
index a912090..4676831 100644
--- a/templates/activities/_menu.html
+++ b/templates/activities/_menu.html
@@ -18,6 +18,9 @@
<a href="{% url "federated" %}" {% if current_page == "federated" %}class="selected"{% endif %} title="Federated">
<i class="fa-solid fa-globe"></i> Federated
</a>
+ <a href="{% url "follows" %}" {% if section == "follows" %}class="selected"{% endif %} title="Follows">
+ <i class="fa-solid fa-arrow-right-arrow-left"></i> Follows
+ </a>
<h3></h3>
<a href="{% url "compose" %}" {% if top_section == "compose" %}class="selected"{% endif %} title="Compose">
<i class="fa-solid fa-feather"></i> Compose
diff --git a/templates/settings/follows.html b/templates/activities/follows.html
index 5f43d05..6116dd6 100644
--- a/templates/settings/follows.html
+++ b/templates/activities/follows.html
@@ -1,4 +1,4 @@
-{% extends "settings/base.html" %}
+{% extends "base.html" %}
{% block subtitle %}Follows{% endblock %}
diff --git a/templates/settings/_menu.html b/templates/settings/_menu.html
index 8aede68..55c0100 100644
--- a/templates/settings/_menu.html
+++ b/templates/settings/_menu.html
@@ -6,9 +6,6 @@
<a href="{% url "settings_interface" %}" {% if section == "interface" %}class="selected"{% endif %} title="Interface">
<i class="fa-solid fa-display"></i> Interface
</a>
- <a href="{% url "settings_follows" %}" {% if section == "follows" %}class="selected"{% endif %} title="Follows">
- <i class="fa-solid fa-arrow-right-arrow-left"></i> Follows
- </a>
<h3>Account</h3>
<a href="{% url "settings_security" %}" {% if section == "security" %}class="selected"{% endif %} title="Login &amp; Security">
<i class="fa-solid fa-key"></i> Login &amp; Security