diff --git a/users/views/follows.py b/activities/views/follows.py similarity index 95% rename from users/views/follows.py rename to 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), @@ -19,6 +19,12 @@ urlpatterns = [ path("tags//", timelines.Tag.as_view(), name="tag"), 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(), @@ -34,11 +40,6 @@ urlpatterns = [ settings.ProfilePage.as_view(), name="settings_profile", ), - path( - "settings/follows/", - follows.FollowsPage.as_view(), - name="settings_follows", - ), path( "settings/interface/", settings.InterfacePage.as_view(), 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 @@ Federated + + Follows +

Compose diff --git a/templates/settings/follows.html b/templates/activities/follows.html similarity index 95% rename from templates/settings/follows.html rename to 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 @@ Interface - - Follows -

Account

Login & Security