From 00795f119eeb4b8eb1330b7959ca5ef93accc64b Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Fri, 16 Dec 2022 17:24:56 -0700
Subject: Split Follows page into two types

This overcomes the query problem of pulling a combined list
---
 templates/activities/follows.html       | 20 +++++++++++++++-----
 templates/activities/home.html          |  4 ++--
 templates/activities/local.html         |  4 ++--
 templates/activities/notifications.html |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/templates/activities/follows.html b/templates/activities/follows.html
index e2c0ece..bc2db7d 100644
--- a/templates/activities/follows.html
+++ b/templates/activities/follows.html
@@ -3,18 +3,28 @@
 {% block subtitle %}Follows{% endblock %}
 
 {% block content %}
+    <div class="view-options">
+        {% if inbound %}
+            <a href=".?outbound=true">Your Follows</a>
+            <a href=".?outbound=true" class="selected">Follows You</a>
+        {% else %}
+            <a href=".?inbound=true" class="selected">Your Follows</a>
+            <a href=".?inbound=true">Follows You</a>
+        {% endif %}
+    </div>
+
     <section class="icon-menu">
-        {% for identity, follow_type in page_obj %}
+        {% for identity in page_obj %}
             <a class="option" href="{{ identity.urls.view }}">
                 <img src="{{ identity.local_icon_url.relative }}">
                 <span class="handle">
                     {{ identity.html_name_or_handle }}
                     <small>@{{ identity.handle }}</small>
                 </span>
-                {% if follow_type == "outbound" %}
+                {% if identity.id in outbound_ids %}
                     <span class="pill">Following</span>
                 {% endif %}
-                {% if follow_type == "inbound" %}
+                {% if identity.id in inbound_ids %}
                     <span class="pill">Follows You</span>
                 {% endif %}
             </a>
@@ -25,11 +35,11 @@
 
     <div class="pagination">
         {% if page_obj.has_previous %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a></div>
+            <a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a>
         {% endif %}
 
         {% if page_obj.has_next %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a></div>
+            <a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a>
         {% endif %}
     </div>
 {% endblock %}
diff --git a/templates/activities/home.html b/templates/activities/home.html
index 06fa88c..8d9d39c 100644
--- a/templates/activities/home.html
+++ b/templates/activities/home.html
@@ -24,11 +24,11 @@
 
     <div class="pagination">
         {% if page_obj.has_previous %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a></div>
+            <a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a>
         {% endif %}
 
         {% if page_obj.has_next %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a></div>
+            <a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a>
         {% endif %}
     </div>
 {% endblock %}
diff --git a/templates/activities/local.html b/templates/activities/local.html
index c3d180b..55f9090 100644
--- a/templates/activities/local.html
+++ b/templates/activities/local.html
@@ -11,11 +11,11 @@
 
     <div class="pagination">
         {% if page_obj.has_previous %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a></div>
+            <a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a>
         {% endif %}
 
         {% if page_obj.has_next %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a></div>
+            <a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a>
         {% endif %}
     </div>
 {% endblock %}
diff --git a/templates/activities/notifications.html b/templates/activities/notifications.html
index 89ca4d8..8b7bc13 100644
--- a/templates/activities/notifications.html
+++ b/templates/activities/notifications.html
@@ -34,11 +34,11 @@
 
     <div class="pagination">
         {% if page_obj.has_previous %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a></div>
+            <a class="button" href=".?page={{ page_obj.previous_page_number }}">Previous Page</a>
         {% endif %}
 
         {% if page_obj.has_next %}
-            <div class="load-more"><a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a></div>
+            <a class="button" href=".?page={{ page_obj.next_page_number }}">Next Page</a>
         {% endif %}
     </div>
 {% endblock %}
-- 
cgit v1.2.3