From 6ce05296b01b1bd177e93b5ea3745fba5a5ff8f2 Mon Sep 17 00:00:00 2001
From: Tyler Kennedy
Date: Sun, 4 Dec 2022 11:41:41 -0500
Subject: Make follows a top-level activity. (#94)

---
 templates/activities/_menu.html   |  3 +++
 templates/activities/follows.html | 25 +++++++++++++++++++++++++
 templates/settings/_menu.html     |  3 ---
 templates/settings/follows.html   | 25 -------------------------
 4 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 templates/activities/follows.html
 delete mode 100644 templates/settings/follows.html

(limited to 'templates')

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/activities/follows.html b/templates/activities/follows.html
new file mode 100644
index 0000000..6116dd6
--- /dev/null
+++ b/templates/activities/follows.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+
+{% block subtitle %}Follows{% endblock %}
+
+{% block content %}
+    <section class="icon-menu">
+        {% for identity, details in identities %}
+            <a class="option" href="{{ identity.urls.view }}">
+                <img src="{{ identity.local_icon_url }}">
+                <span class="handle">
+                    {{ identity.name_or_handle }}
+                    <small>@{{ identity.handle }}</small>
+                </span>
+                {% if details.outbound %}
+                    <span class="pill">Following</span>
+                {% endif %}
+                {% if details.inbound %}
+                    <span class="pill">Follows You</span>
+                {% endif %}
+            </a>
+        {% empty %}
+            <p class="option empty">You have no follows.</p>
+        {% endfor %}
+    </section>
+{% 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
diff --git a/templates/settings/follows.html b/templates/settings/follows.html
deleted file mode 100644
index 5f43d05..0000000
--- a/templates/settings/follows.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "settings/base.html" %}
-
-{% block subtitle %}Follows{% endblock %}
-
-{% block content %}
-    <section class="icon-menu">
-        {% for identity, details in identities %}
-            <a class="option" href="{{ identity.urls.view }}">
-                <img src="{{ identity.local_icon_url }}">
-                <span class="handle">
-                    {{ identity.name_or_handle }}
-                    <small>@{{ identity.handle }}</small>
-                </span>
-                {% if details.outbound %}
-                    <span class="pill">Following</span>
-                {% endif %}
-                {% if details.inbound %}
-                    <span class="pill">Follows You</span>
-                {% endif %}
-            </a>
-        {% empty %}
-            <p class="option empty">You have no follows.</p>
-        {% endfor %}
-    </section>
-{% endblock %}
-- 
cgit v1.2.3