Merge branch 'main' into import-limit

bookwyrm/templates/about/about.html

@@ -10,8 +10,9 @@
 {% endblock %}
 
 {% block about_content %}
+{% get_current_language as LANGUAGE_CODE %}
 {# seven day cache #}
-{% cache 604800 about_page_superlatives %}
+{% cache 604800 about_page_superlatives LANGUAGE_CODE %}
 
 {% get_book_superlatives as superlatives %}
 <section class=" pb-4">

bookwyrm/templates/book/edit/edit_book_form.html

@@ -81,7 +81,7 @@
                     {% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %}
                 </div>
 
-                <div class="field">
+                <div class="field" id="subjects">
                     <label class="label" for="id_add_subjects">
                         {% trans "Subjects:" %}
                     </label>

bookwyrm/templates/discover/card-header.html

@@ -4,17 +4,17 @@
 {% with user_path=status.user.local_path username=status.user.display_name book_path=book.local_path book_title=book|book_title %}
 
 {% if status.status_type == 'GeneratedNote' %}
-    {% if status.content == 'wants to read' %}
+    {% if status.content == 'wants to read' or status.content == '<p>wants to read</p>' %}
         {% blocktrans trimmed %}
         <a href="{{ user_path}}">{{ username }}</a> wants to read <a href="{{ book_path }}">{{ book_title }}</a>
         {% endblocktrans %}
     {% endif %}
-    {% if status.content == 'finished reading' %}
+    {% if finished reading or status.content == '<p>finished reading</p>' %}
         {% blocktrans trimmed %}
         <a href="{{ user_path}}">{{ username }}</a> finished reading <a href="{{ book_path }}">{{ book_title }}</a>
         {% endblocktrans %}
     {% endif %}
-    {% if status.content == 'started reading' %}
+    {% if started reading or status.content == '<p>started reading</p>' %}
         {% blocktrans trimmed %}
         <a href="{{ user_path}}">{{ username }}</a> started reading <a href="{{ book_path }}">{{ book_title }}</a>
         {% endblocktrans %}
@@ -38,3 +38,4 @@
 {% endif %}
 
 {% endwith %}
+

bookwyrm/templates/import/import_status.html

@@ -41,7 +41,7 @@
         </dl>
     </div>
 
-    {% if not job.complete and show_progress %}
+    {% if job.status == "active" and show_progress %}
     <div class="box is-processing">
         <div class="block">
             <span class="icon icon-spinner is-pulled-left" aria-hidden="true"></span>

bookwyrm/templates/landing/landing.html

@@ -10,7 +10,8 @@
 </div>
 
 {% get_current_language as LANGUAGE_CODE %}
-{% cache 60 * 60 LANGUAGE_CODE %}
+{# 1 hour cache #}
+{% cache 3600 landing LANGUAGE_CODE %}
 {% get_landing_books as books %}
 <section class="tile is-ancestor">
     <div class="tile is-vertical is-6">

bookwyrm/templates/settings/layout.html

@@ -74,7 +74,7 @@
             </li>
         </ul>
         {% endif %}
-        {% if perms.edit_instance_settings %}
+        {% if perms.bookwyrm.edit_instance_settings %}
         <h2 class="menu-label">{% trans "System" %}</h2>
         <ul class="menu-list">
             <li>

bookwyrm/templates/settings/themes.html

@@ -29,7 +29,7 @@
                 {% trans "Copy the theme file into the <code>bookwyrm/static/css/themes</code> directory on your server from the command line." %}
             </li>
             <li>
-                {% trans "Run <code>./bw-dev collectstatic</code>." %}
+                {% trans "Run <code>./bw-dev compile_themes</code> and <code>./bw-dev collectstatic</code>." %}
             </li>
             <li>
                 {% trans "Add the file name using the form below to make it available in the application interface." %}

bookwyrm/templates/snippets/book_titleby.html

@@ -4,8 +4,8 @@
 {% spaceless %}
 
 {% get_current_language as LANGUAGE_CODE %}
-{# 6 month cache #}
-{% cache 15552000 titleby LANGUAGE_CODE book.id %}
+{# 10 second cache #}
+{% cache 10 titleby LANGUAGE_CODE book.id %}
 
 {% if book.authors.exists %}
 {% blocktrans trimmed with path=book.local_path title=book|book_title %}

bookwyrm/templates/user_menu.html

@@ -13,6 +13,10 @@
             <span class="ml-2">{{ request.user.display_name }}</span>
         </span>
         <span class="icon icon-arrow-down is-hidden-mobile" aria-hidden="true"></span>
+        <span class="summary-on-open">
+            <span class="icon icon-arrow-left is-small" aria-hidden="true"></span>
+            {% trans "Back" %}
+        </span>
     </summary>
 
     <div class="dropdown-menu">