Merge pull request #1177 from bookwyrm-social/user-page-scroll

Small ui fixes

bookwyrm/templates/author/author.html

@@ -15,7 +15,7 @@
         <div class="column is-narrow">
             <a href="{{ author.local_path }}/edit">
                 <span class="icon icon-pencil" title="{% trans 'Edit Author' %}" aria-hidden="True"></span>
-                <span>{% trans "Edit Author" %}</span>
+                <span class="is-hidden-mobile">{% trans "Edit Author" %}</span>
             </a>
         </div>
         {% endif %}

bookwyrm/templates/book/book.html

@@ -36,7 +36,7 @@
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
                 <span class="icon icon-pencil" title="{% trans "Edit Book" %}" aria-hidden=True></span>
-                <span>{% trans "Edit Book" %}</span>
+                <span class="is-hidden-mobile">{% trans "Edit Book" %}</span>
             </a>
         </div>
         {% endif %}
@@ -180,7 +180,7 @@
                 <p>{% trans "You don't have any reading activity for this book." %}</p>
                 {% endif %}
                 {% for readthrough in readthroughs %}
-                {% include 'snippets/readthrough.html' with readthrough=readthrough %}
+                {% include 'book/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
             </section>
             <hr aria-hidden="true">

bookwyrm/templates/book/editions.html

@@ -40,7 +40,7 @@
         </div>
 
         <div class="column is-narrow">
-            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True right=True %}
         </div>
     </div>
     {% endfor %}

bookwyrm/templates/book/readthrough.html

@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load humanize %}
 {% load tz %}
-<div class="content box is-shadowless has-background-white-bis">
+<div class="content">
-    <div id="hide-edit-readthrough-{{ readthrough.id }}">
+    <div id="hide-edit-readthrough-{{ readthrough.id }}" class="box is-shadowless has-background-white-bis">
         <div class="columns">
             <div class="column">
                 {% trans "Progress Updates:" %}

bookwyrm/templates/directory/directory.html

@@ -20,8 +20,8 @@
         {% csrf_token %}
         <button class="button is-primary" type="submit">Join Directory</button>
         <p class="help">
-            {% url 'settings-profile' as path %}
+            {% url 'prefs-profile' as path %}
-            {% blocktrans %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
+            {% blocktrans with path=path %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
         </p>
     </form>
     </div>

bookwyrm/templates/notifications.html

@@ -56,7 +56,7 @@
                 <span class="icon icon-warning"></span>
                 {% endif %}
             </div>
-            <div class="column">
+            <div class="column is-clipped">
                 <div class="block">
                     <p>
                         {# DESCRIPTION #}
@@ -137,7 +137,7 @@
                     {# PREVIEW #}
                     <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                         <div class="columns">
-                            <div class="column">
+                            <div class="column is-clipped">
                                 {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">

bookwyrm/templates/settings/federation.html

@@ -7,7 +7,7 @@
 {% block edit-button %}
 <a href="{% url 'settings-import-blocklist' %}">
     <span class="icon icon-plus" title="{% trans 'Add instance' %}" aria-hidden="True"></span>
-    <span>{% trans "Add instance" %}</span>
+    <span class="is-hidden-mobile">{% trans "Add instance" %}</span>
 </a>
 {% endblock %}
 

bookwyrm/templates/user/user.html

@@ -13,7 +13,7 @@
     <div class="column is-narrow">
         <a href="{% url 'prefs-profile' %}">
             <span class="icon icon-pencil" title="Edit profile" aria-hidden="true"></span>
-            <span>{% trans "Edit profile" %}</span>
+            <span class="is-hidden-mobile">{% trans "Edit profile" %}</span>
         </a>
     </div>
     {% endif %}
@@ -26,7 +26,7 @@
     <h2 class="title">
         {% include 'user/shelf/books_header.html' %}
     </h2>
-    <div class="columns">
+    <div class="columns is-mobile scroll-x">
         {% for shelf in shelves %}
         <div class="column is-narrow">
             <h3>{{ shelf.name }}
@@ -60,7 +60,7 @@
         <div class="column is-narrow">
             <a target="_blank" href="{{ user.local_path }}/rss">
                 <span class="icon icon-rss" aria-hidden="true"></span>
-                <span>{% trans "RSS feed" %}</span>
+                <span class="is-hidden-mobile">{% trans "RSS feed" %}</span>
             </a>
         </div>
     </div>

bookwyrm/views/invite.py

@@ -37,8 +37,12 @@ class ManageInvites(View):
             PAGE_LENGTH,
         )
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
-            "invites": paginated.get_page(request.GET.get("page")),
+            "invites": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "form": forms.CreateInviteForm(),
         }
         return TemplateResponse(request, "settings/manage_invites.html", data)
@@ -118,15 +122,16 @@ class ManageInviteRequests(View):
                 reduce(operator.or_, (Q(**f) for f in filters))
             ).distinct()
 
-        paginated = Paginator(
+        paginated = Paginator(requests, PAGE_LENGTH)
-            requests,
-            PAGE_LENGTH,
-        )
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "ignored": ignored,
             "count": paginated.count,
-            "requests": paginated.get_page(request.GET.get("page")),
+            "requests": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "sort": sort,
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)