diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index dc0500de..e0f0b30d 100644 --- a/bookwyrm/templates/book.html +++ b/bookwyrm/templates/book.html @@ -10,11 +10,11 @@ {% if request.user.is_authenticated %}
- edit - - Edit Book - - + edit + + Edit Book + +
{% endif %} diff --git a/bookwyrm/templates/followers.html b/bookwyrm/templates/followers.html index 7690af8a..09457408 100644 --- a/bookwyrm/templates/followers.html +++ b/bookwyrm/templates/followers.html @@ -3,18 +3,20 @@ {% block content %} {% include 'user_header.html' with user=user %} -
-

Followers

+
+

Followers

{% for followers in followers %} -
-
- {% include 'snippets/avatar.html' with user=followers %} -
-
- {% include 'snippets/username.html' with user=followers show_full=True %} -
-
- {% include 'snippets/follow_button.html' with user=followers %} +
+
+
+ {% include 'snippets/avatar.html' with user=followers %} +
+
+ {% include 'snippets/username.html' with user=followers show_full=True %} +
+
+ {% include 'snippets/follow_button.html' with user=followers %} +
{% endfor %} diff --git a/bookwyrm/templates/following.html b/bookwyrm/templates/following.html index 3bf62bf6..9131adea 100644 --- a/bookwyrm/templates/following.html +++ b/bookwyrm/templates/following.html @@ -3,18 +3,20 @@ {% block content %} {% include 'user_header.html' %} -
-

Following

+
+

Following

{% for follower in user.following.all %} -
-
- {% include 'snippets/avatar.html' with user=follower %} -
-
- {% include 'snippets/username.html' with user=follower show_full=True %} -
-
- {% include 'snippets/follow_button.html' with user=follower %} +
+
+
+ {% include 'snippets/avatar.html' with user=follower %} +
+
+ {% include 'snippets/username.html' with user=follower show_full=True %} +
+
+ {% include 'snippets/follow_button.html' with user=follower %} +
{% endfor %} diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html index 65612e96..5eea5bbf 100644 --- a/bookwyrm/templates/snippets/follow_button.html +++ b/bookwyrm/templates/snippets/follow_button.html @@ -11,14 +11,14 @@ Follow request already sent. {% csrf_token %} {% if user.manually_approves_followers %} - + {% else %} - + {% endif %} {% endif %} diff --git a/bookwyrm/templates/snippets/follow_request_buttons.html b/bookwyrm/templates/snippets/follow_request_buttons.html index fb25a194..165887e0 100644 --- a/bookwyrm/templates/snippets/follow_request_buttons.html +++ b/bookwyrm/templates/snippets/follow_request_buttons.html @@ -3,11 +3,11 @@
{% csrf_token %} - +
{% csrf_token %} - +
{% endif %} diff --git a/bookwyrm/templates/user_header.html b/bookwyrm/templates/user_header.html index 3d9505a3..2be1222a 100644 --- a/bookwyrm/templates/user_header.html +++ b/bookwyrm/templates/user_header.html @@ -1,33 +1,41 @@ {% load humanize %} {% load fr_display %} - -
-
- {% include 'snippets/avatar.html' with user=user large=True %} +
+
+
+
+ {% include 'snippets/avatar.html' with user=user large=True %} +
+
+

{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}

+

{{ user.username }}

+

Joined {{ user.created_date | naturaltime }}

+

+ {{ user.followers.count }} follower{{ user.followers.count | pluralize }}, + {{ user.following.count }} following

+
+
-
-

{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}

-

{{ user.username }}

-

Joined {{ user.created_date | naturaltime }}

-

- {{ user.followers.count }} follower{{ user.followers.count | pluralize }}, - {{ user.following.count }} following

+
+ {% if user.summary %} +
{{ user.summary | safe }}
+ {% endif %}
- - {% if user.summary %} -
{{ user.summary | safe }}
- {% endif %}
{% if not is_self %} {% include 'snippets/follow_button.html' with user=user %}