Updates edited display

bookwyrm/settings.py

@@ -14,7 +14,7 @@ VERSION = "0.0.1"
 PAGE_LENGTH = env("PAGE_LENGTH", 15)
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
-JS_CACHE = "c02929b1"
+JS_CACHE = "3eb4edb1"
 
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")

bookwyrm/static/css/bookwyrm.css

@@ -509,6 +509,20 @@ ol.ordered-list li::before {
     border-left: 2px solid #e0e0e0;
 }
 
+/* Breadcrumbs
+ ******************************************************************************/
+
+.breadcrumb li:first-child * {
+    padding-left: 0;
+}
+
+.breadcrumb li > * {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    padding: 0 .75em;
+}
+
 /* Dimensions
  * @todo These could be in rem.
  ******************************************************************************/

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