From 74d2cf646a4e445c0d53ab30ea00b8956498a881 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 1 Oct 2021 10:22:30 -0700
Subject: [PATCH] Moves meta tags out of p tags

I guess that's not kosher
---
 bookwyrm/templates/book/publisher_info.html  | 29 ++++++++++----------
 bookwyrm/tests/views/books/test_edit_book.py |  1 -
 bookwyrm/tests/views/books/test_editions.py  |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index da3d7d1d..e0711fa8 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -7,15 +7,16 @@
 {% firstof book.physical_format book.physical_format_detail as format_property %}
 {% with pages=book.pages %}
 {% if format or pages %}
+
+{% if format_property %}
+<meta itemprop="bookFormat" content="{{ format_property }}">
+{% endif %}
+
+{% if pages %}
+<meta itemprop="numberOfPages" content="{{ pages }}">
+{% endif %}
+
 <p>
-    {% if format_property %}
-        <meta itemprop="bookFormat" content="{{ format_property }}">
-    {% endif %}
-
-    {% if pages %}
-        <meta itemprop="numberOfPages" content="{{ pages }}">
-    {% endif %}
-
     {% if format and not pages %}
         {% blocktrans %}{{ format }}{% endblocktrans %}
     {% elif format and pages %}
@@ -41,13 +42,13 @@
 
 {% with date=book.published_date|naturalday publisher=book.publishers|join:', ' %}
 {% if date or book.first_published_date or book.publishers %}
+{% if date or book.first_published_date %}
+    <meta
+        itemprop="datePublished"
+        content="{{ book.first_published_date|default:book.published_date|date:'Y-m-d' }}"
+    >
+{% endif %}
 <p>
-    {% if date or book.first_published_date %}
-        <meta
-            itemprop="datePublished"
-            content="{{ book.first_published_date|default:book.published_date|date:'Y-m-d' }}"
-        >
-    {% endif %}
 
     {% comment %}
         @todo The publisher property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py
index bb456e03..85bbc032 100644
--- a/bookwyrm/tests/views/books/test_edit_book.py
+++ b/bookwyrm/tests/views/books/test_edit_book.py
@@ -47,7 +47,6 @@ class EditBookViews(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_edit_book_page(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.EditBook.as_view()
diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py
index 213b726f..2f41fe66 100644
--- a/bookwyrm/tests/views/books/test_editions.py
+++ b/bookwyrm/tests/views/books/test_editions.py
@@ -45,7 +45,7 @@ class BookViews(TestCase):
             is_api.return_value = False
             result = view(request, self.work.id)
         self.assertIsInstance(result, TemplateResponse)
-        #validate_html(result.render())
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
         self.assertTrue("paperback" in result.context_data["formats"])