From 029b43835546f659eb8a5bccf0c449320049c152 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@mouses-mbp-new.attlocal.net>
Date: Sat, 9 Dec 2023 08:18:31 -0800
Subject: [PATCH] Clarify import/export of book vs user

I think this wording is a little clearer
---
 bookwyrm/templates/import/import.html           |  9 ++++-----
 bookwyrm/templates/import/import_user.html      |  8 ++++----
 bookwyrm/templates/preferences/export-user.html |  4 ++--
 bookwyrm/templates/preferences/export.html      |  4 ++--
 bookwyrm/templates/preferences/layout.html      | 14 +++++++-------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html
index 2c3be9e07..01014fa94 100644
--- a/bookwyrm/templates/import/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -1,13 +1,12 @@
-{% extends 'layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% trans "Import Books" %}{% endblock %}
+{% block title %}{% trans "Import Book List" %}{% endblock %}
+{% block header %}{% trans "Import Book List" %}{% endblock %}
 
-{% block content %}
+{% block panel %}
 <div class="block">
-    <h1 class="title">{% trans "Import Books" %}</h1>
-
     {% if invalid %}
     <div class="notification is-danger">
         {% trans "Not a valid CSV file" %}
diff --git a/bookwyrm/templates/import/import_user.html b/bookwyrm/templates/import/import_user.html
index 681ed6756..f94236958 100644
--- a/bookwyrm/templates/import/import_user.html
+++ b/bookwyrm/templates/import/import_user.html
@@ -1,12 +1,12 @@
-{% extends 'layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% trans "Import User" %}{% endblock %}
+{% block title %}{% trans "Import BookWyrm Account" %}{% endblock %}
+{% block header %}{% trans "Import BookWyrm Account" %}{% endblock %}
 
-{% block content %}
+{% block panel %}
 <div class="block">
-    <h1 class="title">{% trans "Import User" %}</h1>
 
     {% if invalid %}
     <div class="notification is-danger">
diff --git a/bookwyrm/templates/preferences/export-user.html b/bookwyrm/templates/preferences/export-user.html
index a3fce0952..8ecca1863 100644
--- a/bookwyrm/templates/preferences/export-user.html
+++ b/bookwyrm/templates/preferences/export-user.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 {% load utilities %}
 
-{% block title %}{% trans "User Export" %}{% endblock %}
+{% block title %}{% trans "Export BookWyrm Account" %}{% endblock %}
 
 {% block header %}
-{% trans "Export User" %}
+{% trans "Export BookWyrm Account" %}
 {% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/preferences/export.html b/bookwyrm/templates/preferences/export.html
index 6976c5e27..e301eb5cc 100644
--- a/bookwyrm/templates/preferences/export.html
+++ b/bookwyrm/templates/preferences/export.html
@@ -1,10 +1,10 @@
 {% extends 'preferences/layout.html' %}
 {% load i18n %}
 
-{% block title %}{% trans "Books Export" %}{% endblock %}
+{% block title %}{% trans "Export Book List" %}{% endblock %}
 
 {% block header %}
-{% trans "Books Export" %}
+{% trans "Export Book List" %}
 {% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/preferences/layout.html b/bookwyrm/templates/preferences/layout.html
index c0c38dd3e..56151233f 100644
--- a/bookwyrm/templates/preferences/layout.html
+++ b/bookwyrm/templates/preferences/layout.html
@@ -40,19 +40,19 @@
         <ul class="menu-list">
             <li>
                 {% url 'import' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Import Books" %}</a>
-            </li>
-            <li>
-                {% url 'user-import' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Import User" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Import Book List" %}</a>
             </li>
             <li>
                 {% url 'prefs-export' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Export Books" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Export Book List" %}</a>
+            </li>
+            <li>
+                {% url 'user-import' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Import BookWyrm Account" %}</a>
             </li>
             <li>
                 {% url 'prefs-user-export' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Export User" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Export BookWyrm Account" %}</a>
             </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>