From e5a3d987698c196eae031e2fd14caec304fbeb56 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 17 Aug 2021 10:57:32 -0700
Subject: [PATCH] Remove unneeded layout file

---
 .../templates/user/layout_without_bio.html    | 58 -------------------
 bookwyrm/templates/user/shelf/shelf.html      | 14 ++---
 2 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100755 bookwyrm/templates/user/layout_without_bio.html

diff --git a/bookwyrm/templates/user/layout_without_bio.html b/bookwyrm/templates/user/layout_without_bio.html
deleted file mode 100755
index d76cdc7cb..000000000
--- a/bookwyrm/templates/user/layout_without_bio.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-{% load humanize %}
-{% load utilities %}
-{% load markdown %}
-{% load layout %}
-
-{% block title %}{{ user.display_name }}{% endblock %}
-
-{% block opengraph_images %}
-    {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
-{% endblock %}
-
-{% block content %}
-<header class="block">
-    {% block header %}
-    <h1 class="title">
-        {% trans "User Profile" %}
-    </h1>
-    {% endblock %}
-</header>
-
-
-{% block tabs %}
-{% with user|username as username %}
-<nav class="tabs">
-    <ul>
-        {% url 'user-feed' user|username as url %}
-        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Activity" %}</a>
-        </li>
-        {% if is_self or user.goal.exists %}
-        {% now 'Y' as year %}
-        {% url 'user-goal' user|username year as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Reading Goal" %}</a>
-        </li>
-        {% endif %}
-        {% if is_self or user.list_set.exists %}
-        {% url 'user-lists' user|username as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Lists" %}</a>
-        </li>
-        {% endif %}
-        {% if user.shelf_set.exists %}
-        {% url 'user-shelves' user|username as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Books" %}</a>
-        </li>
-        {% endif %}
-    </ul>
-</nav>
-{% endwith %}
-{% endblock %}
-
-{% block panel %}{% endblock %}
-
-{% endblock %}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 7439ead4c..c48ec19a8 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,4 +1,4 @@
-{% extends 'user/layout_without_bio.html' %}
+{% extends 'layout.html' %}
 {% load bookwyrm_tags %}
 {% load utilities %}
 {% load humanize %}
@@ -8,15 +8,17 @@
 {% include 'user/shelf/books_header.html' %}
 {% endblock %}
 
-{% block header %}
-<header class="columns">
+{% block opengraph_images %}
+    {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
+{% endblock %}
+
+{% block content %}
+<header class="block">
     <h1 class="title">
         {% include 'user/shelf/books_header.html' %}
     </h1>
 </header>
-{% endblock %}
 
-{% block tabs %}
 <div class="block columns">
     <div class="column">
         <div class="tabs">
@@ -41,9 +43,7 @@
     </div>
     {% endif %}
 </div>
-{% endblock %}
 
-{% block panel %}
 <div class="block">
     {% include 'user/shelf/create_shelf_form.html' with controls_text='create_shelf_form' %}
 </div>