From 3f7afc901487377de5aff901bc0ee6458fdc2e4e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 21 Mar 2022 12:24:31 -0700
Subject: [PATCH 1/4] Adds prompt to import books in null state of suggested
 books

---
 bookwyrm/templates/feed/suggested_books.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/suggested_books.html b/bookwyrm/templates/feed/suggested_books.html
index 2582dcf0..12e47820 100644
--- a/bookwyrm/templates/feed/suggested_books.html
+++ b/bookwyrm/templates/feed/suggested_books.html
@@ -5,7 +5,19 @@
 <section class="block">
     <h2 class="title is-4">{% trans "Your Books" %}</h2>
     {% if not suggested_books %}
-    <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
+
+    <div class="content">
+        <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
+
+        <div class="box has-background-link-light">
+            <p>{% trans "Do you have book data from another service like GoodReads?" %}</p>
+            <a href="{% url 'import' %}">
+                <span class="icon icon-list" aria-hidden="true"></span>
+                {% trans "Import your reading history" %}
+            </a>
+        </div>
+    </div>
+
     {% else %}
     {% with active_book=request.GET.book %}
     <div class="tab-group">

From 34166b8a2fbeeb82fe12c2fffc84306f380041f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 21 Mar 2022 12:24:47 -0700
Subject: [PATCH 2/4] Uses help instead of tooltip for goodreads export info

---
 bookwyrm/templates/import/import.html  | 40 ++++++++++++++------------
 bookwyrm/templates/import/tooltip.html |  8 ------
 2 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 bookwyrm/templates/import/tooltip.html

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index fdeb0e55..1475acc0 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -14,28 +14,32 @@
         <div class="column is-half">
 
             <div class="field">
-                <label class="label is-pulled-left" for="source">
+                <label class="label" for="source">
                     {% trans "Data source:" %}
                 </label>
-                {% include 'import/tooltip.html' with controls_text="goodreads-tooltip" %}
+
+                <div class="select">
+                    <select name="source" id="source" aria-describedby="desc_source">
+                        <option value="Goodreads" {% if current == 'Goodreads' %}selected{% endif %}>
+                            Goodreads (CSV)
+                        </option>
+                        <option value="Storygraph" {% if current == 'Storygraph' %}selected{% endif %}>
+                            Storygraph (CSV)
+                        </option>
+                        <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
+                            LibraryThing (TSV)
+                        </option>
+                        <option value="OpenLibrary" {% if current == 'OpenLibrary' %}selected{% endif %}>
+                            OpenLibrary (CSV)
+                        </option>
+                    </select>
+                </div>
+
+                <p class="help" id="desc_source">
+                    {% trans 'You can download your Goodreads data from the <a href="https://www.goodreads.com/review/import" target="_blank" rel="noopener noreferrer">Import/Export page</a> of your Goodreads account.' %}
+                </p>
             </div>
 
-            <div class="select block">
-                <select name="source" id="source">
-                    <option value="Goodreads" {% if current == 'Goodreads' %}selected{% endif %}>
-                        Goodreads (CSV)
-                    </option>
-                    <option value="Storygraph" {% if current == 'Storygraph' %}selected{% endif %}>
-                        Storygraph (CSV)
-                    </option>
-                    <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
-                        LibraryThing (TSV)
-                    </option>
-                    <option value="OpenLibrary" {% if current == 'OpenLibrary' %}selected{% endif %}>
-                        OpenLibrary (CSV)
-                    </option>
-                </select>
-            </div>
             <div class="field">
                 <label class="label" for="id_csv_file">{% trans "Data file:" %}</label>
                 {{ import_form.csv_file }}
diff --git a/bookwyrm/templates/import/tooltip.html b/bookwyrm/templates/import/tooltip.html
deleted file mode 100644
index f2712b7e..00000000
--- a/bookwyrm/templates/import/tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'components/tooltip.html' %}
-{% load i18n %}
-
-{% block tooltip_content %}
-
-{% trans 'You can download your Goodreads data from the <a href="https://www.goodreads.com/review/import" target="_blank" rel="noopener noreferrer">Import/Export page</a> of your Goodreads account.' %}
-
-{% endblock %}

From 9e792a89016210427c0bef3e132aa3c5b1c06426 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 21 Mar 2022 12:26:07 -0700
Subject: [PATCH 3/4] Italics for null state text on import page, to be
 consistent

---
 bookwyrm/templates/import/import.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index 1475acc0..6df7c084 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -67,7 +67,7 @@
 <div class="content block">
     <h2 class="title">{% trans "Recent Imports" %}</h2>
     {% if not jobs %}
-    <p>{% trans "No recent imports" %}</p>
+    <p><em>{% trans "No recent imports" %}</em></p>
     {% endif %}
     <ul>
         {% for job in jobs %}

From 43cc017b44ccbef6dd54d0a10d462ee99d2a7d4b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 21 Mar 2022 12:32:53 -0700
Subject: [PATCH 4/4] Removes tooltip component

---
 bookwyrm/static/css/bookwyrm/_all.scss                |  8 --------
 bookwyrm/templates/components/tooltip.html            | 11 -----------
 .../settings/ip_blocklist/ip_address_form.html        |  1 +
 .../templates/settings/ip_blocklist/ip_tooltip.html   |  8 --------
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 bookwyrm/templates/components/tooltip.html
 delete mode 100644 bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html

diff --git a/bookwyrm/static/css/bookwyrm/_all.scss b/bookwyrm/static/css/bookwyrm/_all.scss
index 6002785f..79e5cf52 100644
--- a/bookwyrm/static/css/bookwyrm/_all.scss
+++ b/bookwyrm/static/css/bookwyrm/_all.scss
@@ -129,14 +129,6 @@ button:focus-visible .button-invisible-overlay {
 }
 
 
-
-/** Tooltips
- ******************************************************************************/
-
-.tooltip {
-    width: 100%;
-}
-
 /** States
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/components/tooltip.html b/bookwyrm/templates/components/tooltip.html
deleted file mode 100644
index 3176a639..00000000
--- a/bookwyrm/templates/components/tooltip.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load i18n %}
-
-{% trans "Help" as button_text %}
-{% include 'snippets/toggle/open_button.html' with text=button_text class="ml-3 is-rounded is-small has-background-body p-0 pb-1" icon="question-circle is-size-6" controls_text=controls_text controls_uid=controls_uid %}
-
-<aside class="tooltip notification is-hidden transition-y is-pulled-left mb-2" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
-    {% trans "Close" as button_text %}
-    {% include 'snippets/toggle/close_button.html' with label=button_text class="delete" nonbutton=True controls_text=controls_text controls_uid=controls_uid %}
-
-    {% block tooltip_content %}{% endblock %}
-</aside>
diff --git a/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html b/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
index 4a776987..2afc00b4 100644
--- a/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
+++ b/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
@@ -21,6 +21,7 @@
 
     <div class="field">
         <input type="text" name="address" maxlength="255" class="input" required="" id="id_address" placeholder="190.0.2.0/24" aria-describedby="desc_address">
+        <p class="help">{% trans "You can block IP ranges using CIDR syntax." %}</p>
     </div>
 
     {% include 'snippets/form_errors.html' with errors_list=form.address.errors id="desc_address" %}
diff --git a/bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html b/bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html
deleted file mode 100644
index 3a2bf543..00000000
--- a/bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'components/tooltip.html' %}
-{% load i18n %}
-
-{% block tooltip_content %}
-
-{% trans "You can block IP ranges using CIDR syntax." %}
-
-{% endblock %}