mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-18 14:16:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1306 from bookwyrm-social/shelf-layout

Browse source 
Remove unneeded layout file
This commit is contained in:
Mouse Reeve 2021-08-17 12:31:17 -06:00 committed by GitHub
commit a49ec8b94e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
bookwyrm/templates/user/layout_without_bio.html
View file

@ -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 %}

14
bookwyrm/templates/user/shelf/shelf.html
View file

@ -1,4 +1,4 @@
{% extends 'user/layout_without_bio.html' %} {% extends 'layout.html' %}
{% load bookwyrm_tags %} {% load bookwyrm_tags %}
{% load utilities %} {% load utilities %}
{% load humanize %} {% load humanize %}
@ -8,15 +8,17 @@
{% include 'user/shelf/books_header.html' %} {% include 'user/shelf/books_header.html' %}
{% endblock %} {% endblock %}
{% block header %} {% block opengraph_images %}
<header class="columns"> {% include 'snippets/opengraph_images.html' with image=user.preview_image %}
{% endblock %}
{% block content %}
<header class="block">
<h1 class="title"> <h1 class="title">
{% include 'user/shelf/books_header.html' %} {% include 'user/shelf/books_header.html' %}
</h1> </h1>
</header> </header>
{% endblock %}
{% block tabs %}
<div class="block columns"> <div class="block columns">
<div class="column"> <div class="column">
<div class="tabs"> <div class="tabs">
@ -41,9 +43,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endblock %}
{% block panel %}
<div class="block"> <div class="block">
{% include 'user/shelf/create_shelf_form.html' with controls_text='create_shelf_form' %} {% include 'user/shelf/create_shelf_form.html' with controls_text='create_shelf_form' %}
</div> </div>