From 8c26d8a51427cd7d84317c79d9ba3a6ac18c5323 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 3 Mar 2021 22:58:01 +0100
Subject: [PATCH] [profile] Updates for PR:

- Fix duplicated IDs between modals for the same status.
- Remove redundant button (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586743844).
- Remove redundant `role="navigation"` on `<nav>`.
- Add `dir="auto"` back for titles (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586715693).
- Use `exists` instead of `all` for conditional statement (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586716299).
- Fix missing spacing between avatar and username (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586740902).
---
 bookwyrm/templates/components/modal.html               | 5 ++---
 bookwyrm/templates/snippets/pagination.html            | 2 +-
 bookwyrm/templates/snippets/status/status_content.html | 6 +++---
 bookwyrm/templates/snippets/username.html              | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 1110a8ee..18b69b25 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -2,12 +2,12 @@
     role="dialog"
     class="modal hidden"
     id="{{ controls_text }}-{{ controls_uid }}"
-    aria-labelledby="modal-card-title-{{ controls_uid }}"
+    aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
 >
     <div class="modal-background"></div>
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
-            <h2 class="modal-card-title" id="modal-card-title-{{ controls_uid }}">
+            <h2 class="modal-card-title" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
             {% include 'snippets/toggle/toggle_button.html' with label="close" class="delete" nonbutton=True %}
@@ -23,7 +23,6 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    <button class="modal-close is-large" aria-label="close"></button>
     {% include 'snippets/toggle/toggle_button.html' with label="close" class="modal-close is-large" nonbutton=True %}
 </div>
 
diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index c9c73ac3..2ac10557 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<nav class="pagination" role="navigation" aria-label="pagination">
+<nav class="pagination" aria-label="pagination">
     {% if page.has_previous %}
     <p class="pagination-previous">
         <a href="{{ path }}?page={{ page.previous_page_number }}{{ anchor }}">
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 521227b8..e1e23d0e 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -4,8 +4,8 @@
     {% if status.status_type == 'Review' %}
     <div>
         {% if status.name %}
-        <h3 class="title is-5 has-subtitle">
-            {{ status.name | escape }}
+        <h3 class="title is-5 has-subtitle" dir="auto">
+            {{ status.name|escape }}
         </h3>
         {% endif %}
         {% include 'snippets/stars.html' with rating=status.rating %}
@@ -37,7 +37,7 @@
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
         {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
         {% endif %}
-        {% if status.attachments.all %}
+        {% if status.attachments.exists %}
         <div class="block">
             <div class="columns">
                 {% for attachment in status.attachments.all %}
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index 5fc08653..e18ba1f8 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -1,8 +1,8 @@
 {% spaceless %}
 {% load bookwyrm_tags %}
 
-
-<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %} class="user"
+<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
+    class="user ml-1"
 >
     {{ user.name|default:user|username }}
 </a>