Merge pull request #170 from alphagov/main-is-main

Use <main> element in semantically appropriate way

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

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

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