more on listings in 19

Author: hjwp

chapter_15_advanced_forms.asciidoc

@@ -843,12 +843,18 @@ use Django instead, it seems like we need to bring back our custom
 <1> We give `.was-validated` to the `<form>`
 <2> We provide an `<input>` and the most important custom setting will be its
     `class`. As you can see, we can use conditionals even for providing
-    additional `class` -es.
+    additional `class` -es.footnote:[
+We've split the form tag across three lines so it fits nicely in the book.
+If you've not seen that before, it may look a little weird to you,
+but I promise it is valid HTML.
+You don't have to use it if you don't like it though. :)]
+
 <3> If you try to just simply display `form.errors.text` you'll see it ends up
     as a list item in an unordered list. To avoid that, let's just
     select `form.errors.text.0`.
 
-NOTE:  Another fliip-flop! We spent most of the last chapter switching from handcrafted html
+NOTE:  Another fliip-flop!
+  We spent most of the last chapter switching from handcrafted html
   to having our form autogenerated by django, and now we're switching back.
   It's a little frustrating, and I could have gone back and changed the book's text to avoid the back+forth,
   but I prefer to show software development as it really is.

chapter_19_mocking.asciidoc

@@ -528,7 +528,7 @@ HTML.  You don't have to use it if you don't like it though. :)]
 
 
 [role="sourcecode small-code"]
-.lists/templates/base.html (ch17l012)
+.lists/templates/base.html (ch19l012)
 ====
 [source,html]
 ----
@@ -686,7 +686,7 @@ need to actually add the messages to the page.  Something like this:
 
 
 [role="sourcecode dofirst-ch17l014-4"]
-.lists/templates/base.html (ch17l015)
+.lists/templates/base.html (ch19l015)
 ====
 [source,html]
 ----
@@ -924,25 +924,25 @@ So we can insert the token into our email like this:
 
 
 [role="sourcecode"]
-.accounts/views.py (ch17l023)
+.accounts/views.py (ch19l023)
 ====
 [source,python]
 ----
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 [...]
 
 def send_login_email(request):
-    email = request.POST['email']
+    email = request.POST["email"]
     token = Token.objects.create(email=email)
-    url = request.build_absolute_uri(  #<1>
-        reverse('login') + '?token=' + str(token.uid)
+    url = request.build_absolute_uri(  # <1>
+        reverse("login") + "?token=" + str(token.uid)
     )
-    message_body = f'Use this link to log in:\n\n{url}'
+    message_body = f"Use this link to log in:\n\n{url}"
     send_mail(
-        'Your login link for Superlists',
+        "Your login link for Superlists",
         message_body,
-        'noreply@superlists',
-        [email]
+        "noreply@superlists",
+        [email],
     )
     [...]
 ----
@@ -1849,18 +1849,17 @@ Let's just make sure our base template shows a different nav bar for logged-in
 and non–logged-in users (which our FT relies on):
 
 [role="sourcecode small-code"]
-.lists/templates/base.html (ch17l046)
+.lists/templates/base.html (ch19l046)
 ====
 [source,html]
 ----
-<nav class="navbar navbar-default" role="navigation">
+<nav class="navbar">
   <div class="container-fluid">
     <a class="navbar-brand" href="/">Superlists</a>
     {% if user.email %}
-      <ul class="nav navbar-nav navbar-right">
-        <li class="navbar-text">Logged in as {{ user.email }}</li>
-        <li><a href="#">Log out</a></li>
-      </ul>
+      <!-- TODO put in a ul -->
+      <span class="navbar-text">Logged in as {{ user.email }}</span>
+      <a href="#">Log out</a>
     {% else %}
       <form class="navbar-form navbar-right"
             method="POST"
@@ -1912,22 +1911,23 @@ with our custom user model, as good a place to have it as any might be
 ====
 [source,python]
 ----
-from django.test import TestCase
 from django.contrib import auth
+from django.test import TestCase
+
 from accounts.models import Token
+
 User = auth.get_user_model()
 
 
 class UserModelTest(TestCase):
-
     def test_user_is_valid_with_email_only(self):
         [...]
     def test_email_is_primary_key(self):
         [...]
 
     def test_no_problem_with_auth_login(self):
-        user = User.objects.create(email='[email protected]')
-        user.backend = ''
+        user = User.objects.create(email="[email protected]")
+        user.backend = ""
         request = self.client.request().wsgi_request
         auth.login(request, user)  # should not raise
 ----
@@ -1952,6 +1952,7 @@ look through the Django source lines listed in the traceback, and have a read up
 of Django's https://docs.djangoproject.com/en/1.11/topics/signals/[docs on
 signals].
 
+// TODO this aint right
 
 The upshot is that we can fix it like this:
 
@@ -2156,29 +2157,31 @@ http://bit.ly/SuI0hA[built-in logout view], which clears down the user's
 session and redirects them to a page of our choice:
 
 [role="sourcecode"]
-.accounts/urls.py (ch17l051)
+.accounts/urls.py (ch19l051)
 ====
 [source,python]
 ----
-from django.contrib.auth.views import logout
-[...]
+from django.contrib.auth import views as auth_views
+from django.urls import path
+
+from . import views
 
 urlpatterns = [
-    url(r'^send_login_email$', views.send_login_email, name='send_login_email'),
-    url(r'^login$', views.login, name='login'),
-    url(r'^logout$', logout, {'next_page': '/'}, name='logout'),
+    path("send_login_email", views.send_login_email, name="send_login_email"),
+    path("login", views.login, name="login"),
+    path("logout", auth_views.LogoutView.as_view(), name="logout"),
 ]
 ----
 ====
 
 And in 'base.html', we just make the logout into a real URL link:
 
 [role="sourcecode"]
-.lists/templates/base.html (ch17l052)
+.lists/templates/base.html (ch19l052)
 ====
 [source,python]
 ----
-    <li><a href="{% url 'logout' %}">Log out</a></li>
+  <a href="{% url 'logout' %}">Log out</a>
 ----
 ====