Move wellness options inside Interface

takahe/urls.py

@@ -46,11 +46,6 @@ urlpatterns = [
         settings.InterfacePage.as_view(),
         name="settings_interface",
     ),
-    path(
-        "settings/user/",
-        settings.WellnessPage.as_view(),
-        name="settings_wellness",
-    ),
     path(
         "admin/",
         admin.AdminRoot.as_view(),

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_wellness" %}" {% if section == "wellness" %}class="selected"{% endif %} title="Wellness">
-        <i class="fa-solid fa-staff-snake"></i> Wellness
-    </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

users/views/settings/__init__.py

@@ -6,7 +6,6 @@ from users.views.settings.interface import InterfacePage  # noqa
 from users.views.settings.profile import ProfilePage  # noqa
 from users.views.settings.security import SecurityPage  # noqa
 from users.views.settings.settings_page import SettingsPage  # noqa
-from users.views.settings.wellness import WellnessPage  # noqa
 
 
 @method_decorator(identity_required, name="dispatch")

users/views/settings/interface.py

@@ -16,6 +16,13 @@ class InterfacePage(SettingsPage):
             "help_text": "Visibility to use as default for new posts.",
             "choices": Post.Visibilities.choices,
         },
+        "visible_reaction_counts": {
+            "title": "Show Boost and Like Counts",
+            "help_text": "Disable to hide the number of Likes and Boosts on a 'Post'",
+        },
     }
 
-    layout = {"Posting": ["toot_mode", "default_post_visibility"]}
+    layout = {
+        "Posting": ["toot_mode", "default_post_visibility"],
+        "Wellness": ["visible_reaction_counts"],
+    }

users/views/settings/wellness.py

@@ -1,15 +0,0 @@
-from users.views.settings.settings_page import SettingsPage
-
-
-class WellnessPage(SettingsPage):
-
-    section = "wellness"
-
-    options = {
-        "visible_reaction_counts": {
-            "title": "Show Boost and Like Counts",
-            "help_text": "Disable to hide the number of Likes and Boosts on a 'Post'",
-        },
-    }
-
-    layout = {"Wellness": ["visible_reaction_counts"]}