From ac4a178e8319e45388b9e1e0afefb67f5c8b749f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 30 Jan 2021 12:03:50 -0800
Subject: [PATCH] Fixes shelf page template path bug

---
 bookwyrm/templates/{ => user}/shelf.html | 28 +++++++++++-------------
 bookwyrm/tests/views/test_shelf.py       |  2 +-
 bookwyrm/views/shelf.py                  |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)
 rename bookwyrm/templates/{ => user}/shelf.html (89%)

diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/user/shelf.html
similarity index 89%
rename from bookwyrm/templates/shelf.html
rename to bookwyrm/templates/user/shelf.html
index da599c7d..c0083e17 100644
--- a/bookwyrm/templates/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -1,21 +1,19 @@
-{% extends 'layout.html' %}
+{% extends 'user/user_layout.html' %}
 {% load bookwyrm_tags %}
-{% block content %}
 
-<div class="columns">
-    <div class="column">
-        <h1 class="title">
-            {% if is_self %}Your
-            {% else %}
-            {% include 'snippets/username.html' with user=user possessive=True %}
-            {% endif %}
-            shelves
-        </h1>
-    </div>
-</div>
-
-{% include 'snippets/user_header.html' with user=user %}
+{% block header %}
+<header class="columns">
+    <h1 class="title">
+        {% if is_self %}Your
+        {% else %}
+        {% include 'snippets/username.html' with user=user possessive=True %}
+        {% endif %}
+        shelves
+    </h1>
+</header>
+{% endblock %}
 
+{% block panel %}
 <div class="block columns">
     <div class="column">
         <div class="tabs" role="tablist">
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 35e07953..95150fe9 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -41,7 +41,7 @@ class ShelfViews(TestCase):
             is_api.return_value = False
             result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, TemplateResponse)
-        self.assertEqual(result.template_name, 'shelf.html')
+        self.assertEqual(result.template_name, 'user/shelf.html')
         self.assertEqual(result.status_code, 200)
 
         with patch('bookwyrm.views.shelf.is_api_request') as is_api:
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index ae8a494b..e4c49261 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -62,7 +62,7 @@ class Shelf(View):
             'books': [b.book for b in books],
         }
 
-        return TemplateResponse(request, 'shelf.html', data)
+        return TemplateResponse(request, 'user/shelf.html', data)
 
     @method_decorator(login_required, name='dispatch')
     # pylint: disable=unused-argument