Merge pull request #2048 from bookwyrm-social/import-help

Import help

bookwyrm/static/css/bookwyrm/_all.scss

@@ -129,14 +129,6 @@ button:focus-visible .button-invisible-overlay {
 }
 
 
-
-/** Tooltips
- ******************************************************************************/
-
-.tooltip {
-    width: 100%;
-}
-
 /** States
  ******************************************************************************/
 

bookwyrm/templates/components/tooltip.html

@@ -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>

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 %}
+
+    <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">

bookwyrm/templates/import/import.html

@@ -14,14 +14,12 @@
         <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>
 
-            <div class="select block">
-                <select name="source" id="source">
+                <div class="select">
+                    <select name="source" id="source" aria-describedby="desc_source">
                         <option value="Goodreads" {% if current == 'Goodreads' %}selected{% endif %}>
                             Goodreads (CSV)
                         </option>
@@ -36,6 +34,12 @@
                         </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="field">
                 <label class="label" for="id_csv_file">{% trans "Data file:" %}</label>
                 {{ import_form.csv_file }}
@@ -63,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 %}

bookwyrm/templates/import/tooltip.html

@@ -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 %}

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" %}

bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html

@@ -1,8 +0,0 @@
-{% extends 'components/tooltip.html' %}
-{% load i18n %}
-
-{% block tooltip_content %}
-
-{% trans "You can block IP ranges using CIDR syntax." %}
-
-{% endblock %}