From 8e607debd44f88852ca346705342f141487f580d Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 10 Feb 2016 12:07:59 +0000
Subject: [PATCH] Use <main> element in semantically appropriate way
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Assistive technologies use the `<main>` element to navigate around a document.
In `<main>` their users expect to find:

> [content] unique to the document, excluding any content that is
> repeated across a set of documents such as sidebars, navigation links,
> copyright information, site logos, and search forms…
— https://developer.mozilla.org/en/docs/Web/HTML/Element/main

Previously, the `<main>` element also wrapped the sidebar navigation. This
commit moves the `<main>` element to only wrap the content of the page when the
page has a navigation sidebar.

This commit also removes the `page-container` class which wasn’t being used for
anything.
---
 app/templates/admin_template.html      | 4 ++--
 app/templates/withnav_template.html    | 4 ++--
 app/templates/withoutnav_template.html | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 9624ca741..49bfd2bf2 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -63,9 +63,9 @@
 {% endif %}
 
 {% block content %}
-  <main id="content" role="main" class="page-container">
+  <div id="content">
     {% block fullwidth_content %}{% endblock %}
-  </main>
+  </div>
 {% endblock %}
 
 {% block body_end %}
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index d981762a1..caf0aa651 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -5,9 +5,9 @@
     <div class="column-one-third">
       {% include "main_nav.html" %}
     </div>
-    <div class="column-two-thirds column-main">
+    <main role="main" class="column-two-thirds column-main">
       {% include 'flash_messages.html' %}
       {% block maincolumn_content %}{% endblock %}
-    </div>
+    </main>
   </div>
 {% endblock %}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html
index 82a6b2758..fad322c73 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/withoutnav_template.html
@@ -1,6 +1,8 @@
 {% extends "admin_template.html" %}
 
 {% block fullwidth_content %}
-  {% include 'flash_messages.html' %}
-  {% block maincolumn_content %}{% endblock %}
+  <main role="main">
+    {% include 'flash_messages.html' %}
+    {% block maincolumn_content %}{% endblock %}
+  </main>
 {% endblock %}