Merge branch 'main' into markdown

bookwyrm/templates/snippets/page_text.html

@@ -1,7 +1,19 @@
+{% spaceless %}
+
 {% load humanize %}
 {% load i18n %}
+
 {% if total_pages %}
-{% blocktrans with page=page|intcomma total_pages=total_pages|intcomma %}page {{ page }} of {{ total_pages }}{% endblocktrans %}
+
+{% blocktrans trimmed with page=page|intcomma total_pages=total_pages|intcomma %}
+page {{ page }} of {{ total_pages }}
+{% endblocktrans %}
+
 {% else %}
-{% blocktrans with page=page|intcomma %}page {{ page }}{% endblocktrans %}
+
+{% blocktrans trimmed with page=page|intcomma %}
+page {{ page }}
+{% endblocktrans %}
+
 {% endif %}
+{% endspaceless %}

bookwyrm/templates/snippets/status/header.html

@@ -30,22 +30,39 @@
             </span>
 
             {% include "snippets/status/header_content.html" %}
-            {% if status.edited %}
-            <small>(edited)</small>
-            {% endif %}
         </h3>
-        <p class="is-size-7 is-flex is-align-items-center">
-            <a href="{{ status.remote_id }}{% if status.user.local %}#anchor-{{ status.id }}{% endif %}">{{ status.published_date|published_date }}</a>
-            {% if status.progress %}
-            <span class="ml-1">
-            {% if status.progress_mode == 'PG' %}
-                ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %})
-            {% else %}
-                ({{ status.progress }}%)
-            {% endif %}
-            </span>
-            {% endif %}
-            {% include 'snippets/privacy-icons.html' with item=status %}
-        </p>
+        <div class="breadcrumb has-dot-separator is-small">
+            <ul class="is-flex is-align-items-center">
+                <li>
+                    <a href="{{ status.remote_id }}{% if status.user.local %}#anchor-{{ status.id }}{% endif %}">
+                        {{ status.published_date|published_date }}
+                    </a>
+                </li>
+
+                {% if status.edited_date %}
+                <li>
+                    <span>
+                    {% blocktrans with date=status.edited_date|published_date %}edited {{ date }}{% endblocktrans %}
+                    </span>
+                </li>
+                {% endif %}
+
+                {% if status.progress %}
+                <li class="ml-1">
+                    <span>
+                        {% if status.progress_mode == 'PG' %}
+                            {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}
+                        {% else %}
+                            {{ status.progress }}%
+                        {% endif %}
+                    </span>
+                </li>
+                {% endif %}
+
+                <li>
+                {% include 'snippets/privacy-icons.html' with item=status %}
+                </li>
+            </ul>
+        </div>
     </div>
 </div>

bookwyrm/templates/snippets/status/layout.html

@@ -67,7 +67,7 @@
 {% endblock %}
 
 {% block card-bonus %}
-{% if request.user.is_authenticated and not moderation_mode %}
+{% if request.user.is_authenticated and not moderation_mode and not no_interact %}
 {% with status.id|uuid as uuid %}
 <section class="reply-panel is-hidden" id="show_comment_{{ status.id }}">
     <div class="card-footer">