From 01986cfa1702929352ac8b6d58ada6070da2c700 Mon Sep 17 00:00:00 2001
From: Steve <steven_ts@hotmail.com>
Date: Wed, 9 Feb 2022 23:30:48 -0700
Subject: [PATCH] Indent templates with djhtml

---
 docs/_templates/layout.html                   | 142 +++++-----
 docs/_templates/search.html                   | 156 +++++------
 docs/_templates/searchbox.html                |  12 +-
 wagtail/admin/templates/wagtailadmin/404.html |   2 +-
 .../account/password_reset/confirm.html       |  94 +++----
 .../admin/templates/wagtailadmin/base.html    |  80 +++---
 .../confirmation/form_with_fields.html        |   6 +-
 .../list_items_with_no_access.html            |  16 +-
 .../wagtailadmin/bulk_actions/footer.html     |   2 +-
 .../bulk_actions/listing_checkbox_cell.html   |   8 +-
 .../wagtailadmin/chooser/browse.html          |   2 +-
 .../chooser/confirm_external_to_internal.html |  28 +-
 .../collections/_privacy_switch.html          |  24 +-
 .../edit_handlers/field_row_panel.html        |   6 +-
 .../edit_handlers/inline_panel.html           |   6 +-
 .../edit_handlers/inline_panel_child.html     |  14 +-
 .../edit_handlers/object_list.html            |  10 +-
 .../admin/templates/wagtailadmin/home.html    |   6 +-
 .../wagtailadmin/home/locked_pages.html       | 112 ++++----
 .../home/pages_for_moderation.html            | 150 +++++-----
 .../wagtailadmin/home/recent_edits.html       | 102 +++----
 .../user_pages_in_workflow_moderation.html    | 108 ++++----
 .../home/workflow_pages_to_moderate.html      | 116 ++++----
 .../admin/templates/wagtailadmin/login.html   | 116 ++++----
 .../wagtailadmin/notifications/base.html      | 258 +++++++++---------
 .../notifications/updated_comments.html       |  26 +-
 .../wagtailadmin/pages/_privacy_switch.html   |  44 +--
 .../wagtailadmin/pages/action_menu/menu.html  |   2 +-
 .../bulk_actions/confirm_bulk_delete.html     |  46 ++--
 .../pages/bulk_actions/confirm_bulk_move.html |  58 ++--
 .../bulk_actions/confirm_bulk_publish.html    |  60 ++--
 .../bulk_actions/confirm_bulk_unpublish.html  |  60 ++--
 .../list_items_with_no_access.html            |  10 +-
 .../wagtailadmin/pages/confirm_unpublish.html |  22 +-
 .../pages/confirm_workflow_cancellation.html  |  20 +-
 .../templates/wagtailadmin/pages/create.html  |  14 +-
 .../templates/wagtailadmin/pages/edit.html    | 164 +++++------
 .../templates/wagtailadmin/pages/index.html   |   8 +-
 .../pages/listing/_button_with_dropdown.html  |  14 +-
 .../wagtailadmin/pages/listing/_buttons.html  |   2 +-
 .../pages/listing/_list_explore.html          |   2 +-
 .../listing/_parent_page_title_explore.html   |   6 +-
 .../pages/listing/_table_headers_explore.html |  24 +-
 .../pages/move_choose_destination.html        |   4 +-
 .../pages/privacy_switch_panel.html           |  36 +--
 .../pages/revisions/_actions.html             |  14 +-
 .../wagtailadmin/pages/revisions/compare.html |  34 +--
 .../pages/workflow_action_modal.html          |   2 +-
 ...collection_member_permissions_formset.html |   8 +-
 .../wagtailadmin/reports/base_report.html     |   4 +-
 .../reports/listing/_list_page_report.html    |  32 +--
 .../reports/listing/_list_unlock.html         |   2 +-
 .../wagtailadmin/shared/breadcrumb.html       |   6 +-
 .../shared/collection_chooser.html            |   2 +-
 .../shared/explorer_menu_item.html            |   4 +-
 .../templates/wagtailadmin/shared/header.html |   4 +-
 .../templates/wagtailadmin/shared/icon.html   |  24 +-
 .../templates/wagtailadmin/shared/icons.html  |  20 +-
 .../wagtailadmin/shared/last_updated.html     |   6 +-
 .../wagtailadmin/shared/locale_selector.html  |  14 +-
 .../wagtailadmin/shared/menu_item.html        |   4 +-
 .../wagtailadmin/shared/non_field_errors.html |  14 +-
 .../wagtailadmin/shared/wagtail_icon.html     |  14 +-
 .../wagtailadmin/shared/workflow_status.html  |  70 ++---
 .../templates/wagtailadmin/skeleton.html      | 158 +++++------
 .../templates/wagtailadmin/userbar/base.html  |  28 +-
 .../wagtailadmin/userbar/item_page_add.html   |   4 +-
 .../userbar/item_page_approve.html            |   4 +-
 .../wagtailadmin/userbar/item_page_edit.html  |   4 +-
 .../userbar/item_page_explore.html            |   4 +-
 .../userbar/item_page_reject.html             |   4 +-
 .../wagtailadmin/widgets/daterange_input.html |   2 +-
 .../wagtailadmin/widgets/time_input.html      |   2 +-
 .../workflows/confirm_delete.html             |   2 +-
 .../wagtailadmin/workflows/edit.html          |   2 +-
 .../wagtailadmin/workflows/edit_task.html     |  18 +-
 .../includes/workflow_pages_formset.html      |   8 +-
 .../wagtailadmin/workflows/index.html         |   2 +-
 .../workflows/task_chooser/chooser.html       |  14 +-
 .../task_chooser/includes/results.html        |  22 +-
 .../wagtailadmin/workflows/task_index.html    |   2 +-
 .../workflows/workflow_status.html            |  64 ++---
 .../wagtailforms/index_submissions.html       |   4 +-
 .../wagtailforms/list_submissions.html        |  62 ++---
 .../templates/modeladmin/choose_parent.html   |  34 +--
 .../templates/modeladmin/includes/filter.html |   8 +-
 .../includes/header_with_history.html         |  26 +-
 .../modeladmin/includes/result_list.html      |  36 +--
 .../modeladmin/includes/result_row_value.html |  10 +-
 .../modeladmin/includes/search_form.html      |  30 +-
 .../templates/modeladmin/index.html           |  18 +-
 .../templates/modeladmin/inspect.html         |   8 +-
 .../modeladmin/prepopulated_slugs.html        |   6 +-
 .../templates/wagtailredirects/results.html   |  16 +-
 .../includes/searchpromotions_formset.html    |   6 +-
 .../wagtailsearchpromotions/index.html        |   2 +-
 .../wagtailsearchpromotions/results.html      |  12 +-
 .../templates/wagtailsettings/edit.html       |  22 +-
 .../templates/wagtailstyleguide/base.html     |  32 +--
 .../templates/table_block/blocks/table.html   |  88 +++---
 .../typed_table_block/typed_table_block.html  |  12 +-
 .../bulk_actions/confirm_bulk_add_tags.html   |  32 +--
 .../confirm_bulk_add_to_collection.html       |  32 +--
 .../bulk_actions/confirm_bulk_delete.html     |  40 +--
 .../list_items_with_no_access.html            |   4 +-
 .../wagtaildocs/chooser/results.html          |  32 +--
 .../wagtaildocs/documents/confirm_delete.html |   4 +-
 .../wagtaildocs/documents/results.html        |  14 +-
 .../homepage/site_summary_documents.html      |  10 +-
 .../templates/wagtaildocs/multiple/add.html   |  14 +-
 .../bulk_actions/confirm_bulk_add_tags.html   |  32 +--
 .../confirm_bulk_add_to_collection.html       |  36 +--
 .../bulk_actions/confirm_bulk_delete.html     |  44 +--
 .../list_items_with_no_access.html            |  10 +-
 .../wagtailimages/chooser/results.html        |  10 +-
 .../homepage/site_summary_images.html         |  10 +-
 .../wagtailimages/images/_file_field.html     |   2 +-
 .../templates/wagtailimages/images/index.html |  30 +-
 .../wagtailimages/images/results.html         |  10 +-
 .../templates/wagtailimages/multiple/add.html |  14 +-
 .../home/templates/home/welcome_page.html     |  88 +++---
 .../project_name/templates/404.html           |   4 +-
 .../project_name/templates/base.html          |  10 +-
 .../search/templates/search/search.html       |  50 ++--
 .../wagtailsearch/queries/chooser_field.html  |   6 +-
 .../wagtailsearch/search_results.html         |  36 +--
 .../wagtailsnippets/chooser/results.html      |  12 +-
 .../snippets/_header_with_history.html        |  26 +-
 .../snippets/action_menu/menu.html            |   2 +-
 .../snippets/confirm_delete.html              |   6 +-
 .../wagtailsnippets/snippets/edit.html        |   8 +-
 .../wagtailsnippets/snippets/results.html     |  12 +-
 .../testapp/templates/tests/event_page.html   |  30 +-
 .../templates/tests/form_page_landing.html    |   6 +-
 ...page_with_custom_form_builder_landing.html |   6 +-
 .../confirm_bulk_assign_role.html             |  28 +-
 .../bulk_actions/confirm_bulk_delete.html     |  28 +-
 .../confirm_bulk_set_active_state.html        |  42 +--
 .../list_items_with_no_access.html            |   2 +-
 .../includes/formatted_permissions.html       |  74 ++---
 .../includes/page_permissions_formset.html    |   8 +-
 .../templates/wagtailusers/users/index.html   |   4 +-
 .../templates/wagtailusers/users/results.html |  14 +-
 143 files changed, 2067 insertions(+), 2067 deletions(-)

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 44881ff3df..2abf5be9a5 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -4,83 +4,83 @@
 {% set docsearch_base = 'https://cdn.jsdelivr.net/npm/docsearch.js@' ~ docsearch_version ~ '/dist/cdn/' %}
 
 {% block extrahead %}
-<link rel="stylesheet" href="{{ docsearch_base ~ 'docsearch.min.css' }}"/>
-<link rel="stylesheet" href="{{ pathto('_static/css/docsearch.overrides.css', 1) }}" />
-<link rel="stylesheet" href="{{ pathto('_static/css/custom.css', 1) }}" />
+    <link rel="stylesheet" href="{{ docsearch_base ~ 'docsearch.min.css' }}"/>
+    <link rel="stylesheet" href="{{ pathto('_static/css/docsearch.overrides.css', 1) }}" />
+    <link rel="stylesheet" href="{{ pathto('_static/css/custom.css', 1) }}" />
 {% endblock %}
 
 {% block search %}
-<script async defer data-domain="docs.wagtail.org" src="https://plausible.io/js/plausible.js"></script>
-<script src="{{ docsearch_base }}docsearch.min.js"></script>
-<script>
-  /**
-   * Get version of the currently served docs.
-   *
-   * PR builds have their version set to the PR ID (e.g. "6753").
-   * If the docs are built for a PR, use the "latest" search index.
-   * Otherwise, use the search index for the current version.
-   */
-  function getReadTheDocsVersion() {
-    const rtd_version = (window.READTHEDOCS_DATA || {}).version || 'latest'
-    const version = rtd_version.match(/^\d+$/) ? 'latest' : rtd_version
-    return version
-  }
+    <script async defer data-domain="docs.wagtail.org" src="https://plausible.io/js/plausible.js"></script>
+    <script src="{{ docsearch_base }}docsearch.min.js"></script>
+    <script>
+        /**
+         * Get version of the currently served docs.
+         *
+         * PR builds have their version set to the PR ID (e.g. "6753").
+         * If the docs are built for a PR, use the "latest" search index.
+         * Otherwise, use the search index for the current version.
+         */
+        function getReadTheDocsVersion() {
+            const rtd_version = (window.READTHEDOCS_DATA || {}).version || 'latest'
+            const version = rtd_version.match(/^\d+$/) ? 'latest' : rtd_version
+            return version
+        }
 
-  function getVersionFacetFilter() {
-    return `version:${getReadTheDocsVersion()}`;
-  }
+        function getVersionFacetFilter() {
+            return `version:${getReadTheDocsVersion()}`;
+        }
 
-  /**
-   * Return true (debug: on) for local builds or Read the Docs PR previews.
-   *
-   * The debug mode allows inspection of the dropodown.
-   */
-  function getSearchDebugMode() {
-    let debug = false
-    if (window.READTHEDOCS_DATA === undefined) {
-      // When developing locally, the `window.READTHEDOCS_DATA` object does not exist.
-      debug = true
-    } else {
-      // When PR preview on Readthedocs, then the version can be converted into
-      // a number. This does not work for the production version identifiers
-      // like 'stable', 'latest', 'v2.12', etc. In that case `Number()` is `NaN`.
-      const versionNumber = Number(window.READTHEDOCS_DATA.version)
-      debug = !isNaN(versionNumber)
-    }
-    return debug
-  }
+        /**
+         * Return true (debug: on) for local builds or Read the Docs PR previews.
+         *
+         * The debug mode allows inspection of the dropodown.
+         */
+        function getSearchDebugMode() {
+            let debug = false
+            if (window.READTHEDOCS_DATA === undefined) {
+                // When developing locally, the `window.READTHEDOCS_DATA` object does not exist.
+                debug = true
+            } else {
+                // When PR preview on Readthedocs, then the version can be converted into
+                // a number. This does not work for the production version identifiers
+                // like 'stable', 'latest', 'v2.12', etc. In that case `Number()` is `NaN`.
+                const versionNumber = Number(window.READTHEDOCS_DATA.version)
+                debug = !isNaN(versionNumber)
+            }
+            return debug
+        }
 
-  function docSearchReady() {
-    /**
-    * Configure Algolia DocSearch.
-    * See https://github.com/algolia/docsearch-configs/blob/master/configs/wagtail.json for index configuration.
-    */
-    const search = docsearch({
-      apiKey: '8325c57d16798633e29d211c26c7b6f9',
-      indexName: 'wagtail',
-      inputSelector: '#searchbox [name="q"]',
-      algoliaOptions: {
-        facetFilters: [getVersionFacetFilter()],
-      },
-      autocompleteOptions: {
-        // Do NOT automatically select the first suggestion in the dropdown.
-        // https://github.com/algolia/autocomplete/blob/45fa32d008620cf52bf4a90530be338543dfba7f/README.md#global-options
-        autoSelect: false
-      },
-      debug: getSearchDebugMode(),
-    })
+        function docSearchReady() {
+            /**
+             * Configure Algolia DocSearch.
+             * See https://github.com/algolia/docsearch-configs/blob/master/configs/wagtail.json for index configuration.
+             */
+            const search = docsearch({
+                apiKey: '8325c57d16798633e29d211c26c7b6f9',
+                indexName: 'wagtail',
+                inputSelector: '#searchbox [name="q"]',
+                algoliaOptions: {
+                    facetFilters: [getVersionFacetFilter()],
+                },
+                autocompleteOptions: {
+                    // Do NOT automatically select the first suggestion in the dropdown.
+                    // https://github.com/algolia/autocomplete/blob/45fa32d008620cf52bf4a90530be338543dfba7f/README.md#global-options
+                    autoSelect: false
+                },
+                debug: getSearchDebugMode(),
+            })
 
-    // Change page styles when the dropdown is open, to lock scrolling.
-    search.autocomplete.on('autocomplete:updated', function (event) {
-      const isOpen = event.target.value.trim() !== '';
-      document.body.classList.toggle('body--autocomplete-open', isOpen);
-    });
-    search.autocomplete.on('autocomplete:closed', function (event) {
-      document.body.classList.toggle('body--autocomplete-open', false);
-    });
-    return search
-  }
+            // Change page styles when the dropdown is open, to lock scrolling.
+            search.autocomplete.on('autocomplete:updated', function (event) {
+                const isOpen = event.target.value.trim() !== '';
+                document.body.classList.toggle('body--autocomplete-open', isOpen);
+            });
+            search.autocomplete.on('autocomplete:closed', function (event) {
+                document.body.classList.toggle('body--autocomplete-open', false);
+            });
+            return search
+        }
 
-  docSearchReady();
-</script>
+        docSearchReady();
+    </script>
 {% endblock %}
diff --git a/docs/_templates/search.html b/docs/_templates/search.html
index b49165fc14..9349bc9514 100644
--- a/docs/_templates/search.html
+++ b/docs/_templates/search.html
@@ -2,100 +2,100 @@
 {% set title = _('Search') %}
 
 {% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans trimmed %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
+    <noscript>
+        <div id="fallback" class="admonition warning">
+            <p class="last">
+                {% trans trimmed %}Please activate JavaScript to enable the search
+                    functionality.{% endtrans %}
+            </p>
+        </div>
+    </noscript>
 
-  <div id="search-results">
-  </div>
+    <div id="search-results">
+    </div>
 {% endblock %}
 
 {% block footer %}
-{{ super() }}
-<script>
+    {{ super() }}
+    <script>
 
-function runSearchPageSearch() {
-  const urlParams = new URLSearchParams(window.location.search)
-  const query = urlParams.get('q')
+        function runSearchPageSearch() {
+            const urlParams = new URLSearchParams(window.location.search)
+            const query = urlParams.get('q')
 
-  const searchResultsContainer = document.getElementById('search-results')
-  addHeadingForQuery(query, searchResultsContainer)
+            const searchResultsContainer = document.getElementById('search-results')
+            addHeadingForQuery(query, searchResultsContainer)
 
-  const docSearch = docSearchReady()
-  const index = docSearch.client.initIndex('wagtail')
-  index.search(
-    query,
-    {
-      hitsPerPage: 50,
-      facetFilters: [getVersionFacetFilter()]
-    }
-  )
-  .then(({ hits }) => addResultsList(hits, query, searchResultsContainer))
-  .catch((error) => console.log(error))
-}
+            const docSearch = docSearchReady()
+            const index = docSearch.client.initIndex('wagtail')
+            index.search(
+                query,
+                {
+                    hitsPerPage: 50,
+                    facetFilters: [getVersionFacetFilter()]
+                }
+            )
+                .then(({ hits }) => addResultsList(hits, query, searchResultsContainer))
+                .catch((error) => console.log(error))
+        }
 
-function addHeadingForQuery(query, parentElement) {
-  const searchHeading = document.createElement('h1')
-  searchHeading.textContent = `Search results for “${query}”`
-  parentElement.appendChild(searchHeading)
-}
+        function addHeadingForQuery(query, parentElement) {
+            const searchHeading = document.createElement('h1')
+            searchHeading.textContent = `Search results for “${query}”`
+            parentElement.appendChild(searchHeading)
+        }
 
-function addResultsList(hits, query, parentElement) {
-  const searchResultsList = document.createElement('ul')
-  searchResultsList.className = "search"
-  for (hit of hits) {
-    const hitElement = createHitElement(hit, query)
-    searchResultsList.appendChild(hitElement)
-  }
-  parentElement.appendChild(searchResultsList)
-}
+        function addResultsList(hits, query, parentElement) {
+            const searchResultsList = document.createElement('ul')
+            searchResultsList.className = "search"
+            for (hit of hits) {
+                const hitElement = createHitElement(hit, query)
+                searchResultsList.appendChild(hitElement)
+            }
+            parentElement.appendChild(searchResultsList)
+        }
 
-function createHitElement(hitData, query) {
-  const pageURL = new URL(hitData.url)
-  pageURL.hash = '';
-  pageURL.searchParams.set('highlight', query);
-  const anchorURL = new URL(hitData.url);
-  anchorURL.searchParams.set('highlight', query);
-  const result = hitData._highlightResult
+        function createHitElement(hitData, query) {
+            const pageURL = new URL(hitData.url)
+            pageURL.hash = '';
+            pageURL.searchParams.set('highlight', query);
+            const anchorURL = new URL(hitData.url);
+            anchorURL.searchParams.set('highlight', query);
+            const result = hitData._highlightResult
 
-  const hitListElement = document.createElement('li')
+            const hitListElement = document.createElement('li')
 
-  const hierarchies = Object.values(result.hierarchy);
-  const firstHierarchyLevel = hierarchies[0];
-  const lastHierarchyLevel = hierarchies[hierarchies.length - 1];
+            const hierarchies = Object.values(result.hierarchy);
+            const firstHierarchyLevel = hierarchies[0];
+            const lastHierarchyLevel = hierarchies[hierarchies.length - 1];
 
-  const pageLink = document.createElement('a')
-  hitListElement.appendChild(pageLink)
-  pageLink.innerHTML = firstHierarchyLevel.value
-  pageLink.href = pageURL
+            const pageLink = document.createElement('a')
+            hitListElement.appendChild(pageLink)
+            pageLink.innerHTML = firstHierarchyLevel.value
+            pageLink.href = pageURL
 
-  const contextElement = document.createElement('div')
-  hitListElement.appendChild(contextElement)
-  contextElement.className = 'context'
+            const contextElement = document.createElement('div')
+            hitListElement.appendChild(contextElement)
+            contextElement.className = 'context'
 
-  if (lastHierarchyLevel && lastHierarchyLevel !== firstHierarchyLevel ) {
-    const contextLinkContainer = document.createElement('div')
-    contextElement.appendChild(contextLinkContainer)
-    const contextLink = document.createElement('a')
-    contextLinkContainer.appendChild(contextLink)
-    contextLink.innerHTML = lastHierarchyLevel.value
-    contextLink.href = anchorURL
-  }
+            if (lastHierarchyLevel && lastHierarchyLevel !== firstHierarchyLevel ) {
+                const contextLinkContainer = document.createElement('div')
+                contextElement.appendChild(contextLinkContainer)
+                const contextLink = document.createElement('a')
+                contextLinkContainer.appendChild(contextLink)
+                contextLink.innerHTML = lastHierarchyLevel.value
+                contextLink.href = anchorURL
+            }
 
-  if (result.content) {
-    const contentElement = document.createElement('div')
-    contentElement.innerHTML = result.content.value
-    contextElement.appendChild(contentElement)
-  }
+            if (result.content) {
+                const contentElement = document.createElement('div')
+                contentElement.innerHTML = result.content.value
+                contextElement.appendChild(contentElement)
+            }
 
-  return hitListElement
-}
+            return hitListElement
+        }
 
-window.addEventListener('DOMContentLoaded', runSearchPageSearch)
-</script>
+        window.addEventListener('DOMContentLoaded', runSearchPageSearch)
+    </script>
 {% endblock %}
diff --git a/docs/_templates/searchbox.html b/docs/_templates/searchbox.html
index cea830ffbd..9dd7fc4280 100644
--- a/docs/_templates/searchbox.html
+++ b/docs/_templates/searchbox.html
@@ -1,8 +1,8 @@
 {%- if builder != "singlehtml" %}
-<div id="searchbox" class="" role="search">
-    <form id="search-form" action="{{ pathto('search') }}" autocomplete="off" method="get">
-        <input class="form-control p-3 h-100" type="text" name="q" placeholder="Search" aria-label="Search" id="searchinput" />
-        <input type="submit" style="visibility:hidden;position:absolute">
-    </form>
-</div>
+    <div id="searchbox" class="" role="search">
+        <form id="search-form" action="{{ pathto('search') }}" autocomplete="off" method="get">
+            <input class="form-control p-3 h-100" type="text" name="q" placeholder="Search" aria-label="Search" id="searchinput" />
+            <input type="submit" style="visibility:hidden;position:absolute">
+        </form>
+    </div>
 {%- endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/404.html b/wagtail/admin/templates/wagtailadmin/404.html
index 5530c24aba..5cf309c718 100644
--- a/wagtail/admin/templates/wagtailadmin/404.html
+++ b/wagtail/admin/templates/wagtailadmin/404.html
@@ -19,7 +19,7 @@
 
             <div class="page404__text-container">
                 <h1 class="page404__header">
-                     {% trans "Error 404" %}
+                    {% trans "Error 404" %}
                 </h1>
 
                 <p class="page404__text">
diff --git a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
index a86ef0a253..a007134427 100644
--- a/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -17,56 +17,56 @@
 
 {% block furniture %}
     <main class="content-wrapper" role="main">
-    {% if validlink %}
-        <form method="post" novalidate>
-            {% csrf_token %}
-            <h1>{% trans "Set your new password" %}</h1>
+        {% if validlink %}
+            <form method="post" novalidate>
+                {% csrf_token %}
+                <h1>{% trans "Set your new password" %}</h1>
 
-            <ul class="fields">
-                <li>
-                    <div class="field">
-                        {{ form.new_password1.label_tag }}
-                        {{ form.new_password1 }}
+                <ul class="fields">
+                    <li>
+                        <div class="field">
+                            {{ form.new_password1.label_tag }}
+                            {{ form.new_password1 }}
 
-                        {% if form.new_password1.errors %}
-                          <div class="help-block help-critical">
-                            {% for error in form.new_password1.errors %}
-                              <p class="error">{{ error }}</p>
-                            {% endfor %}
-                          </div>
-                        {% endif %}
-                    </div>
-                </li>
-                <li>
-                    <div class="field">
-                        {{ form.new_password2.label_tag }}
-                        {{ form.new_password2 }}
+                            {% if form.new_password1.errors %}
+                                <div class="help-block help-critical">
+                                    {% for error in form.new_password1.errors %}
+                                        <p class="error">{{ error }}</p>
+                                    {% endfor %}
+                                </div>
+                            {% endif %}
+                        </div>
+                    </li>
+                    <li>
+                        <div class="field">
+                            {{ form.new_password2.label_tag }}
+                            {{ form.new_password2 }}
 
-                        {% if form.new_password2.errors %}
-                          <div class="help-block help-critical">
-                            {% for error in form.new_password2.errors %}
-                              <p class="error">{{ error }}</p>
-                            {% endfor %}
-                          </div>
-                        {% endif %}
-                    </div>
-                </li>
-                <li class="submit">
-                    <button type="submit" class="button">{% trans 'Reset password' %}</button>
-                </li>
-            </ul>
-        </form>
-    {% else %}
-        <h1>{% trans "Invalid password reset link" %}</h1>
-        <div class="messages">
-            <ul>
-                <li class="error">
-                    {% trans "The password reset link was invalid, possibly because it has already been used." %}
-                </li>
-            </ul>
-        </div>
-        <a href="{% url 'wagtailadmin_password_reset' %}" class="button">{% trans 'Request a new password reset' %}</a>
-    {% endif %}
+                            {% if form.new_password2.errors %}
+                                <div class="help-block help-critical">
+                                    {% for error in form.new_password2.errors %}
+                                        <p class="error">{{ error }}</p>
+                                    {% endfor %}
+                                </div>
+                            {% endif %}
+                        </div>
+                    </li>
+                    <li class="submit">
+                        <button type="submit" class="button">{% trans 'Reset password' %}</button>
+                    </li>
+                </ul>
+            </form>
+        {% else %}
+            <h1>{% trans "Invalid password reset link" %}</h1>
+            <div class="messages">
+                <ul>
+                    <li class="error">
+                        {% trans "The password reset link was invalid, possibly because it has already been used." %}
+                    </li>
+                </ul>
+            </div>
+            <a href="{% url 'wagtailadmin_password_reset' %}" class="button">{% trans 'Request a new password reset' %}</a>
+        {% endif %}
 
     </main>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/base.html b/wagtail/admin/templates/wagtailadmin/base.html
index 9a702b5994..ca62b526eb 100644
--- a/wagtail/admin/templates/wagtailadmin/base.html
+++ b/wagtail/admin/templates/wagtailadmin/base.html
@@ -5,37 +5,37 @@
     {% slim_sidebar_enabled as slim_sidebar_enabled %}
     <template data-wagtail-sidebar-branding-logo>{% block branding_logo %}{% endblock %}</template>
     {% if slim_sidebar_enabled %}
-    {% sidebar_props %}
-    <aside id="wagtail-sidebar" data-wagtail-sidebar></aside>
+        {% sidebar_props %}
+        <aside id="wagtail-sidebar" data-wagtail-sidebar></aside>
     {% else %}
-    <aside id="wagtail-sidebar" class="nav-wrapper" data-nav-primary>
-        <div class="inner">
-            <a href="{% url 'wagtailadmin_home' %}" class="logo" aria-label="{% trans 'Dashboard' %}">
-                {# Mobile-only logo: #}
-                <div class="wagtail-logo-container__mobile u-hidden@sm">
-                    <img class="wagtail-logo wagtail-logo__full" src="{% versioned_static 'wagtailadmin/images/wagtail-logo.svg' %}" alt="" width="80" />
-                </div>
+        <aside id="wagtail-sidebar" class="nav-wrapper" data-nav-primary>
+            <div class="inner">
+                <a href="{% url 'wagtailadmin_home' %}" class="logo" aria-label="{% trans 'Dashboard' %}">
+                    {# Mobile-only logo: #}
+                    <div class="wagtail-logo-container__mobile u-hidden@sm">
+                        <img class="wagtail-logo wagtail-logo__full" src="{% versioned_static 'wagtailadmin/images/wagtail-logo.svg' %}" alt="" width="80" />
+                    </div>
 
-                {# Desktop logo (animated): #}
-                {% include "wagtailadmin/shared/animated_logo.html" %}
-                <span class="u-hidden@sm">{% trans "Dashboard" %}</span>
-            </a>
+                    {# Desktop logo (animated): #}
+                    {% include "wagtailadmin/shared/animated_logo.html" %}
+                    <span class="u-hidden@sm">{% trans "Dashboard" %}</span>
+                </a>
 
-            {% menu_search %}
-            {% main_nav %}
-        </div>
-        <div class="explorer__wrapper" data-explorer-menu></div>
-    </aside>
-    {# Backwards-compatibility for branding_logo customisations in legacy sidebar. #}
-    {# RemovedInWagtail218Warning Remove when removing the legacy sidebar. #}
-    <script>
-        const branding_logo = document.querySelector('[data-wagtail-sidebar-branding-logo]');
-        const legacySidebar = document.querySelector('[data-nav-primary]');
-        if (branding_logo && branding_logo.innerHTML && legacySidebar) {
-            const link = legacySidebar.querySelector('a');
-            link.innerHTML = `${branding_logo.innerHTML}<span class="u-hidden@sm">{% trans "Dashboard" %}</span>`;
-        }
-    </script>
+                {% menu_search %}
+                {% main_nav %}
+            </div>
+            <div class="explorer__wrapper" data-explorer-menu></div>
+        </aside>
+        {# Backwards-compatibility for branding_logo customisations in legacy sidebar. #}
+        {# RemovedInWagtail218Warning Remove when removing the legacy sidebar. #}
+        <script>
+            const branding_logo = document.querySelector('[data-wagtail-sidebar-branding-logo]');
+            const legacySidebar = document.querySelector('[data-nav-primary]');
+            if (branding_logo && branding_logo.innerHTML && legacySidebar) {
+                const link = legacySidebar.querySelector('a');
+                link.innerHTML = `${branding_logo.innerHTML}<span class="u-hidden@sm">{% trans "Dashboard" %}</span>`;
+            }
+        </script>
     {% endif %}
 
     <main class="content-wrapper" role="main" id="main">
@@ -46,17 +46,17 @@
                     <ul>
                         {% for message in messages %}
                             <li class="{% message_tags message %}">
-                              {% if message.level_tag == "error" %}
-                                {# There is no error icon, use warning icon instead #}
-                                {% icon name="warning" class_name="messages-icon" %}
-                              {% elif message.extra_tags == "lock" %}
-                                {% icon name="lock" class_name="messages-icon" %}
-                              {% elif message.extra_tags == "unlock" %}
-                                {% icon name="lock-open" class_name="messages-icon" %}
-                              {% else %}
-                                {% icon name=message.level_tag class_name="messages-icon" %}
-                              {% endif %}
-                              {{ message|safe }}
+                                {% if message.level_tag == "error" %}
+                                    {# There is no error icon, use warning icon instead #}
+                                    {% icon name="warning" class_name="messages-icon" %}
+                                {% elif message.extra_tags == "lock" %}
+                                    {% icon name="lock" class_name="messages-icon" %}
+                                {% elif message.extra_tags == "unlock" %}
+                                    {% icon name="lock-open" class_name="messages-icon" %}
+                                {% else %}
+                                    {% icon name=message.level_tag class_name="messages-icon" %}
+                                {% endif %}
+                                {{ message|safe }}
                             </li>
                         {% endfor %}
                     </ul>
@@ -64,7 +64,7 @@
             </div>
 
             {% if not slim_sidebar_enabled %}
-            <button type="button" id="nav-toggle" class="nav-toggle icon button unbutton" ><span class="visuallyhidden">{% trans "Toggle sidebar" %}</span></button>
+                <button type="button" id="nav-toggle" class="nav-toggle icon button unbutton" ><span class="visuallyhidden">{% trans "Toggle sidebar" %}</span></button>
             {% endif %}
             {% block content %}{% endblock %}
         </div>
diff --git a/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/form_with_fields.html b/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/form_with_fields.html
index 4a2ffe2f37..92a4aab60f 100644
--- a/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/form_with_fields.html
+++ b/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/form_with_fields.html
@@ -1,7 +1,7 @@
 {% extends './form.html' %}
 
 {% block form_fields %}
-<ul class="fields">
-    {% include 'wagtailadmin/shared/form_as_ul.html' %}
-</ul>
+    <ul class="fields">
+        {% include 'wagtailadmin/shared/form_as_ul.html' %}
+    </ul>
 {% endblock form_fields %}
diff --git a/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/list_items_with_no_access.html b/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/list_items_with_no_access.html
index 8a93b3a9df..1febc300a8 100644
--- a/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/list_items_with_no_access.html
+++ b/wagtail/admin/templates/wagtailadmin/bulk_actions/confirmation/list_items_with_no_access.html
@@ -1,10 +1,10 @@
 {% if items %}
-<p>{{ no_access_msg }}</p>
-<ul>
-    {% for item in items %}
-    <li>
-        {% block per_item %}{% endblock per_item %}
-    </li>
-    {% endfor %}
-</ul>
+    <p>{{ no_access_msg }}</p>
+    <ul>
+        {% for item in items %}
+            <li>
+                {% block per_item %}{% endblock per_item %}
+            </li>
+        {% endfor %}
+    </ul>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html b/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html
index 5a1478ddf8..ec512dda28 100644
--- a/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html
+++ b/wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html
@@ -6,7 +6,7 @@
         <ul class="bulk-actions-buttons">{% bulk_action_choices app_label model_name %}</ul>
         <span data-bulk-action-num-objects class="num-objects"></span>
         {% if objects.has_other_pages %}
-        <button data-bulk-action-num-objects-in-listing class="num-objects-in-listing u-hidden">{{ select_all_obj_text }}</button>
+            <button data-bulk-action-num-objects-in-listing class="num-objects-in-listing u-hidden">{{ select_all_obj_text }}</button>
         {% endif %}
     </div>
 </section>
diff --git a/wagtail/admin/templates/wagtailadmin/bulk_actions/listing_checkbox_cell.html b/wagtail/admin/templates/wagtailadmin/bulk_actions/listing_checkbox_cell.html
index ce58a000f8..bedb1ee76f 100644
--- a/wagtail/admin/templates/wagtailadmin/bulk_actions/listing_checkbox_cell.html
+++ b/wagtail/admin/templates/wagtailadmin/bulk_actions/listing_checkbox_cell.html
@@ -1,9 +1,9 @@
 {% load i18n l10n wagtailadmin_tags %}
 <td>
     <input type="checkbox"
-    {% if obj_type == 'page' %}data-page-status="{% if obj.live %}live{% else %}draft{% endif %}"{% endif %}
-    data-object-id="{{obj.id|unlocalize}}" data-bulk-action-checkbox class="bulk-action-checkbox"
-    {% if checkbox_aria_label %}aria-label="{{checkbox_aria_label}}"{% endif %}
-    {% if aria_labelledby %}aria-labelledby="{{ aria_labelledby_prefix }}{{ aria_labelledby }}{{ aria_labelledby_suffix }}"{% endif %}
+        {% if obj_type == 'page' %}data-page-status="{% if obj.live %}live{% else %}draft{% endif %}"{% endif %}
+        data-object-id="{{obj.id|unlocalize}}" data-bulk-action-checkbox class="bulk-action-checkbox"
+        {% if checkbox_aria_label %}aria-label="{{checkbox_aria_label}}"{% endif %}
+        {% if aria_labelledby %}aria-labelledby="{{ aria_labelledby_prefix }}{{ aria_labelledby }}{{ aria_labelledby_suffix }}"{% endif %}
     />
 </td>
diff --git a/wagtail/admin/templates/wagtailadmin/chooser/browse.html b/wagtail/admin/templates/wagtailadmin/chooser/browse.html
index dac5a3819e..e2551d10f4 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/browse.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/browse.html
@@ -14,7 +14,7 @@
         <p class="help-block help-warning">
             {% blocktrans with type=page_type_names|join:", " count counter=page_type_names|length %}
                 Only pages of type "{{ type }}" may be chosen for this field. Search results will exclude pages of other types.
-                {% plural %}
+            {% plural %}
                 Only the following page types may be chosen for this field: {{ type }}. Search results will exclude pages of other types.
             {% endblocktrans %}
         </p>
diff --git a/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html b/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html
index 3b53d6bafc..bc3855e171 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/confirm_external_to_internal.html
@@ -3,19 +3,19 @@
 {% include "wagtailadmin/shared/header.html" with title=convert_str %}
 
 <div class="nice-padding">
-        <p>
-            {% blocktrans %}
-                The URL you entered, <a target="_blank" rel="noreferrer noopener" href="{{ submitted_url }}">{{ submitted_url }}</a>,
-                looks like it matches the internal page {{ page }}, which has the URL
-                <a target="_blank" rel="noreferrer noopener" href="{{ internal_url }}">{{ internal_url }}</a>.
-            {% endblocktrans %}
-        </p>
-        <p>
-            {% blocktrans %}
-                Converting this to an internal link to {{ page }} would make the link more robust.
-                Would you like to do this?
-            {% endblocktrans %}
-        </p>
+    <p>
+        {% blocktrans %}
+            The URL you entered, <a target="_blank" rel="noreferrer noopener" href="{{ submitted_url }}">{{ submitted_url }}</a>,
+            looks like it matches the internal page {{ page }}, which has the URL
+            <a target="_blank" rel="noreferrer noopener" href="{{ internal_url }}">{{ internal_url }}</a>.
+        {% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans %}
+            Converting this to an internal link to {{ page }} would make the link more robust.
+            Would you like to do this?
+        {% endblocktrans %}
+    </p>
     <button type="button" data-action-confirm class="button button-primary">{% trans 'Convert to internal link' %}</button>
     <button type="button" data-action-deny class="button button-secondary">{% trans 'Use external link' %}</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html b/wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html
index 029aa745cd..2ad2fcc55b 100644
--- a/wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html
+++ b/wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html
@@ -3,16 +3,16 @@
 {% test_collection_is_public collection as is_public %}
 
 {% if not collection.is_root %}
-<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
-    {% trans "Privacy" %}
-    <button data-url="{% url 'wagtailadmin_collections:set_privacy' collection.id %}" class="status-tag primary  action-set-privacy">
-        {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
-        <span class="label-public icon icon-view" aria-label="{% trans 'Set collection privacy. Current status: Public' %}">
-            {% trans "Public" %}
-        </span>
-        <span class="label-private icon icon-no-view" aria-label="{% trans 'Set collection privacy. Current status: Private' %}">
-            {% trans "Private" %}
-        </span>
-    </button>
-</div>
+    <div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+        {% trans "Privacy" %}
+        <button data-url="{% url 'wagtailadmin_collections:set_privacy' collection.id %}" class="status-tag primary  action-set-privacy">
+            {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
+            <span class="label-public icon icon-view" aria-label="{% trans 'Set collection privacy. Current status: Public' %}">
+                {% trans "Public" %}
+            </span>
+            <span class="label-private icon icon-no-view" aria-label="{% trans 'Set collection privacy. Current status: Private' %}">
+                {% trans "Private" %}
+            </span>
+        </button>
+    </div>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html
index ead32db1a3..5f6fb093f7 100644
--- a/wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html
+++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/field_row_panel.html
@@ -1,7 +1,7 @@
 <ul class="field-row {{ self.classes|join:" " }}">
     {% for child in self.children %}
-       <li class="field-col {{ child.classes|join:" " }}">
-           {{ child.render_as_field }}
-       </li>
+        <li class="field-col {{ child.classes|join:" " }}">
+            {{ child.render_as_field }}
+        </li>
     {% endfor %}
 </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html
index 9860b4ef00..d288c5f4d4 100644
--- a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html
+++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.html
@@ -18,9 +18,9 @@
 </ul>
 
 <script type="text/django-form-template" id="id_{{ self.formset.prefix }}-EMPTY_FORM_TEMPLATE">
-{% escapescript %}
-{% include "wagtailadmin/edit_handlers/inline_panel_child.html" with child=self.empty_child %}
-{% endescapescript %}
+    {% escapescript %}
+        {% include "wagtailadmin/edit_handlers/inline_panel_child.html" with child=self.empty_child %}
+    {% endescapescript %}
 </script>
 
 <p class="add">
diff --git a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
index 69c1186a4f..b80829dbe9 100644
--- a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
+++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
@@ -1,13 +1,13 @@
 {% load i18n wagtailadmin_tags %}
 <li data-inline-panel-child id="inline_child_{{ child.form.prefix }}" data-contentpath-disabled>
     {% if child.form.non_field_errors %}
-    <ul>
-        {% for error in child.form.non_field_errors %}
-            <li class="error-message">
-                <span>{{ error|escape }}</span>
-            </li>
-        {% endfor %}
-    </ul>
+        <ul>
+            {% for error in child.form.non_field_errors %}
+                <li class="error-message">
+                    <span>{{ error|escape }}</span>
+                </li>
+            {% endfor %}
+        </ul>
     {% endif %}
     <ul class="controls">
         {% if can_order %}
diff --git a/wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html
index 448e590206..d8c5ca380c 100644
--- a/wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html
+++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/object_list.html
@@ -12,12 +12,12 @@
             {% endif %}
             <div class="object-layout">
                 {% if child.help_text %}
-                <div class="object-layout_small-part">
-                    <div class="object-help help">
-                        {% icon name="help" class_name="default" %}
-                        {{ child.help_text }}
+                    <div class="object-layout_small-part">
+                        <div class="object-help help">
+                            {% icon name="help" class_name="default" %}
+                            {{ child.help_text }}
+                        </div>
                     </div>
-                </div>
                 {% endif %}
                 <div class="object-layout_big-part">
                     {{ child.render_as_object }}
diff --git a/wagtail/admin/templates/wagtailadmin/home.html b/wagtail/admin/templates/wagtailadmin/home.html
index 952f50e1c2..8da60d7f46 100644
--- a/wagtail/admin/templates/wagtailadmin/home.html
+++ b/wagtail/admin/templates/wagtailadmin/home.html
@@ -34,7 +34,7 @@
 {% endblock %}
 
 {% block extra_js %}
-{{ block.super }}
-<script src="{% versioned_static 'wagtailadmin/js/collapsible.js' %}"></script>
-{{ media.js }}
+    {{ block.super }}
+    <script src="{% versioned_static 'wagtailadmin/js/collapsible.js' %}"></script>
+    {{ media.js }}
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/home/locked_pages.html b/wagtail/admin/templates/wagtailadmin/home/locked_pages.html
index 7bd760ef24..86974938d4 100644
--- a/wagtail/admin/templates/wagtailadmin/home/locked_pages.html
+++ b/wagtail/admin/templates/wagtailadmin/home/locked_pages.html
@@ -1,63 +1,63 @@
 {% load i18n wagtailadmin_tags %}
 {% if locked_pages %}
-<section class="object collapsible">
-    <h2 class="title-wrapper">{% trans "Your locked pages" %}</h2>
+    <section class="object collapsible">
+        <h2 class="title-wrapper">{% trans "Your locked pages" %}</h2>
 
-    <div class="object-layout">
-        <table class="listing listing-page">
-            <col />
-            <col width="30%"/>
-            <col width="15%"/>
+        <div class="object-layout">
+            <table class="listing listing-page">
+                <col />
+                <col width="30%"/>
+                <col width="15%"/>
 
-            <thead>
-                <tr>
-                    <th class="title">{% trans "Title" %}</th>
-                    <th></th>
-                    <th>{% trans "Locked at" %}</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for page in locked_pages %}
+                <thead>
                     <tr>
-                        <td class="title" valign="top">
-                            <div class="title-wrapper">
-                                <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
-
-                                {% i18n_enabled as show_locale_labels %}
-                                {% if show_locale_labels and page.locale_id %}
-                                    {% locale_label_from_id page.locale_id as locale_label %}
-                                    <span class="status-tag status-tag--label">{{ locale_label }}</span>
-                                {% endif %}
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                            </div>
-                            <ul class="actions">
-                                {% if can_remove_locks %}
-                                    <li><button data-locking-action="{% url 'wagtailadmin_pages:unlock' page.id %}" class="button button-small button-secondary">{% trans "Unlock" %}</button></li>
-                                {% endif %}
-                                <li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
-                                {% if page.has_unpublished_changes and page.is_previewable %}
-                                    <li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Draft' %}</a></li>
-                                {% endif %}
-                                {% if page.live %}
-                                    {% with page_url=page.url %}
-                                        {% if page_url is not None %}
-                                            <li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Live' %}</a></li>
-                                        {% endif %}
-                                    {% endwith %}
-                                {% endif %}
-                            </ul>
-                        </td>
-                        <td>{# Deliberately empty #}</td>
-                        <td valign="top"><div class="human-readable-date" title="{{ page.locked_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=page.locked_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div></td>
+                        <th class="title">{% trans "Title" %}</th>
+                        <th></th>
+                        <th>{% trans "Locked at" %}</th>
                     </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-</section>
-<script src="{% versioned_static 'wagtailadmin/js/lock-unlock-action.js' %}"></script>
-<script>
-    document.addEventListener('DOMContentLoaded', LockUnlockAction('{{ csrf_token|escapejs }}', '{% url 'wagtailadmin_home' %}'));
-</script>
+                </thead>
+                <tbody>
+                    {% for page in locked_pages %}
+                        <tr>
+                            <td class="title" valign="top">
+                                <div class="title-wrapper">
+                                    <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
+
+                                    {% i18n_enabled as show_locale_labels %}
+                                    {% if show_locale_labels and page.locale_id %}
+                                        {% locale_label_from_id page.locale_id as locale_label %}
+                                        <span class="status-tag status-tag--label">{{ locale_label }}</span>
+                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                                </div>
+                                <ul class="actions">
+                                    {% if can_remove_locks %}
+                                        <li><button data-locking-action="{% url 'wagtailadmin_pages:unlock' page.id %}" class="button button-small button-secondary">{% trans "Unlock" %}</button></li>
+                                    {% endif %}
+                                    <li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
+                                    {% if page.has_unpublished_changes and page.is_previewable %}
+                                        <li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Draft' %}</a></li>
+                                    {% endif %}
+                                    {% if page.live %}
+                                        {% with page_url=page.url %}
+                                            {% if page_url is not None %}
+                                                <li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Live' %}</a></li>
+                                            {% endif %}
+                                        {% endwith %}
+                                    {% endif %}
+                                </ul>
+                            </td>
+                            <td>{# Deliberately empty #}</td>
+                            <td valign="top"><div class="human-readable-date" title="{{ page.locked_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=page.locked_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div></td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </section>
+    <script src="{% versioned_static 'wagtailadmin/js/lock-unlock-action.js' %}"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', LockUnlockAction('{{ csrf_token|escapejs }}', '{% url 'wagtailadmin_home' %}'));
+    </script>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html
index e6544819e3..0f466defae 100644
--- a/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html
+++ b/wagtail/admin/templates/wagtailadmin/home/pages_for_moderation.html
@@ -1,80 +1,80 @@
 {% load i18n wagtailadmin_tags %}
 {% if page_revisions_for_moderation %}
-<section class="object collapsible">
-    <h2 class="title-wrapper">{% trans 'Pages awaiting moderation' %}</h2>
-    <div class="object-layout">
-        <table class="listing">
-            <col />
-            <col width="30%"/>
-            <col width="15%"/>
-            <col width="15%"/>
-            <thead>{# Note: the header is visually hidden behind .title-wrapper #}
-                <tr>
-                    <th class="title">{% trans "Title" %}</th>
-                    <th>{% trans "Parent" %}</th>
-                    <th>{% trans "Type" %}</th>
-                    <th>{% trans "Edited" %}</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for revision in page_revisions_for_moderation %}
-                    {% page_permissions revision.page as page_perms %}
+    <section class="object collapsible">
+        <h2 class="title-wrapper">{% trans 'Pages awaiting moderation' %}</h2>
+        <div class="object-layout">
+            <table class="listing">
+                <col />
+                <col width="30%"/>
+                <col width="15%"/>
+                <col width="15%"/>
+                <thead>{# Note: the header is visually hidden behind .title-wrapper #}
                     <tr>
-                        <td class="title" valign="top">
-                            <div class="title-wrapper">
-                                {% if page_perms.can_edit %}
-                                    <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
-                                {% elif revision.page.is_previewable %}
-                                    <a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" title="{% trans 'Preview this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
-                                {% else %}
-                                    {{ revision.page.specific_deferred.get_admin_display_title }}
-                                {% endif %}
-
-                                {% i18n_enabled as show_locale_labels %}
-                                {% if show_locale_labels and revision.page.locale_id %}
-                                    {% locale_label_from_id revision.page.locale_id as locale_label %}
-                                    <span class="status-tag status-tag--label">{{ locale_label }}</span>
-                                {% endif %}
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
-                            </div>
-                            <ul class="actions">
-                                <li>
-                                     <form action="{% url 'wagtailadmin_pages:approve_moderation' revision.id %}" method="POST">
-                                        {% csrf_token %}
-                                        <input type="submit" class="button button-small button-secondary" value="{% trans 'Approve' %}">
-                                    </form>
-                                </li>
-                                <li class="no-border">
-                                    <form action="{% url 'wagtailadmin_pages:reject_moderation' revision.id %}" method="POST">
-                                        {% csrf_token %}
-                                        <input type="submit" class="button button-small button-secondary no" value="{% trans 'Reject' %}">
-                                    </form>
-                                </li>
-                                {% if page_perms.can_edit %}
-                                    <li><a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
-                                {% endif %}
-                                {% if revision.page.is_previewable %}
-                                    <li><a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Preview' %}</a></li>
-                                {% endif %}
-                            </ul>
-                        </td>
-                        <td valign="top">
-                            <a href="{% url 'wagtailadmin_explore' revision.page.get_parent.id %}">{{ revision.page.get_parent.specific_deferred.get_admin_display_title }}</a>
-                        </td>
-                        <td class="type" valign="top">
-                            {{ revision.page.content_type.model_class.get_verbose_name }}
-                        </td>
-                        <td valign="top">
-                            <div class="human-readable-date" title="{{ revision.created_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %} </div>
-                            {% if revision.user %}
-                                by {{ revision.user|user_display_name }}
-                            {% endif %}
-                        </td>
+                        <th class="title">{% trans "Title" %}</th>
+                        <th>{% trans "Parent" %}</th>
+                        <th>{% trans "Type" %}</th>
+                        <th>{% trans "Edited" %}</th>
                     </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-</section>
+                </thead>
+                <tbody>
+                    {% for revision in page_revisions_for_moderation %}
+                        {% page_permissions revision.page as page_perms %}
+                        <tr>
+                            <td class="title" valign="top">
+                                <div class="title-wrapper">
+                                    {% if page_perms.can_edit %}
+                                        <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
+                                    {% elif revision.page.is_previewable %}
+                                        <a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" title="{% trans 'Preview this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
+                                    {% else %}
+                                        {{ revision.page.specific_deferred.get_admin_display_title }}
+                                    {% endif %}
+
+                                    {% i18n_enabled as show_locale_labels %}
+                                    {% if show_locale_labels and revision.page.locale_id %}
+                                        {% locale_label_from_id revision.page.locale_id as locale_label %}
+                                        <span class="status-tag status-tag--label">{{ locale_label }}</span>
+                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
+                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
+                                </div>
+                                <ul class="actions">
+                                    <li>
+                                        <form action="{% url 'wagtailadmin_pages:approve_moderation' revision.id %}" method="POST">
+                                            {% csrf_token %}
+                                            <input type="submit" class="button button-small button-secondary" value="{% trans 'Approve' %}">
+                                        </form>
+                                    </li>
+                                    <li class="no-border">
+                                        <form action="{% url 'wagtailadmin_pages:reject_moderation' revision.id %}" method="POST">
+                                            {% csrf_token %}
+                                            <input type="submit" class="button button-small button-secondary no" value="{% trans 'Reject' %}">
+                                        </form>
+                                    </li>
+                                    {% if page_perms.can_edit %}
+                                        <li><a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
+                                    {% endif %}
+                                    {% if revision.page.is_previewable %}
+                                        <li><a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Preview' %}</a></li>
+                                    {% endif %}
+                                </ul>
+                            </td>
+                            <td valign="top">
+                                <a href="{% url 'wagtailadmin_explore' revision.page.get_parent.id %}">{{ revision.page.get_parent.specific_deferred.get_admin_display_title }}</a>
+                            </td>
+                            <td class="type" valign="top">
+                                {{ revision.page.content_type.model_class.get_verbose_name }}
+                            </td>
+                            <td valign="top">
+                                <div class="human-readable-date" title="{{ revision.created_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %} </div>
+                                {% if revision.user %}
+                                    by {{ revision.user|user_display_name }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </section>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/home/recent_edits.html b/wagtail/admin/templates/wagtailadmin/home/recent_edits.html
index f5528cd195..507475548f 100644
--- a/wagtail/admin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/admin/templates/wagtailadmin/home/recent_edits.html
@@ -1,56 +1,56 @@
 {% load i18n wagtailadmin_tags %}
 {% if last_edits %}
-<section class="object collapsible">
-    <h2 class="title-wrapper">{% trans "Your most recent edits" %}</h2>
-    <div class="object-layout">
-        <table class="listing listing-page">
-            <col />
-            <col width="30%"/>
-            <col width="15%"/>
-            <thead>{# Note: the header is visually hidden behind .title-wrapper #}
-                <tr>
-                    <th class="title">{% trans "Title" %}</th>
-                    <th>{% trans "Status" %}</th>
-                    <th>{% trans "Date" %}</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for revision, page in last_edits %}
+    <section class="object collapsible">
+        <h2 class="title-wrapper">{% trans "Your most recent edits" %}</h2>
+        <div class="object-layout">
+            <table class="listing listing-page">
+                <col />
+                <col width="30%"/>
+                <col width="15%"/>
+                <thead>{# Note: the header is visually hidden behind .title-wrapper #}
                     <tr>
-                        <td class="title" valign="top">
-                            <div class="title-wrapper">
-                                <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
-
-                                {% i18n_enabled as show_locale_labels %}
-                                {% if show_locale_labels and page.locale_id %}
-                                    {% locale_label_from_id page.locale_id as locale_label %}
-                                    <span class="status-tag status-tag--label">{{ locale_label }}</span>
-                                {% endif %}
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                            </div>
-                            <ul class="actions">
-                                <li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
-                                {% if page.has_unpublished_changes and page.is_previewable %}
-                                    <li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Draft' %}</a></li>
-                                {% endif %}
-                                {% if page.live %}
-                                    {% with page_url=page.url %}
-                                        {% if page_url is not None %}
-                                            <li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Live' %}</a></li>
-                                        {% endif %}
-                                    {% endwith %}
-                                {% endif %}
-                            </ul>
-                        </td>
-                        <td valign="top">
-                            {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
-                        </td>
-                        <td valign="top"><div class="human-readable-date" title="{{ revision.created_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div></td>
+                        <th class="title">{% trans "Title" %}</th>
+                        <th>{% trans "Status" %}</th>
+                        <th>{% trans "Date" %}</th>
                     </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-</section>
+                </thead>
+                <tbody>
+                    {% for revision, page in last_edits %}
+                        <tr>
+                            <td class="title" valign="top">
+                                <div class="title-wrapper">
+                                    <a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.get_admin_display_title }}</a>
+
+                                    {% i18n_enabled as show_locale_labels %}
+                                    {% if show_locale_labels and page.locale_id %}
+                                        {% locale_label_from_id page.locale_id as locale_label %}
+                                        <span class="status-tag status-tag--label">{{ locale_label }}</span>
+                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                                </div>
+                                <ul class="actions">
+                                    <li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
+                                    {% if page.has_unpublished_changes and page.is_previewable %}
+                                        <li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Draft' %}</a></li>
+                                    {% endif %}
+                                    {% if page.live %}
+                                        {% with page_url=page.url %}
+                                            {% if page_url is not None %}
+                                                <li><a href="{{ page_url }}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Live' %}</a></li>
+                                            {% endif %}
+                                        {% endwith %}
+                                    {% endif %}
+                                </ul>
+                            </td>
+                            <td valign="top">
+                                {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
+                            </td>
+                            <td valign="top"><div class="human-readable-date" title="{{ revision.created_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=revision.created_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div></td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </section>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html b/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html
index 8a60287257..3ba2912848 100644
--- a/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html
+++ b/wagtail/admin/templates/wagtailadmin/home/user_pages_in_workflow_moderation.html
@@ -1,58 +1,58 @@
 {% load i18n wagtailadmin_tags %}
 {% if workflow_states %}
-<section class="object collapsible">
-    <h2 class="title-wrapper">{% trans 'Your pages in a workflow' %}</h2>
-    <div class="object-layout">
-        <table class="listing">
-        <col />
-        <col width="30%"/>
-        <col width="15%"/>
-        <thead>{# Note: the header is visually hidden behind .title-wrapper #}
-            <tr>
-                <th class="title">{% trans "Title" %}</th>
-                <th>{% trans "Task" %}</th>
-                <th>{% trans "Task started" %}</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for workflow_state in workflow_states %}
-                {% with workflow_state.current_task_state.page_revision as revision %}
-                {% page_permissions workflow_state.page as page_perms %}
-                <tr>
-                    <td class="title" valign="top">
-                        <div class="title-wrapper">
-                            {% if page_perms.can_edit %}
-                                <a href="{% url 'wagtailadmin_pages:edit' workflow_state.page.id %}" title="{% trans 'Edit this page' %}">{{ workflow_state.page.specific_deferred.get_admin_display_title }}</a>
-                            {% else %}
-                                {{ workflow_state.page.specific_deferred.get_admin_display_title }}
-                            {% endif %}
+    <section class="object collapsible">
+        <h2 class="title-wrapper">{% trans 'Your pages in a workflow' %}</h2>
+        <div class="object-layout">
+            <table class="listing">
+                <col />
+                <col width="30%"/>
+                <col width="15%"/>
+                <thead>{# Note: the header is visually hidden behind .title-wrapper #}
+                    <tr>
+                        <th class="title">{% trans "Title" %}</th>
+                        <th>{% trans "Task" %}</th>
+                        <th>{% trans "Task started" %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for workflow_state in workflow_states %}
+                        {% with workflow_state.current_task_state.page_revision as revision %}
+                            {% page_permissions workflow_state.page as page_perms %}
+                            <tr>
+                                <td class="title" valign="top">
+                                    <div class="title-wrapper">
+                                        {% if page_perms.can_edit %}
+                                            <a href="{% url 'wagtailadmin_pages:edit' workflow_state.page.id %}" title="{% trans 'Edit this page' %}">{{ workflow_state.page.specific_deferred.get_admin_display_title }}</a>
+                                        {% else %}
+                                            {{ workflow_state.page.specific_deferred.get_admin_display_title }}
+                                        {% endif %}
 
-                            {% i18n_enabled as show_locale_labels %}
-                            {% if show_locale_labels and workflow_state.page.locale_id %}
-                                {% locale_label_from_id workflow_state.page.locale_id as locale_label %}
-                                <span class="status-tag status-tag--label">{{ locale_label }}</span>
-                            {% endif %}
-                            {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=workflow_state.page %}
-                            {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=workflow_state.page %}
-                        </div>
-                    </td>
-                    <td class="task" valign="top">
-                        {% if workflow_state.current_task_state.status == 'rejected' %}
-                            {% icon name="warning" class_name="default" %}
-                            {% trans "Changes requested at" %}
-                        {% elif workflow_state.current_task_state.status == 'in_progress' %}
-                            {% trans "Awaiting" %}
-                        {% endif %}
-                        {{ workflow_state.current_task_state.task.name }}
-                    </td>
-                    <td valign="top">
-                        <div class="human-readable-date" title="{{ workflow_state.current_task_state.started_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=workflow_state.current_task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %} </div>
-                    </td>
-                </tr>
-                {% endwith %}
-            {% endfor %}
-        </tbody>
-    </table>
-    </div>
-</section>
+                                        {% i18n_enabled as show_locale_labels %}
+                                        {% if show_locale_labels and workflow_state.page.locale_id %}
+                                            {% locale_label_from_id workflow_state.page.locale_id as locale_label %}
+                                            <span class="status-tag status-tag--label">{{ locale_label }}</span>
+                                        {% endif %}
+                                        {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=workflow_state.page %}
+                                        {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=workflow_state.page %}
+                                    </div>
+                                </td>
+                                <td class="task" valign="top">
+                                    {% if workflow_state.current_task_state.status == 'rejected' %}
+                                        {% icon name="warning" class_name="default" %}
+                                        {% trans "Changes requested at" %}
+                                    {% elif workflow_state.current_task_state.status == 'in_progress' %}
+                                        {% trans "Awaiting" %}
+                                    {% endif %}
+                                    {{ workflow_state.current_task_state.task.name }}
+                                </td>
+                                <td valign="top">
+                                    <div class="human-readable-date" title="{{ workflow_state.current_task_state.started_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=workflow_state.current_task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %} </div>
+                                </td>
+                            </tr>
+                        {% endwith %}
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </section>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html b/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html
index 06ca65c098..ecc9ad99c7 100644
--- a/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html
+++ b/wagtail/admin/templates/wagtailadmin/home/workflow_pages_to_moderate.html
@@ -1,7 +1,7 @@
 {% load i18n wagtailadmin_tags %}
 {% if states %}
-<section class="object collapsible">
-    <h2 class="title-wrapper">{% trans 'Awaiting your review' %}</h2>
+    <section class="object collapsible">
+        <h2 class="title-wrapper">{% trans 'Awaiting your review' %}</h2>
         <div class="object-layout">
             <table class="listing">
                 <col />
@@ -19,70 +19,70 @@
                 <tbody>
                     {% for task_state, actions, workflow_tasks in states %}
                         {% with task_state.page_revision as revision %}
-                        {% page_permissions revision.page as page_perms %}
-                        <tr>
-                            <td class="title" valign="top">
-                                <div class="title-wrapper">
-                                    {% if page_perms.can_edit %}
-                                        <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
-                                    {% else %}
-                                        {{ revision.page.specific_deferred.get_admin_display_title }}
-                                    {% endif %}
-
-                                    {% i18n_enabled as show_locale_labels %}
-                                    {% if show_locale_labels and revision.page.locale_id %}
-                                        {% locale_label_from_id revision.page.locale_id as locale_label %}
-                                        <span class="status-tag status-tag--label">{{ locale_label }}</span>
-                                    {% endif %}
-                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
-                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
-                                </div>
-                                {% if actions %}
-                                    <ul class="actions">
-                                        {% for action_name, action_label, modal in actions %}
-                                            <li>
-                                                <button class="button button-small button-secondary" data-workflow-action-url="{% url 'wagtailadmin_pages:workflow_action' revision.page.id action_name task_state.id %}" {% if modal %}data-launch-modal{% endif %}>{{ action_label }}</button>
-                                            </li>
-                                        {% endfor %}
+                            {% page_permissions revision.page as page_perms %}
+                            <tr>
+                                <td class="title" valign="top">
+                                    <div class="title-wrapper">
                                         {% if page_perms.can_edit %}
-                                            <li>
-                                                <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a>
-                                            </li>
-                                        {% endif %}
-                                        {% if revision.page.is_previewable %}
-                                            <li>
-                                                <a href="{% url 'wagtailadmin_pages:workflow_preview' revision.page.id task_state.task.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Preview' %}</a>
-                                            </li>
-                                        {% endif %}
-                                    </ul>
-                                {% endif %}
-                            </td>
-                            <td class="tasks" valign="top">
-                                {% for task in workflow_tasks %}
-                                    <span data-wagtail-tooltip="{{ task.name }}: {{ task.status_display }}">
-                                        {% if task.status == 'approved' %}
-                                            {% icon "success" title=task.status_display class_name="default" %}
-                                        {% elif task.status == 'rejected' %}
-                                            {% icon "error" title=task.status_display class_name="default" %}
+                                            <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.specific_deferred.get_admin_display_title }}</a>
                                         {% else %}
-                                            {% icon "radio-empty" title=status_display class_name="default" %}
+                                            {{ revision.page.specific_deferred.get_admin_display_title }}
                                         {% endif %}
-                                    </span>
-                                {% endfor %}
-                            </td>
-                            <td valign="top">
-                                {% if revision.user %}{{ revision.user|user_display_name }}{% endif %}
-                            </td>
-                            <td valign="top">
-                                <div class="human-readable-date" title="{{ task_state.started_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div>
-                            </td>
-                        </tr>
+
+                                        {% i18n_enabled as show_locale_labels %}
+                                        {% if show_locale_labels and revision.page.locale_id %}
+                                            {% locale_label_from_id revision.page.locale_id as locale_label %}
+                                            <span class="status-tag status-tag--label">{{ locale_label }}</span>
+                                        {% endif %}
+                                        {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
+                                        {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
+                                    </div>
+                                    {% if actions %}
+                                        <ul class="actions">
+                                            {% for action_name, action_label, modal in actions %}
+                                                <li>
+                                                    <button class="button button-small button-secondary" data-workflow-action-url="{% url 'wagtailadmin_pages:workflow_action' revision.page.id action_name task_state.id %}" {% if modal %}data-launch-modal{% endif %}>{{ action_label }}</button>
+                                                </li>
+                                            {% endfor %}
+                                            {% if page_perms.can_edit %}
+                                                <li>
+                                                    <a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a>
+                                                </li>
+                                            {% endif %}
+                                            {% if revision.page.is_previewable %}
+                                                <li>
+                                                    <a href="{% url 'wagtailadmin_pages:workflow_preview' revision.page.id task_state.task.id %}" class="button button-small button-secondary" target="_blank" rel="noopener noreferrer">{% trans 'Preview' %}</a>
+                                                </li>
+                                            {% endif %}
+                                        </ul>
+                                    {% endif %}
+                                </td>
+                                <td class="tasks" valign="top">
+                                    {% for task in workflow_tasks %}
+                                        <span data-wagtail-tooltip="{{ task.name }}: {{ task.status_display }}">
+                                            {% if task.status == 'approved' %}
+                                                {% icon "success" title=task.status_display class_name="default" %}
+                                            {% elif task.status == 'rejected' %}
+                                                {% icon "error" title=task.status_display class_name="default" %}
+                                            {% else %}
+                                                {% icon "radio-empty" title=status_display class_name="default" %}
+                                            {% endif %}
+                                        </span>
+                                    {% endfor %}
+                                </td>
+                                <td valign="top">
+                                    {% if revision.user %}{{ revision.user|user_display_name }}{% endif %}
+                                </td>
+                                <td valign="top">
+                                    <div class="human-readable-date" title="{{ task_state.started_at|date:"DATETIME_FORMAT" }}">{% blocktrans with time_period=task_state.started_at|timesince_simple %}{{ time_period }}{% endblocktrans %}</div>
+                                </td>
+                            </tr>
                         {% endwith %}
                     {% endfor %}
                 </tbody>
             </table>
         </div>
-</section>
+    </section>
 
     <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/workflow-action.js' %}"></script>
diff --git a/wagtail/admin/templates/wagtailadmin/login.html b/wagtail/admin/templates/wagtailadmin/login.html
index 2b11bf1ca8..633334615d 100644
--- a/wagtail/admin/templates/wagtailadmin/login.html
+++ b/wagtail/admin/templates/wagtailadmin/login.html
@@ -28,65 +28,65 @@
 
         <form action="{% url 'wagtailadmin_login' %}" method="post" autocomplete="off" novalidate>
             {% block login_form %}
-            {% csrf_token %}
+                {% csrf_token %}
 
-            {% url 'wagtailadmin_home' as home_url %}
-            <input type="hidden" name="next" value="{{ next|default:home_url }}" />
+                {% url 'wagtailadmin_home' as home_url %}
+                <input type="hidden" name="next" value="{{ next|default:home_url }}" />
 
-            <h1>{% block branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
+                <h1>{% block branding_login %}{% trans "Sign in to Wagtail" %}{% endblock %}</h1>
 
-            <div class="fields-wrapper">
-                <ul class="fields">
-                    {% block fields %}
-                    <li class="full">
-                        <div class="field iconfield">
-                            {{ form.username.label_tag }}
-                            <div class="input icon-user">
-                                {{ form.username }}
-                            </div>
-                        </div>
-                    </li>
-                    <li class="full">
-                        <div class="field iconfield">
-                            {{ form.password.label_tag }}
-                            <div class="input icon-password">
-                                {{ form.password }}
-                            </div>
-                        </div>
-                    </li>
+                <div class="fields-wrapper">
+                    <ul class="fields">
+                        {% block fields %}
+                            <li class="full">
+                                <div class="field iconfield">
+                                    {{ form.username.label_tag }}
+                                    <div class="input icon-user">
+                                        {{ form.username }}
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="full">
+                                <div class="field iconfield">
+                                    {{ form.password.label_tag }}
+                                    <div class="input icon-password">
+                                        {{ form.password }}
+                                    </div>
+                                </div>
+                            </li>
 
-                    {% block extra_fields %}
-                    {% for field_name, field in form.extra_fields %}
-                    <li class="full">
-                        {{ field.label_tag }}
-                        <div class="field iconfield">
-                            {{ field }}
-                        </div>
-                    </li>
-                    {% endfor %}
-                    {% endblock extra_fields %}
+                            {% block extra_fields %}
+                                {% for field_name, field in form.extra_fields %}
+                                    <li class="full">
+                                        {{ field.label_tag }}
+                                        <div class="field iconfield">
+                                            {{ field }}
+                                        </div>
+                                    </li>
+                                {% endfor %}
+                            {% endblock extra_fields %}
 
-                    <li class="checkbox">
-                        <div class="field">
-                            <label><input name="remember" type="checkbox" />{% trans "Remember me" %}</label>
-                        </div>
-                    </li>
-                    {% endblock %}
-
-                    <li class="submit">
-                        {% block submit_buttons %}
-                        <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Signing in…' %}">{% icon name="spinner" %}<em>{% trans 'Sign in' %}</em></button>
+                            <li class="checkbox">
+                                <div class="field">
+                                    <label><input name="remember" type="checkbox" />{% trans "Remember me" %}</label>
+                                </div>
+                            </li>
                         {% endblock %}
-                    </li>
-                </ul>
 
-                {% if show_password_reset %}
-                    <p class="help">
-                        <a class="help__link" href="{% url 'wagtailadmin_password_reset' %}" aria-label="{% trans 'Reset your password' %}">{% trans "Forgotten password?" %}</a>
-                    </p>
-                {% endif %}
-            </div>
-        {% endblock %}
+                        <li class="submit">
+                            {% block submit_buttons %}
+                                <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Signing in…' %}">{% icon name="spinner" %}<em>{% trans 'Sign in' %}</em></button>
+                            {% endblock %}
+                        </li>
+                    </ul>
+
+                    {% if show_password_reset %}
+                        <p class="help">
+                            <a class="help__link" href="{% url 'wagtailadmin_password_reset' %}" aria-label="{% trans 'Reset your password' %}">{% trans "Forgotten password?" %}</a>
+                        </p>
+                    {% endif %}
+                </div>
+            {% endblock %}
         </form>
 
         {% block below_login %}{% endblock %}
@@ -95,10 +95,10 @@
 {% endblock %}
 
 {% block extra_js %}
-{{ block.super }}
-<script>
-    $(function(){
-        $('form input[name=username]').trigger('focus');
-    })
-</script>
+    {{ block.super }}
+    <script>
+        $(function(){
+            $('form input[name=username]').trigger('focus');
+        })
+    </script>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/notifications/base.html b/wagtail/admin/templates/wagtailadmin/notifications/base.html
index 9e994f55ed..19c6510d35 100644
--- a/wagtail/admin/templates/wagtailadmin/notifications/base.html
+++ b/wagtail/admin/templates/wagtailadmin/notifications/base.html
@@ -1,136 +1,136 @@
 {% load i18n wagtailadmin_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title></title>
-<style>
-{% block styles_content %}
-body {
-	min-width:100%;
-	-webkit-text-size-adjust: none;
-	padding: 0;
-	margin: 0;
-}
-.ReadMsgBody {
-	width: 100%;
-}
-.ExternalClass {
-	width: 100%;
-}
-table {
-	border-collapse:collapse;
-	mso-table-lspace:0pt;
-	mso-table-rspace:0pt;
-}
-table td {
-	border-collapse:collapse;
-}
-td.date a:link {
-	color:#6b6b6b;
-	text-decoration:none;
-}
-@media only screen and (max-width: 568px) {
-body[yahoo] .mobile {
-	width:320px !important;
-}
-body[yahoo] .spacer {
-	width:10px !important;
-}
-body[yahoo] .spacer_height {
-	height:10px !important;
-}
-body[yahoo] .content {
-	width:300px !important;
-}
-body[yahoo] .col-3{
-  float: none !important;
-	width: 100% !important;
-}
-body[yahoo] .force-col {
-	display: block;
-	padding-right: 0 !important;
-	padding-left: 0 !important;
-	padding-bottom: 12px !important;
-}
-body[yahoo] .force-col-last {
-	display: block;
-	padding-right: 0 !important;
-	padding-bottom: 0 !important;
-}
-body[yahoo] .center {
-	text-align:center;
-}
-body[yahoo] .show {
-	display: block !important;
-}
-body[yahoo] .hide {
-	display: none !important;
-}
-body[yahoo] .img {
-	width: 130px !important;
-	float:left;
-}
-body[yahoo] .img img {
-	width:100% !important;
-}
-body[yahoo] .text {
-	width: 150px !important;
-	float:right;
-}
-{% endblock %}
-</style>
-</head>
-<body style="background-color:#E6E6E6;padding:0px;margin:0px;" yahoo="fix" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title></title>
+        <style>
+            {% block styles_content %}
+                body {
+                    min-width:100%;
+                    -webkit-text-size-adjust: none;
+                    padding: 0;
+                    margin: 0;
+                }
+                .ReadMsgBody {
+                    width: 100%;
+                }
+                .ExternalClass {
+                    width: 100%;
+                }
+                table {
+                    border-collapse:collapse;
+                    mso-table-lspace:0pt;
+                    mso-table-rspace:0pt;
+                }
+                table td {
+                    border-collapse:collapse;
+                }
+                td.date a:link {
+                    color:#6b6b6b;
+                    text-decoration:none;
+                }
+                @media only screen and (max-width: 568px) {
+                    body[yahoo] .mobile {
+                        width:320px !important;
+                    }
+                    body[yahoo] .spacer {
+                        width:10px !important;
+                    }
+                    body[yahoo] .spacer_height {
+                        height:10px !important;
+                    }
+                    body[yahoo] .content {
+                        width:300px !important;
+                    }
+                    body[yahoo] .col-3{
+                        float: none !important;
+                        width: 100% !important;
+                    }
+                    body[yahoo] .force-col {
+                        display: block;
+                        padding-right: 0 !important;
+                        padding-left: 0 !important;
+                        padding-bottom: 12px !important;
+                    }
+                    body[yahoo] .force-col-last {
+                        display: block;
+                        padding-right: 0 !important;
+                        padding-bottom: 0 !important;
+                    }
+                    body[yahoo] .center {
+                        text-align:center;
+                    }
+                    body[yahoo] .show {
+                        display: block !important;
+                    }
+                    body[yahoo] .hide {
+                        display: none !important;
+                    }
+                    body[yahoo] .img {
+                        width: 130px !important;
+                        float:left;
+                    }
+                    body[yahoo] .img img {
+                        width:100% !important;
+                    }
+                    body[yahoo] .text {
+                        width: 150px !important;
+                        float:right;
+                    }
+            {% endblock %}
+        </style>
+    </head>
+    <body style="background-color:#E6E6E6;padding:0px;margin:0px;" yahoo="fix" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 
-<table width="600" border="0" align="center" class="mobile" cellspacing="0" cellpadding="0">
-  <tr>
-    <td>
-      {% block branding_logo %}<img width="100%" border="0" style="display: block;" alt="" src="{% notification_static 'wagtailadmin/images/email-header.jpg' %}" />{% endblock %}
-    </td>
-  </tr>
-</table>
-<table width="600" border="0" align="center" class="mobile" cellspacing="0" cellpadding="0">
-  <tr>
-    <td style="background:#FAFAFA;"><table width="600" border="0" align="center" cellspacing="0" cellpadding="0" class="mobile">
-      <tr>
-        <td height="30" class="spacer_height">&nbsp;</td>
-      </tr>
-    </table>
-      <table width="600" border="0" align="center" cellpadding="0" cellspacing="0" class="mobile">
-        <tr>
-          <td width="30" class="spacer">&nbsp;</td>
-          <td><table width="100%" border="0" cellspacing="0" cellpadding="0" align="left" class="content">
+        <table width="600" border="0" align="center" class="mobile" cellspacing="0" cellpadding="0">
             <tr>
-              <td style="font-family:Arial, Helvetica, sans-serif; font-size:12px; color: #000000; line-height: 18px;">
-                {% block title %}
-                <div style="font-size:18px; line-height:24px; color: #43B1B0; font-weight:bold; display:inline-block; width: 100%; margin-bottom:10px;">{% block title_content %}{% endblock %}</div>
-                {% endblock %}
-
-                {% block greeting %}
-                <p>{% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}</p>
-                {% endblock %}
-
-                {% block content %}
-                {% endblock %}
-
-                <div style="font-size: 10px; margin-top: 20px;">
-                  {% block preferences %}
-                    {% trans "Edit your notification preferences here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_account' %}#notifications">{{ settings.BASE_URL }}{% url 'wagtailadmin_account' %}#notifications</a>
-                  {% endblock %}
-                </div>
-              </td>
+                <td>
+                    {% block branding_logo %}<img width="100%" border="0" style="display: block;" alt="" src="{% notification_static 'wagtailadmin/images/email-header.jpg' %}" />{% endblock %}
+                </td>
             </tr>
-          </table></td>
-          <td width="30" class="spacer">&nbsp;</td>
-        </tr>
-      </table>
-      <table width="600" border="0" align="center" cellspacing="0" cellpadding="0" class="mobile">
-        <tr>
-          <td height="30" class="spacer_height">&nbsp;</td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
+        </table>
+        <table width="600" border="0" align="center" class="mobile" cellspacing="0" cellpadding="0">
+            <tr>
+                <td style="background:#FAFAFA;"><table width="600" border="0" align="center" cellspacing="0" cellpadding="0" class="mobile">
+                    <tr>
+                        <td height="30" class="spacer_height">&nbsp;</td>
+                    </tr>
+                </table>
+                    <table width="600" border="0" align="center" cellpadding="0" cellspacing="0" class="mobile">
+                        <tr>
+                            <td width="30" class="spacer">&nbsp;</td>
+                            <td><table width="100%" border="0" cellspacing="0" cellpadding="0" align="left" class="content">
+                                <tr>
+                                    <td style="font-family:Arial, Helvetica, sans-serif; font-size:12px; color: #000000; line-height: 18px;">
+                                        {% block title %}
+                                            <div style="font-size:18px; line-height:24px; color: #43B1B0; font-weight:bold; display:inline-block; width: 100%; margin-bottom:10px;">{% block title_content %}{% endblock %}</div>
+                                        {% endblock %}
+
+                                        {% block greeting %}
+                                            <p>{% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}</p>
+                                        {% endblock %}
+
+                                        {% block content %}
+                                        {% endblock %}
+
+                                        <div style="font-size: 10px; margin-top: 20px;">
+                                            {% block preferences %}
+                                                {% trans "Edit your notification preferences here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_account' %}#notifications">{{ settings.BASE_URL }}{% url 'wagtailadmin_account' %}#notifications</a>
+                                            {% endblock %}
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table></td>
+                            <td width="30" class="spacer">&nbsp;</td>
+                        </tr>
+                    </table>
+                    <table width="600" border="0" align="center" cellspacing="0" cellpadding="0" class="mobile">
+                        <tr>
+                            <td height="30" class="spacer_height">&nbsp;</td>
+                        </tr>
+                    </table></td>
+            </tr>
+        </table>
+    </body>
 </html>
diff --git a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html
index 40e0107f84..ed771d4e53 100644
--- a/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html
+++ b/wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html
@@ -37,20 +37,20 @@
     {% endif %}
 
     {% if replied_comments %}
-    <h3>{% trans "New replies" %}</h3>
+        <h3>{% trans "New replies" %}</h3>
 
-    <ul>
-        {% for thread in replied_comments %}
-            <li>{% trans 'New replies to:' %} {{ thread.comment.text }}
-                <ul>
-                    {% for reply in thread.replies %}
-                        <li>{{ reply.text }}</li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+        <ul>
+            {% for thread in replied_comments %}
+                <li>{% trans 'New replies to:' %} {{ thread.comment.text }}
+                    <ul>
+                        {% for reply in thread.replies %}
+                            <li>{{ reply.text }}</li>
+                        {% endfor %}
+                    </ul>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 
     <p>{% trans "You can edit the page here:"%} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}</a></p>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html b/wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html
index 26be8a69b7..c73ce42659 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_privacy_switch.html
@@ -6,28 +6,28 @@
 {% endif %}
 
 {% if not page.is_root %}
-<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
-    {% trans "Privacy" %}
-    {% if page_perms.can_set_view_restrictions %}
-        <button data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="status-tag primary action-set-privacy">
-            {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
-            <span class="label-public icon icon-view" aria-label="{% trans 'Set page privacy. Current status: Public' %}">
-                {% trans "Public" %}
-            </span>
-            <span class="label-private icon icon-no-view" aria-label="{% trans 'Set page privacy. Current status: Private' %}">
-                {% trans "Private" %}
-            </span>
-        </button>
-    {% else %}
-        {% if is_public %}
-            <span class="label-public status-tag primary icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
-                {% trans "Public" %}
-            </span>
+    <div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+        {% trans "Privacy" %}
+        {% if page_perms.can_set_view_restrictions %}
+            <button data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="status-tag primary action-set-privacy">
+                {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
+                <span class="label-public icon icon-view" aria-label="{% trans 'Set page privacy. Current status: Public' %}">
+                    {% trans "Public" %}
+                </span>
+                <span class="label-private icon icon-no-view" aria-label="{% trans 'Set page privacy. Current status: Private' %}">
+                    {% trans "Private" %}
+                </span>
+            </button>
         {% else %}
-            <span class="label-private status-tag primary icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
-                {% trans "Private" %}
-            </span>
+            {% if is_public %}
+                <span class="label-public status-tag primary icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
+                    {% trans "Public" %}
+                </span>
+            {% else %}
+                <span class="label-private status-tag primary icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
+                    {% trans "Private" %}
+                </span>
+            {% endif %}
         {% endif %}
-    {% endif %}
-</div>
+    </div>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html
index 2d9fd820c1..7d07200a63 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/menu.html
@@ -7,7 +7,7 @@
     <ul>
         {% for item in rendered_menu_items %}
             <li>
-                 {{ item }}
+                {{ item }}
             </li>
         {% endfor %}
     </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html
index 379917f622..d6ad06601e 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_delete.html
@@ -9,40 +9,40 @@
 {% endblock header %}
 
 {% block items_with_access %}
-        {% if items %}
+    {% if items %}
         <p>{% trans "Are you sure you want to delete these pages?" %}</p>
         <ul>
             {% for page in items %}
-            <li>
-                <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
-                {% if page.descendant_count %}
-                <p>
-                    {% blocktrans count counter=page.descendant_count %}
-                    This will also delete one more subpage.
-                    {% plural %}
-                    This will also delete {{ counter }} more subpages.
-                    {% endblocktrans %}
-                </p>
-                {% endif %}
-            </li>
+                <li>
+                    <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
+                    {% if page.descendant_count %}
+                        <p>
+                            {% blocktrans count counter=page.descendant_count %}
+                                This will also delete one more subpage.
+                            {% plural %}
+                                This will also delete {{ counter }} more subpages.
+                            {% endblocktrans %}
+                        </p>
+                    {% endif %}
+                </li>
             {% endfor %}
         </ul>
-        {% endif %}
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this page{% plural %}You don't have permission to delete these pages{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this page{% plural %}You don't have permission to delete these pages{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, delete' as action_button_text %}
-    {% trans "No, don't delete" as no_action_button_text %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/form.html' with action_button_class="serious" %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
+    {% if items %}
+        {% trans 'Yes, delete' as action_button_text %}
+        {% trans "No, don't delete" as no_action_button_text %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/form.html' with action_button_class="serious" %}
+    {% else %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
+    {% endif %}
 {% endblock form_section %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html
index f99e853d31..e86e49cd73 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_move.html
@@ -10,51 +10,51 @@
 {% endblock header %}
 
 {% block items_with_access %}
-        {% if items %}
+    {% if items %}
         <p>{% trans "Are you sure you want to move these pages?" %}</p>
         <ul>
             {% for page in items %}
-            <li>
-                <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
-                {% if not page.item.is_leaf %}
-                <p>
-                    {% blocktrans count counter=page.child_pages %}
-                    This page has one child page
-                    {% plural %}
-                    This page has {{ counter }} child pages
-                    {% endblocktrans %}
-                </p>
-                {% endif %}
-            </li>
+                <li>
+                    <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
+                    {% if not page.item.is_leaf %}
+                        <p>
+                            {% blocktrans count counter=page.child_pages %}
+                                This page has one child page
+                            {% plural %}
+                                This page has {{ counter }} child pages
+                            {% endblocktrans %}
+                        </p>
+                    {% endif %}
+                </li>
             {% endfor %}
         </ul>
-        {% endif %}
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to move this page{% plural %}You don't have permission to move these pages{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to move this page{% plural %}You don't have permission to move these pages{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
-{% blocktrans asvar no_access_msg with dest_title=destination.title count counter=items_with_no_access|length %}The following page cannot be moved to {{dest_title}} {% plural %}The following pages cannot be moved to {{dest_title}}{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=pages_without_destination_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg with dest_title=destination.title count counter=items_with_no_access|length %}The following page cannot be moved to {{dest_title}} {% plural %}The following pages cannot be moved to {{dest_title}}{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=pages_without_destination_access no_access_msg=no_access_msg %}
 
-{% blocktrans asvar no_access_msg count counter=pages_with_duplicate_slugs|length %}The following page cannot be moved due to duplicate slug{% plural %}The following pages cannot be moved due to duplicate slugs{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=pages_with_duplicate_slugs no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=pages_with_duplicate_slugs|length %}The following page cannot be moved due to duplicate slug{% plural %}The following pages cannot be moved due to duplicate slugs{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=pages_with_duplicate_slugs no_access_msg=no_access_msg %}
 
-{% trans "There is no valid destination page for these pages" as no_access_msg %}
-{% include './list_items_with_no_access.html' with items=pages_without_common_parent_page no_access_msg=no_access_msg %}
+    {% trans "There is no valid destination page for these pages" as no_access_msg %}
+    {% include './list_items_with_no_access.html' with items=pages_without_common_parent_page no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, move these pages' as action_button_text %}
-    {% trans "No, don't move" as no_action_button_text %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
+    {% if items %}
+        {% trans 'Yes, move these pages' as action_button_text %}
+        {% trans "No, don't move" as no_action_button_text %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+    {% else %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
+    {% endif %}
 {% endblock form_section %}
 
 {% block extra_js %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html
index c603b81b2d..df0d8c630b 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_publish.html
@@ -9,44 +9,44 @@
 {% endblock header %}
 
 {% block items_with_access %}
-{% if items %}
-    <p>{% trans "Are you sure you want to publish these pages?" %}</p>
-    <ul>
-        {% for page in items %}
-        <li>
-            <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
-            {% if page.draft_descendant_count %}
-            <p>
-                {% blocktrans count counter=page.draft_descendant_count %}
-                This page has one unpublished subpage
-                {% plural %}
-                This page has {{ counter }} unpublished subpages
-                {% endblocktrans %}
-            </p>
-            {% endif %}
-        </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+    {% if items %}
+        <p>{% trans "Are you sure you want to publish these pages?" %}</p>
+        <ul>
+            {% for page in items %}
+                <li>
+                    <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
+                    {% if page.draft_descendant_count %}
+                        <p>
+                            {% blocktrans count counter=page.draft_descendant_count %}
+                                This page has one unpublished subpage
+                            {% plural %}
+                                This page has {{ counter }} unpublished subpages
+                            {% endblocktrans %}
+                        </p>
+                    {% endif %}
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to publish this page{% plural %}You don't have permission to publish these pages{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to publish this page{% plural %}You don't have permission to publish these pages{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, publish' as action_button_text %}
-    {% trans "No, don't publish" as no_action_button_text %}
-    {% if has_draft_descendants %}
-        {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+    {% if items %}
+        {% trans 'Yes, publish' as action_button_text %}
+        {% trans "No, don't publish" as no_action_button_text %}
+        {% if has_draft_descendants %}
+            {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+        {% else %}
+            {% include 'wagtailadmin/bulk_actions/confirmation/form.html' %}
+        {% endif %}
     {% else %}
-        {% include 'wagtailadmin/bulk_actions/confirmation/form.html' %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
     {% endif %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
 {% endblock form_section %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html
index 6d3c2e96e8..b7c2b630c6 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html
@@ -9,44 +9,44 @@
 {% endblock header %}
 
 {% block items_with_access %}
-{% if items %}
-    <p>{% trans "Are you sure you want to unpublish these pages?" %}</p>
-    <ul>
-        {% for page in items %}
-        <li>
-            <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
-            <p>
-                {% if page.live_descendant_count %}
-                    {% blocktrans count counter=page.live_descendant_count %}
-                    This page has one subpage
-                    {% plural %}
-                    This page has {{ counter }} subpages
-                    {% endblocktrans %}
-                {% endif %}
-            </p>
-        </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+    {% if items %}
+        <p>{% trans "Are you sure you want to unpublish these pages?" %}</p>
+        <ul>
+            {% for page in items %}
+                <li>
+                    <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noopener noreferrer">{{ page.item.get_admin_display_title }}</a>
+                    <p>
+                        {% if page.live_descendant_count %}
+                            {% blocktrans count counter=page.live_descendant_count %}
+                                This page has one subpage
+                            {% plural %}
+                                This page has {{ counter }} subpages
+                            {% endblocktrans %}
+                        {% endif %}
+                    </p>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to unpublish this page{% plural %}You don't have permission to unpublish these pages{% endblocktrans %}
-{% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to unpublish this page{% plural %}You don't have permission to unpublish these pages{% endblocktrans %}
+    {% include './list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, unpublish' as action_button_text %}
-    {% trans "No, don't unpublish" as no_action_button_text %}
-    {% if has_live_descendants %}
-        {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+    {% if items %}
+        {% trans 'Yes, unpublish' as action_button_text %}
+        {% trans "No, don't unpublish" as no_action_button_text %}
+        {% if has_live_descendants %}
+            {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+        {% else %}
+            {% include 'wagtailadmin/bulk_actions/confirmation/form.html' %}
+        {% endif %}
     {% else %}
-        {% include 'wagtailadmin/bulk_actions/confirmation/form.html' %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
     {% endif %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
 {% endblock form_section %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/list_items_with_no_access.html b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/list_items_with_no_access.html
index 7b7ee680ad..bed13eb2e9 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/list_items_with_no_access.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/bulk_actions/list_items_with_no_access.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 
 {% block per_item %}
-{% if item.can_edit %}
-    <a href="{% url 'wagtailadmin_pages:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.get_admin_display_title }}</a>
-{% else %}
-    {{ item.item.get_admin_display_title }}
-{% endif %}
+    {% if item.can_edit %}
+        <a href="{% url 'wagtailadmin_pages:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.get_admin_display_title }}</a>
+    {% else %}
+        {{ item.item.get_admin_display_title }}
+    {% endif %}
 {% endblock per_item %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html
index be884f2985..ef3dd6f4b9 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_unpublish.html
@@ -12,19 +12,19 @@
             <input type="hidden" name="next" value="{{ next }}">
             <ul class="fields">
                 {% if live_descendant_count > 0 %}
-                <li>
-                    <div class="field boolean_field checkbox_input">
-                        <div class="field-content">
-                            <div class="input">
-                                <input id="id_include_descendants" name="include_descendants" type="checkbox">
-                                <label for="id_include_descendants" class="plain-checkbox-label">{% blocktrans count counter=live_descendant_count %}
-                    This page has one subpage. Unpublish this too
-                {% plural %}
-                    This page has {{ live_descendant_count }} subpages. Unpublish these too
-                {% endblocktrans %}</label>
+                    <li>
+                        <div class="field boolean_field checkbox_input">
+                            <div class="field-content">
+                                <div class="input">
+                                    <input id="id_include_descendants" name="include_descendants" type="checkbox">
+                                    <label for="id_include_descendants" class="plain-checkbox-label">{% blocktrans count counter=live_descendant_count %}
+                                        This page has one subpage. Unpublish this too
+                                    {% plural %}
+                                        This page has {{ live_descendant_count }} subpages. Unpublish these too
+                                    {% endblocktrans %}</label>
+                                </div>
                             </div>
                         </div>
-                    </div>
                     </li>
                 {% endif %}
                 <li>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/confirm_workflow_cancellation.html b/wagtail/admin/templates/wagtailadmin/pages/confirm_workflow_cancellation.html
index 4ccd359fc9..f45fb162b2 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/confirm_workflow_cancellation.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/confirm_workflow_cancellation.html
@@ -4,18 +4,18 @@
 
 <div class="nice-padding">
     <p>
-    {% if needs_changes %}
-        {% blocktrans %}
-            This page was marked as needing changes at <strong>{{ task }}</strong> in <strong>{{ workflow }}</strong>.
-        {% endblocktrans %}
-    {% else %}
-        {% blocktrans %}
-            This page is currently at <strong>{{ task }}</strong> in <strong>{{ workflow }}</strong>.
-        {% endblocktrans %}
-    {% endif %}
+        {% if needs_changes %}
+            {% blocktrans %}
+                This page was marked as needing changes at <strong>{{ task }}</strong> in <strong>{{ workflow }}</strong>.
+            {% endblocktrans %}
+        {% else %}
+            {% blocktrans %}
+                This page is currently at <strong>{{ task }}</strong> in <strong>{{ workflow }}</strong>.
+            {% endblocktrans %}
+        {% endif %}
     </p>
     <p>{% trans 'Publishing this page will cancel the current workflow.' %}</p>
     <p>{% trans 'Would you still like to publish this page?' %}</p>
     <button type="submit" class="button" data-confirm-cancellation>{% trans 'Publish' %}</button>
     <button type="submit" class="button button-secondary no" data-cancel-dialog>{% trans 'Cancel' %}</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/create.html b/wagtail/admin/templates/wagtailadmin/pages/create.html
index 4a3e0bed5e..290ab9e3cb 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/create.html
@@ -17,11 +17,11 @@
         </div>
 
         {% if locale %}
-        <ul class="row header-meta">
-            <li class="header-meta--locale">
-                {% include "wagtailadmin/shared/locale_selector.html" %}
-            </li>
-        </ul>
+            <ul class="row header-meta">
+                <li class="header-meta--locale">
+                    {% include "wagtailadmin/shared/locale_selector.html" %}
+                </li>
+            </ul>
         {% endif %}
     </header>
 
@@ -130,8 +130,8 @@
 
             {% get_comments_enabled as comments_enabled %}
             {% if comments_enabled %}
-            // Initialise comments UI
-            window.comments.initCommentsInterface(document.getElementById('page-edit-form'));
+                // Initialise comments UI
+                window.comments.initCommentsInterface(document.getElementById('page-edit-form'));
             {% endif %}
         });
     </script>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/edit.html b/wagtail/admin/templates/wagtailadmin/pages/edit.html
index a85a4bfe0a..a60f15f4b8 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/edit.html
@@ -23,77 +23,77 @@
         <ul class="row header-meta">
             {% include "wagtailadmin/shared/workflow_status.html" with page=page_for_status %}
             {% if page.get_latest_revision %}
-            <li>
-                <a href="{% url 'wagtailadmin_pages:history' page.id %}" class="button button-small button-nobg text-notransform">
-                    {% icon "history" class_name="default" %}
-                    {% trans "History" %}
-                </a>
-            </li>
+                <li>
+                    <a href="{% url 'wagtailadmin_pages:history' page.id %}" class="button button-small button-nobg text-notransform">
+                        {% icon "history" class_name="default" %}
+                        {% trans "History" %}
+                    </a>
+                </li>
             {% endif %}
             <li class="header-meta--type">
                 {% icon name="doc-empty-inverse" class_name="default" %}
                 {{ content_type.model_class.get_verbose_name }}
             </li>
             {% if locale %}
-            <li class="header-meta--locale">
-                {% include "wagtailadmin/shared/locale_selector.html" %}
-            </li>
+                <li class="header-meta--locale">
+                    {% include "wagtailadmin/shared/locale_selector.html" %}
+                </li>
             {% endif %}
         </ul>
     </header>
 
     {% block form %}
-    <form id="page-edit-form" action="{% url 'wagtailadmin_pages:edit' page.id %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-        {% csrf_token %}
+        <form id="page-edit-form" action="{% url 'wagtailadmin_pages:edit' page.id %}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
+            {% csrf_token %}
 
-        <input type="hidden" name="next" value="{{ next }}">
-        {{ edit_handler.render_form_content }}
+            <input type="hidden" name="next" value="{{ next }}">
+            {{ edit_handler.render_form_content }}
 
-        {% if is_revision %}
-            <input type="hidden" name="revision" value="{{ revision.id|unlocalize }}" />
-        {% endif %}
+            {% if is_revision %}
+                <input type="hidden" name="revision" value="{{ revision.id|unlocalize }}" />
+            {% endif %}
 
-        <footer class="footer">
-            <ul>
-                <li class="footer__container">
-                    <nav aria-label="{% trans 'Actions' %}">
-                        <ul>
-                            <li class="actions actions--primary">
-                                <div class="dropdown dropup dropdown-button match-width {% if is_revision %}warning{% endif %}">
-                            {{ action_menu.render_html }}
-                                </div>
-                            </li>
-
-                            {% if preview_modes %}
-                                <li class="preview">
-                            {% trans 'Preview' as preview_label %}
-                            {% if preview_modes|length > 1 %}
-                                <div class="dropdown dropup dropdown-button match-width">
-                                    {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
-                                    <div class="dropdown-toggle">{% icon name="arrow-up" %}</div>
-                                    <ul>
-                                        {% for mode_name, mode_display_name in preview_modes %}
-                                            <li>
-                                                {% include "wagtailadmin/pages/_preview_button_on_edit.html" with mode=mode_name label=mode_display_name %}
-                                            </li>
-                                        {% endfor %}
-                                    </ul>
-                                </div>
-                            {% else %}
-                                {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
-                            {% endif %}
+            <footer class="footer">
+                <ul>
+                    <li class="footer__container">
+                        <nav aria-label="{% trans 'Actions' %}">
+                            <ul>
+                                <li class="actions actions--primary">
+                                    <div class="dropdown dropup dropdown-button match-width {% if is_revision %}warning{% endif %}">
+                                        {{ action_menu.render_html }}
+                                    </div>
                                 </li>
-                            {% endif %}
 
-                            {% block extra_footer_actions %}
-                            {% endblock %}
-                        </ul>
-                    </nav>
-                </li>
-                {% include "wagtailadmin/pages/_unsaved_changes_warning.html" %}
-            </ul>
-        </footer>
-    </form>
+                                {% if preview_modes %}
+                                    <li class="preview">
+                                        {% trans 'Preview' as preview_label %}
+                                        {% if preview_modes|length > 1 %}
+                                            <div class="dropdown dropup dropdown-button match-width">
+                                                {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
+                                                <div class="dropdown-toggle">{% icon name="arrow-up" %}</div>
+                                                <ul>
+                                                    {% for mode_name, mode_display_name in preview_modes %}
+                                                        <li>
+                                                            {% include "wagtailadmin/pages/_preview_button_on_edit.html" with mode=mode_name label=mode_display_name %}
+                                                        </li>
+                                                    {% endfor %}
+                                                </ul>
+                                            </div>
+                                        {% else %}
+                                            {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
+                                        {% endif %}
+                                    </li>
+                                {% endif %}
+
+                                {% block extra_footer_actions %}
+                                {% endblock %}
+                            </ul>
+                        </nav>
+                    </li>
+                    {% include "wagtailadmin/pages/_unsaved_changes_warning.html" %}
+                </ul>
+            </footer>
+        </form>
     {% endblock %}
 
 {% endblock %}
@@ -130,34 +130,34 @@
 
         $(function() {
             {% if publishing_will_cancel_workflow %}
-            /* Make user confirm before publishing the page if it will cancel an ongoing workflow */
-            let cancellationConfirmed = false;
-            $('[name=action-publish]').click((e) => {
-                if (!cancellationConfirmed) {
-                    e.stopImmediatePropagation();
-                    e.preventDefault();
-                    ModalWorkflow({
-                        'url': "{% url 'wagtailadmin_pages:confirm_workflow_cancellation' page.id %}",
-                        'onload': {
-                            'confirm': function(modal, jsonData) {
-                                $('[data-confirm-cancellation]', modal.body).click((event) => {
+                /* Make user confirm before publishing the page if it will cancel an ongoing workflow */
+                let cancellationConfirmed = false;
+                $('[name=action-publish]').click((e) => {
+                    if (!cancellationConfirmed) {
+                        e.stopImmediatePropagation();
+                        e.preventDefault();
+                        ModalWorkflow({
+                            'url': "{% url 'wagtailadmin_pages:confirm_workflow_cancellation' page.id %}",
+                            'onload': {
+                                'confirm': function(modal, jsonData) {
+                                    $('[data-confirm-cancellation]', modal.body).click((event) => {
+                                        cancellationConfirmed = true;
+                                        modal.close();
+                                        e.currentTarget.click();
+                                    })
+                                    $('[data-cancel-dialog]', modal.body).click((event) => {
+                                        modal.close();
+                                    })
+                                },
+                                'no_confirmation_needed': function(modal, jsonData) {
+                                    modal.close();
                                     cancellationConfirmed = true;
-                                    modal.close();
                                     e.currentTarget.click();
-                                })
-                                $('[data-cancel-dialog]', modal.body).click((event) => {
-                                    modal.close();
-                                })
+                                }
                             },
-                            'no_confirmation_needed': function(modal, jsonData) {
-                                modal.close();
-                                cancellationConfirmed = true;
-                                e.currentTarget.click();
-                            }
-                        },
-                    });
-                }
-            });
+                        });
+                    }
+                });
             {% endif %}
 
             /* Make user confirm before leaving the editor if there are unsaved changes */
@@ -191,8 +191,8 @@
 
             {% get_comments_enabled as comments_enabled %}
             {% if comments_enabled %}
-            // Initialise comments UI
-            window.comments.initCommentsInterface(document.getElementById('page-edit-form'));
+                // Initialise comments UI
+                window.comments.initCommentsInterface(document.getElementById('page-edit-form'));
             {% endif %}
         });
     </script>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/index.html b/wagtail/admin/templates/wagtailadmin/pages/index.html
index 8c847105b7..45d9490aa1 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/index.html
@@ -37,10 +37,10 @@
     that column will have the drag and drop buttons to enable ordering
     {% endcomment %}
     {% if not show_ordering_column %}
-    <script>
-        window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'PAGE';
-    </script>
-    <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
+        <script>
+            window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'PAGE';
+        </script>
+        <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
     {% endif %}
     <script type="text/javascript">
         {% if ordering == 'ord' %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html
index f9ab9dc270..771a0d80f9 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_button_with_dropdown.html
@@ -8,13 +8,13 @@
     </a>
     <div class="t-dark">
         <ul class="c-dropdown__menu u-toggle  u-arrow u-arrow--tl u-background">
-        {% for button in buttons %}
-            <li class="c-dropdown__item ">
-                <a href="{{ button.url }}" aria-label="{{ button.attrs.title }}" class="u-link is-live {{ button.classes|join:' ' }}">
-                    {{ button.label }}
-                </a>
-            </li>
-        {% endfor %}
+            {% for button in buttons %}
+                <li class="c-dropdown__item ">
+                    <a href="{{ button.url }}" aria-label="{{ button.attrs.title }}" class="u-link is-live {{ button.classes|join:' ' }}">
+                        {{ button.label }}
+                    </a>
+                </li>
+            {% endfor %}
         </ul>
     </div>
 </div>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html
index bb0f2e7990..1cf37d6911 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_buttons.html
@@ -1,5 +1,5 @@
 {% for button in buttons %}
     {% if button.show %}
-    <li>{{ button|safe }}</li>
+        <li>{{ button|safe }}</li>
     {% endif %}
 {% endfor %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html
index b7e7ffa624..1474016f08 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_list_explore.html
@@ -34,7 +34,7 @@
                     {% endblocktrans %}
                 {% endif %}
             </div></td></tr>
-        {# get_url_parts will return None is the page has no site #}
+            {# get_url_parts will return None is the page has no site #}
         {% elif not parent_page.get_url_parts %}
             <tr><td colspan="6"><div class="help-block help-warning">
                 {% if perms.wagtailcore.add_site %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
index dead2ab098..2205974e1a 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
@@ -19,8 +19,8 @@
     {% page_listing_buttons parent_page parent_page_perms is_parent=True %}
 
     {% if locale %}
-    <li class="header-meta--locale">
-        {% include "wagtailadmin/shared/locale_selector.html" %}
-    </li>
+        <li class="header-meta--locale">
+            {% include "wagtailadmin/shared/locale_selector.html" %}
+        </li>
     {% endif %}
 </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html
index cecc009ab6..560bdd48ff 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html
@@ -19,18 +19,18 @@ ordering: the current sort parameter
 <tr class="table-headers">
     {% if show_ordering_column %}
         <th class="ord{% if orderable and ordering == 'ord' %} ord--active{% endif %}">
-        {% if orderable %}
-            {% if ordering == "ord" %}
-                <a href="{% url 'wagtailadmin_explore' parent_page.id %}" title="{% trans 'Disable ordering of child pages' %}">
-                    {% icon name="order" %}{% trans 'Sort' %}
-                </a>
-            {% else %}
-                <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering=ord" title="{% trans 'Enable ordering of child pages' %}">
-                    {% icon name="order" %}{% trans 'Sort' %}
-                </a>
+            {% if orderable %}
+                {% if ordering == "ord" %}
+                    <a href="{% url 'wagtailadmin_explore' parent_page.id %}" title="{% trans 'Disable ordering of child pages' %}">
+                        {% icon name="order" %}{% trans 'Sort' %}
+                    </a>
+                {% else %}
+                    <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering=ord" title="{% trans 'Enable ordering of child pages' %}">
+                        {% icon name="order" %}{% trans 'Sort' %}
+                    </a>
+                {% endif %}
             {% endif %}
-        {% endif %}
-    </th>
+        </th>
     {% else %}
         {% include 'wagtailadmin/bulk_actions/select_all_checkbox_cell.html' with parent=parent_page.id %}
     {% endif %}
@@ -44,7 +44,7 @@ ordering: the current sort parameter
             {% page_table_header_label label=parent_label sortable=0 parent_page_title=parent_page.title %}
         </th>
     {% endif %}
-     <th class="updated">
+    <th class="updated">
         {% trans 'Updated' as updated_label %}
         {% page_table_header_label label=updated_label sortable=sortable sort_field='latest_revision_created_at' parent_page_title=parent_page.title %}
     </th>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html b/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
index 4b1ba83dc9..0fd66f51f4 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
@@ -5,8 +5,8 @@
     <header class="nice-padding header-with-breadcrumb">
         {% move_breadcrumb page_to_move viewed_page %}
         <h1>
-          {% icon name="doc-empty-inverse" class_name="header-title-icon" %}
-          {% blocktrans with title=page_to_move.specific_deferred.get_admin_display_title %}Select a new parent page for <span>{{ title }}</span>{% endblocktrans %}
+            {% icon name="doc-empty-inverse" class_name="header-title-icon" %}
+            {% blocktrans with title=page_to_move.specific_deferred.get_admin_display_title %}Select a new parent page for <span>{{ title }}</span>{% endblocktrans %}
         </h1>
     </header>
     <div class="nice-padding">
diff --git a/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html b/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
index aaee3f7674..7cf5d259c9 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
@@ -6,24 +6,24 @@
 {% endif %}
 
 {% if not page.is_root %}
-<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
-    <fieldset>
-        <p>
-            {% trans "Current status:" %}
+    <div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+        <fieldset>
+            <p>
+                {% trans "Current status:" %}
 
-            <span class="label-public icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
-                {% trans "Public" %}
-            </span>
-            <span class="label-private icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
-                {% trans "Private" %}
-            </span>
-        </p>
+                <span class="label-public icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
+                    {% trans "Public" %}
+                </span>
+                <span class="label-private icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
+                    {% trans "Private" %}
+                </span>
+            </p>
 
-        {% if page.id and page_perms.can_set_view_restrictions %}
-            <button type="button" data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="button action-set-privacy">
-                {% trans "Set page privacy" %}
-            </button>
-        {% endif %}
-    </fieldset>
-</div>
+            {% if page.id and page_perms.can_set_view_restrictions %}
+                <button type="button" data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="button action-set-privacy">
+                    {% trans "Set page privacy" %}
+                </button>
+            {% endif %}
+        </fieldset>
+    </div>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/_actions.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/_actions.html
index 9100d23143..d0668163b1 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/revisions/_actions.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/revisions/_actions.html
@@ -9,14 +9,14 @@
         <li><a href="{% url 'wagtailadmin_pages:revisions_revert' page.id revision.id %}" class="button button-small button-secondary">{% trans 'Review this version' %}</a></li>
     {% endif %}
     {% with revision.get_previous as previous_revision %}
-    {% if previous_revision %}
-        <li><a href="{% url 'wagtailadmin_pages:revisions_compare' page.id previous_revision.id revision.id %}" class="button button-small button-secondary">{% trans 'Compare with previous version' %}</a></li>
-    {% endif %}
-    {% if revision != page.get_latest_revision %}
-        <li><a href="{% url 'wagtailadmin_pages:revisions_compare' page.id revision.id 'latest' %}" class="button button-small button-secondary">{% trans 'Compare with current version' %}</a></li>
-    {% endif %}
+        {% if previous_revision %}
+            <li><a href="{% url 'wagtailadmin_pages:revisions_compare' page.id previous_revision.id revision.id %}" class="button button-small button-secondary">{% trans 'Compare with previous version' %}</a></li>
+        {% endif %}
+        {% if revision != page.get_latest_revision %}
+            <li><a href="{% url 'wagtailadmin_pages:revisions_compare' page.id revision.id 'latest' %}" class="button button-small button-secondary">{% trans 'Compare with current version' %}</a></li>
+        {% endif %}
     {% endwith %}
     {% if revision.approved_go_live_at and page_perms.can_unschedule %}
-    <li><a href="{% url 'wagtailadmin_pages:revisions_unschedule' page.id revision.id %}" class="button button-small button-secondary">{% trans 'Cancel scheduled publish' %}</a></li>
+        <li><a href="{% url 'wagtailadmin_pages:revisions_unschedule' page.id revision.id %}" class="button button-small button-secondary">{% trans 'Cancel scheduled publish' %}</a></li>
     {% endif %}
 </ul>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html
index e31837be31..5505b6f575 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/revisions/compare.html
@@ -40,23 +40,23 @@
                                     <div class="comparison__child-object {% if child_comp.is_addition %}addition{% elif child_comp.is_deletion %}deletion{% endif %}">
                                         {% with child_comp.get_position_change as move %}
                                             {% if move %}
-                                            <div class="help-block help-info">
-                                                <p>
-                                                    {% if move > 0 %}
-                                                        {% blocktrans count counter=move %}
-                                                            Moved down 1 place.
-                                                        {% plural %}
-                                                            Moved down {{ counter }} places.
-                                                        {% endblocktrans %}
-                                                    {% elif move < 0 %}
-                                                        {% blocktrans count counter=move|abs %}
-                                                            Moved up 1 place.
-                                                        {% plural %}
-                                                            Moved up {{ counter }} places.
-                                                        {% endblocktrans %}
-                                                    {% endif %}
-                                                </p>
-                                            </div>
+                                                <div class="help-block help-info">
+                                                    <p>
+                                                        {% if move > 0 %}
+                                                            {% blocktrans count counter=move %}
+                                                                Moved down 1 place.
+                                                            {% plural %}
+                                                                Moved down {{ counter }} places.
+                                                            {% endblocktrans %}
+                                                        {% elif move < 0 %}
+                                                            {% blocktrans count counter=move|abs %}
+                                                                Moved up 1 place.
+                                                            {% plural %}
+                                                                Moved up {{ counter }} places.
+                                                            {% endblocktrans %}
+                                                        {% endif %}
+                                                    </p>
+                                                </div>
                                             {% endif %}
                                         {% endwith %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/pages/workflow_action_modal.html b/wagtail/admin/templates/wagtailadmin/pages/workflow_action_modal.html
index 234eb194a6..3645398804 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/workflow_action_modal.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/workflow_action_modal.html
@@ -3,7 +3,7 @@
 
 <div class="nice-padding">
     {% include "wagtailadmin/shared/non_field_errors.html" %}
-    
+
     <form action="{{ submit_url }}" method="POST" novalidate>
         {% csrf_token %}
         <ul class="fields">
diff --git a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
index d914708d6c..6d1d542233 100644
--- a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
@@ -43,11 +43,11 @@
 </table>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-{% escapescript %}
-    <tr id="inline_child_{{ formset.empty_form.prefix }}">
+    {% escapescript %}
+        <tr id="inline_child_{{ formset.empty_form.prefix }}">
         {% include "wagtailadmin/permissions/includes/collection_member_permissions_form.html" with form=formset.empty_form only %}
-    </tr>
-{% endescapescript %}
+        </tr>
+    {% endescapescript %}
 </script>
 
 <p class="add">
diff --git a/wagtail/admin/templates/wagtailadmin/reports/base_report.html b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
index eda58af787..68d4c13713 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/base_report.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
@@ -9,8 +9,8 @@
             <div class="left">
                 <div class="col header-title">
                     <h1>
-                      {% if header_icon %}{% icon name=header_icon class_name="header-title-icon" %}{% endif %}
-                      {{ title }}{% if subtitle %} <span>{{ subtitle }}</span>{% endif %}
+                        {% if header_icon %}{% icon name=header_icon class_name="header-title-icon" %}{% endif %}
+                        {{ title }}{% if subtitle %} <span>{{ subtitle }}</span>{% endif %}
                     </h1>
                 </div>
             </div>
diff --git a/wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_report.html b/wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_report.html
index d9245aac52..62aae3224a 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_report.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_report.html
@@ -3,22 +3,22 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block post_parent_page_headers %}
-<tr class="table-headers">
-    <th class="title">
-        {% trans 'Title' %}
-    </th>
-     <th class="updated">
-        {% trans 'Updated' %}
-    </th>
-    <th class="type">
-        {% trans 'Type' %}
-    </th>
-    <th class="status">
-        {% trans 'Status' %}
-    </th>
-    {% block extra_columns %}
-    {% endblock %}
-</tr>
+    <tr class="table-headers">
+        <th class="title">
+            {% trans 'Title' %}
+        </th>
+        <th class="updated">
+            {% trans 'Updated' %}
+        </th>
+        <th class="type">
+            {% trans 'Type' %}
+        </th>
+        <th class="status">
+            {% trans 'Status' %}
+        </th>
+        {% block extra_columns %}
+        {% endblock %}
+    </tr>
 {% endblock %}
 
 {% block page_title %}
diff --git a/wagtail/admin/templates/wagtailadmin/reports/listing/_list_unlock.html b/wagtail/admin/templates/wagtailadmin/reports/listing/_list_unlock.html
index 308b0e1346..5ca1e50ca7 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/listing/_list_unlock.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/listing/_list_unlock.html
@@ -4,7 +4,7 @@
 
 {% block extra_columns %}
 
-<th>{% trans 'Locking status' %}</th>
+    <th>{% trans 'Locking status' %}</th>
 
 {% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html
index 673a7154fd..750c681c1f 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/breadcrumb.html
@@ -14,9 +14,9 @@
             {% elif forloop.last %}
                 <li class="breadcrumb-item">
                     <a class="breadcrumb-link" href="{% url 'wagtailadmin_explore' page.id %}"><span class="title">{{ page.get_admin_display_title }}</span>
-                    {% if trailing_arrow %}
-                        {% icon name="arrow-right" class_name="arrow_right_icon" %}
-                    {% endif %}
+                        {% if trailing_arrow %}
+                            {% icon name="arrow-right" class_name="arrow_right_icon" %}
+                        {% endif %}
                     </a>
                 </li>
 
diff --git a/wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html b/wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html
index ba3d5a429e..50cc227a86 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/collection_chooser.html
@@ -10,7 +10,7 @@
                     {% minimum_collection_depth collections as min_depth %}
                     {% for collection in collections %}
                         <option value="{{ collection.id|unlocalize }}"
-                                {% if collection == current_collection %}selected="selected"{% endif %}>
+                            {% if collection == current_collection %}selected="selected"{% endif %}>
                             {% if request.user.is_superuser %}
                                 {# Superuser may see all collections #}
                                 {% format_collection collection %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html
index 895b9a3849..d0490bc3e4 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/explorer_menu_item.html
@@ -3,8 +3,8 @@
 {% if start_page_id %}
     <li class="menu-item{% if active %} menu-active{% endif %}" data-explorer-menu-item>
         <a href="{{ url }}" data-explorer-start-page="{{ start_page_id }}">
-          {% if icon_name %}{% icon icon_name 'icon--menuitem' %}{% endif %}
-          {{ label }}
+            {% if icon_name %}{% icon icon_name 'icon--menuitem' %}{% endif %}
+            {{ label }}
         </a>
     </li>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/header.html b/wagtail/admin/templates/wagtailadmin/shared/header.html
index 2aaaee6c84..2b65d300ad 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/header.html
@@ -25,7 +25,7 @@
         <div class="left">
             <div class="col header-title">
                 <h1>{% if icon %}{% icon name=icon class_name="header-title-icon" %}{% endif %}
-                {{ title }}{% if subtitle %} <span>{{ subtitle }}</span>{% endif %}</h1>
+                    {{ title }}{% if subtitle %} <span>{{ subtitle }}</span>{% endif %}</h1>
             </div>
             {% if search_url %}
                 <form class="col search-form" action="{% url search_url %}{% if query_parameters %}?{{ query_parameters }}{% endif %}" method="get" novalidate role="search">
@@ -43,7 +43,7 @@
                 {% if action_url %}
                     <div class="actionbutton">
                         {% with action_icon|default:'plus' as action_icon_name %}
-                        <a href="{{ action_url }}" class="button bicolor button--icon">{% icon name=action_icon_name wrapped=1 %}{{ action_text }}</a>
+                            <a href="{{ action_url }}" class="button bicolor button--icon">{% icon name=action_icon_name wrapped=1 %}{{ action_text }}</a>
                         {% endwith %}
                     </div>
                 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/icon.html b/wagtail/admin/templates/wagtailadmin/shared/icon.html
index e80b719cad..b6e769d120 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/icon.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/icon.html
@@ -1,13 +1,13 @@
 {% spaceless %}
-{# Reference implementation: components/Icon.js #}
-{% if wrapped %}<span class="icon-wrapper">{% endif %}
-<svg class="icon icon-{{ name }} {{ class_name }}" aria-hidden="true" focusable="false">
-  <use href="#icon-{{ name }}"></use>
-</svg>
-{% if title %}
-  <span class="visuallyhidden">
-    {{ title }}
-  </span>
-{% endif %}
-{% if wrapped %}</span>{% endif %}
-{% endspaceless %}
\ No newline at end of file
+    {# Reference implementation: components/Icon.js #}
+    {% if wrapped %}<span class="icon-wrapper">{% endif %}
+    <svg class="icon icon-{{ name }} {{ class_name }}" aria-hidden="true" focusable="false">
+        <use href="#icon-{{ name }}"></use>
+    </svg>
+    {% if title %}
+        <span class="visuallyhidden">
+            {{ title }}
+        </span>
+    {% endif %}
+    {% if wrapped %}</span>{% endif %}
+{% endspaceless %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/icons.html b/wagtail/admin/templates/wagtailadmin/shared/icons.html
index 1a2f94adb9..0bdb2efcbd 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/icons.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/icons.html
@@ -1,11 +1,11 @@
 {% spaceless %}
-<div style="display: none">
-  <svg>
-      <defs>
-        {% for icon in icons %}
-            {% include icon %}
-        {% endfor %}
-      </defs>
-  </svg>
-</div>
-{% endspaceless %}
\ No newline at end of file
+    <div style="display: none">
+        <svg>
+            <defs>
+                {% for icon in icons %}
+                    {% include icon %}
+                {% endfor %}
+            </defs>
+        </svg>
+    </div>
+{% endspaceless %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/last_updated.html b/wagtail/admin/templates/wagtailadmin/shared/last_updated.html
index 3ad8258313..8a361badfc 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/last_updated.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/last_updated.html
@@ -1,6 +1,6 @@
 {% load i18n wagtailadmin_tags %}
 {% if last_updated %}
-<span title="{{ last_updated }}" data-wagtail-tooltip="{{ last_updated }}" {% if classname %}class="{{ classname }}"{% endif %}>
-    {% if since_text %}{{ since_text }}{% endif %} {% timesince_last_update last_updated time_prefix=time_prefix %}
-</span>
+    <span title="{{ last_updated }}" data-wagtail-tooltip="{{ last_updated }}" {% if classname %}class="{{ classname }}"{% endif %}>
+        {% if since_text %}{{ since_text }}{% endif %} {% timesince_last_update last_updated time_prefix=time_prefix %}
+    </span>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/locale_selector.html b/wagtail/admin/templates/wagtailadmin/shared/locale_selector.html
index 638d24c529..6949d7cf9f 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/locale_selector.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/locale_selector.html
@@ -11,13 +11,13 @@
         </a>
         <div class="t-dark">
             <ul class="c-dropdown__menu u-toggle  u-arrow u-arrow--tl u-background">
-            {% for translation in translations %}
-                <li class="c-dropdown__item ">
-                    <a href="{{ translation.url }}" aria-label="{{ translation.locale.get_display_name }}" class="u-link is-live">
-                        {{ translation.locale.get_display_name }}
-                    </a>
-                </li>
-            {% endfor %}
+                {% for translation in translations %}
+                    <li class="c-dropdown__item ">
+                        <a href="{{ translation.url }}" aria-label="{{ translation.locale.get_display_name }}" class="u-link is-live">
+                            {{ translation.locale.get_display_name }}
+                        </a>
+                    </li>
+                {% endfor %}
             </ul>
         </div>
     </div>
diff --git a/wagtail/admin/templates/wagtailadmin/shared/menu_item.html b/wagtail/admin/templates/wagtailadmin/shared/menu_item.html
index 74f39699e5..6967c62554 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/menu_item.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/menu_item.html
@@ -2,8 +2,8 @@
 
 <li class="menu-item{% if active %} menu-active{% endif %}">
     <a href="{{ url }}"
-       class="{{ classnames }}"
-       {{ attr_string }}>
+        class="{{ classnames }}"
+        {{ attr_string }}>
         {% if icon_name %}{% icon icon_name 'icon--menuitem' %}{% endif %}
         {{ label }}
     </a>
diff --git a/wagtail/admin/templates/wagtailadmin/shared/non_field_errors.html b/wagtail/admin/templates/wagtailadmin/shared/non_field_errors.html
index c6ca568364..7c94a7c3b1 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/non_field_errors.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/non_field_errors.html
@@ -1,9 +1,9 @@
 {% if form.non_field_errors %}
-<div class="messages">
-    <ul>
-        {% for error in form.non_field_errors %}
-            <li class="error">{{ error }}</li>
-        {% endfor %}
-    </ul>
-</div>
+    <div class="messages">
+        <ul>
+            {% for error in form.non_field_errors %}
+                <li class="error">{{ error }}</li>
+            {% endfor %}
+        </ul>
+    </div>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/wagtail_icon.html b/wagtail/admin/templates/wagtailadmin/shared/wagtail_icon.html
index 7e63174e6c..e749d42828 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/wagtail_icon.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/wagtail_icon.html
@@ -1,9 +1,9 @@
 {% spaceless %}
-{# Reference implementation: components/Icon.js #}
-<span>
-    <span class="icon icon-{{ name }} {{ className }}" aria-hidden="true"></span>
-    {% if title %}
-        <span class="visuallyhidden">{{ title }}</span>
-    {% endif %}
-</span>
+    {# Reference implementation: components/Icon.js #}
+    <span>
+        <span class="icon icon-{{ name }} {{ className }}" aria-hidden="true"></span>
+        {% if title %}
+            <span class="visuallyhidden">{{ title }}</span>
+        {% endif %}
+    </span>
 {% endspaceless %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/workflow_status.html b/wagtail/admin/templates/wagtailadmin/shared/workflow_status.html
index 3b52ec2cc7..f3cf6238ee 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/workflow_status.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/workflow_status.html
@@ -1,44 +1,44 @@
 {% load i18n wagtailadmin_tags %}
 {% if workflow_state %}
-<li>
-    <button data-url="{% url 'wagtailadmin_pages:workflow_status' page.id %}"
+    <li>
+        <button data-url="{% url 'wagtailadmin_pages:workflow_status' page.id %}"
             class="button button-small button-nobg text-notransform action-workflow-status">
-        {% if workflow_state.status == 'needs_changes' %}
-            {% icon name="warning" %}
-            {% trans "Changes requested" %}
-            {% include "wagtailadmin/shared/last_updated.html" with since_text=since_text last_updated=workflow_state.current_task_state.finished_at time_prefix="at" %}
-        {% else %}
-            {% if workflow_state.status == "in_progress" %}
-                {% trans "Awaiting" %}
-                {% trans "since" as since_text %}
+            {% if workflow_state.status == 'needs_changes' %}
+                {% icon name="warning" %}
+                {% trans "Changes requested" %}
+                {% include "wagtailadmin/shared/last_updated.html" with since_text=since_text last_updated=workflow_state.current_task_state.finished_at time_prefix="at" %}
             {% else %}
-                {{ workflow_state.get_status_display }}
+                {% if workflow_state.status == "in_progress" %}
+                    {% trans "Awaiting" %}
+                    {% trans "since" as since_text %}
+                {% else %}
+                    {{ workflow_state.get_status_display }}
+                {% endif %}
+                {{ workflow_state.current_task_state.task.name }}
+                {% include "wagtailadmin/shared/last_updated.html" with since_text=since_text last_updated=workflow_state.current_task_state.started_at %}
             {% endif %}
-            {{ workflow_state.current_task_state.task.name }}
-            {% include "wagtailadmin/shared/last_updated.html" with since_text=since_text last_updated=workflow_state.current_task_state.started_at %}
-        {% endif %}
-    </button>
-</li>
+        </button>
+    </li>
 {% else %}
-<li class="header-meta--status">
-    {% with latest_revision=page.get_latest_revision %}
-        {% if latest_revision %}
-            {% if latest_revision.user %}
-                <span class="avatar small" data-wagtail-tooltip="{{ latest_revision.user|user_display_name }}"><img src="{% avatar_url latest_revision.user size=25 %}" alt="" /></span>
-            {% endif %}
-            {% if latest_revision == page.live_revision %}
-                {% trans "Published" %}
+    <li class="header-meta--status">
+        {% with latest_revision=page.get_latest_revision %}
+            {% if latest_revision %}
+                {% if latest_revision.user %}
+                    <span class="avatar small" data-wagtail-tooltip="{{ latest_revision.user|user_display_name }}"><img src="{% avatar_url latest_revision.user size=25 %}" alt="" /></span>
+                {% endif %}
+                {% if latest_revision == page.live_revision %}
+                    {% trans "Published" %}
+                {% else %}
+                    {% trans "Draft saved" %}
+                {% endif %}
+                {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_revision.created_at time_prefix="at" %}
             {% else %}
-                {% trans "Draft saved" %}
+                {% if page.live %}
+                    {% trans "Published" %}
+                {% else %}
+                    {% trans "Draft" %}
+                {% endif %}
             {% endif %}
-            {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_revision.created_at time_prefix="at" %}
-        {% else %}
-            {% if page.live %}
-                {% trans "Published" %}
-            {% else %}
-                {% trans "Draft" %}
-            {% endif %}
-        {% endif %}
-    {% endwith %}
-</li>
+        {% endwith %}
+    </li>
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/skeleton.html b/wagtail/admin/templates/wagtailadmin/skeleton.html
index 30936b9ef7..5c59b924ab 100644
--- a/wagtail/admin/templates/wagtailadmin/skeleton.html
+++ b/wagtail/admin/templates/wagtailadmin/skeleton.html
@@ -3,98 +3,98 @@
 {% get_current_language as LANGUAGE_CODE %}
 {% get_current_language_bidi as LANGUAGE_BIDI %}
 <html class="no-js" lang="{{ LANGUAGE_CODE }}" dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}">
-<head>
-    <meta charset="utf-8" />
-    <title>{% block branding_title %}Wagtail{% endblock %} - {% block titletag %}{% endblock %}</title>
-    <meta name="description" content="" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="robots" content="noindex" />
+    <head>
+        <meta charset="utf-8" />
+        <title>{% block branding_title %}Wagtail{% endblock %} - {% block titletag %}{% endblock %}</title>
+        <meta name="description" content="" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta name="robots" content="noindex" />
 
-    <script src="{% versioned_static 'wagtailadmin/js/vendor/modernizr-2.6.2.min.js' %}"></script>
+        <script src="{% versioned_static 'wagtailadmin/js/vendor/modernizr-2.6.2.min.js' %}"></script>
 
-    <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/normalize.css' %}" />
+        <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/normalize.css' %}" />
 
-    {% block css %}{% endblock %}
+        {% block css %}{% endblock %}
 
-    {% block branding_favicon %}{% endblock %}
-</head>
-{% slim_sidebar_enabled as slim_sidebar_enabled %}
-{% sidebar_collapsed as sidebar_collapsed %}
-<body id="wagtail" class="{% block bodyclass %}{% endblock %} {% if slim_sidebar_enabled and sidebar_collapsed %}sidebar-collapsed{% endif %} {% if messages %}has-messages{% endif %} focus-outline-on">
-    <div data-sprite></div>
-    <script>
-        function loadIconSprite() {
-            var spriteURL = '{% url "wagtailadmin_sprite" %}';
-            var revisionKey = 'wagtail:spriteRevision';
-            var dataKey = 'wagtail:spriteData';
-            var isLocalStorage = 'localStorage' in window && typeof window.localStorage !== 'undefined';
+        {% block branding_favicon %}{% endblock %}
+    </head>
+    {% slim_sidebar_enabled as slim_sidebar_enabled %}
+    {% sidebar_collapsed as sidebar_collapsed %}
+    <body id="wagtail" class="{% block bodyclass %}{% endblock %} {% if slim_sidebar_enabled and sidebar_collapsed %}sidebar-collapsed{% endif %} {% if messages %}has-messages{% endif %} focus-outline-on">
+        <div data-sprite></div>
+        <script>
+            function loadIconSprite() {
+                var spriteURL = '{% url "wagtailadmin_sprite" %}';
+                var revisionKey = 'wagtail:spriteRevision';
+                var dataKey = 'wagtail:spriteData';
+                var isLocalStorage = 'localStorage' in window && typeof window.localStorage !== 'undefined';
 
-            var insertIt = function (data) {
-                var spriteContainer = document.body.querySelector('[data-sprite]');
-                spriteContainer.innerHTML = data;
-            }
-
-            var insert = function (data) {
-                if (document.body) {
-                    insertIt(data)
-                } else {
-                    document.addEventListener('DOMContentLoaded', insertIt.bind(null, data));
+                var insertIt = function (data) {
+                    var spriteContainer = document.body.querySelector('[data-sprite]');
+                    spriteContainer.innerHTML = data;
                 }
-            }
 
-            if (isLocalStorage && localStorage.getItem(revisionKey) === spriteURL) {
-                var data = localStorage.getItem(dataKey);
-                if (data) {
-                    insert(data);
-                    return true;
-                }
-            }
-
-            try {
-                var request = new XMLHttpRequest();
-                request.open('GET', spriteURL, true);
-                request.onload = function () {
-                    if (request.status >= 200 && request.status < 400) {
-                        data = request.responseText;
-                        insert(data);
-                        if (isLocalStorage) {
-                            localStorage.setItem(dataKey, data);
-                            localStorage.setItem(revisionKey, spriteURL);
-                        }
+                var insert = function (data) {
+                    if (document.body) {
+                        insertIt(data)
+                    } else {
+                        document.addEventListener('DOMContentLoaded', insertIt.bind(null, data));
                     }
                 }
-                request.send();
-            } catch (e) {
-                console.error(e);
-            }
-        }
-        loadIconSprite();
-    </script>
 
-    <!--[if lt IE 9]>
+                if (isLocalStorage && localStorage.getItem(revisionKey) === spriteURL) {
+                    var data = localStorage.getItem(dataKey);
+                    if (data) {
+                        insert(data);
+                        return true;
+                    }
+                }
+
+                try {
+                    var request = new XMLHttpRequest();
+                    request.open('GET', spriteURL, true);
+                    request.onload = function () {
+                        if (request.status >= 200 && request.status < 400) {
+                            data = request.responseText;
+                            insert(data);
+                            if (isLocalStorage) {
+                                localStorage.setItem(dataKey, data);
+                                localStorage.setItem(revisionKey, spriteURL);
+                            }
+                        }
+                    }
+                    request.send();
+                } catch (e) {
+                    console.error(e);
+                }
+            }
+            loadIconSprite();
+        </script>
+
+        <!--[if lt IE 9]>
         <p class="capabilitymessage">{% blocktrans %}You are using an <strong>outdated</strong> browser not supported by this software. Please <a href="https://browsehappy.com/">upgrade your browser</a>.{% endblocktrans %}</p>
     <![endif]-->
-    <noscript class="capabilitymessage">
-        {% blocktrans %}
-            JavaScript is required to use Wagtail, but it is currently disabled.<br />
-            Here are the <a href="https://www.enable-javascript.com/" target="_blank" rel="noopener noreferrer">instructions how to enable JavaScript in your web browser</a>.
-        {% endblocktrans %}
-    </noscript>
+        <noscript class="capabilitymessage">
+            {% blocktrans %}
+                JavaScript is required to use Wagtail, but it is currently disabled.<br />
+                Here are the <a href="https://www.enable-javascript.com/" target="_blank" rel="noopener noreferrer">instructions how to enable JavaScript in your web browser</a>.
+            {% endblocktrans %}
+        </noscript>
 
-    {% block ie11warning %}
-        <div data-ie11-warning hidden>
-            <div class="capabilitymessage">
-                {% blocktrans with url="https://docs.wagtail.org/en/stable/editor_manual/browser_issues.html#ie11" %}Wagtail has removed support for IE11. <a href="{{ url }}">Learn more about IE11 alternatives</a>.{% endblocktrans %}
+        {% block ie11warning %}
+            <div data-ie11-warning hidden>
+                <div class="capabilitymessage">
+                    {% blocktrans with url="https://docs.wagtail.org/en/stable/editor_manual/browser_issues.html#ie11" %}Wagtail has removed support for IE11. <a href="{{ url }}">Learn more about IE11 alternatives</a>.{% endblocktrans %}
+                </div>
             </div>
+        {% endblock %}
+
+        {% block js %}{% endblock %}
+
+        <a class="skiplink button" href="#main" data-skiplink>{% trans 'Skip to main content' %}</a>
+
+        <div class="wrapper">
+            {% block furniture %}{% endblock %}
         </div>
-    {% endblock %}
-
-    {% block js %}{% endblock %}
-
-    <a class="skiplink button" href="#main" data-skiplink>{% trans 'Skip to main content' %}</a>
-
-    <div class="wrapper">
-       {% block furniture %}{% endblock %}
-    </div>
-</body>
+    </body>
 </html>
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/base.html b/wagtail/admin/templates/wagtailadmin/userbar/base.html
index 49cd34359c..8a942dab4f 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/base.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/base.html
@@ -6,21 +6,21 @@
         <div class="wagtail-userbar-nav">
             <button aria-controls="wagtail-userbar-items" aria-haspopup="true" class="wagtail-userbar-trigger" id="wagtail-userbar-trigger" data-wagtail-userbar-trigger>
                 {% block branding_logo %}
-                  <div style="display: none">
-                    <svg>
-                        <defs>
-                          {% include "wagtailadmin/icons/wagtail.svg" %}
-                          {% include "wagtailadmin/icons/folder-open-inverse.svg" %}
-                          {% include "wagtailadmin/icons/edit.svg" %}
-                          {% include "wagtailadmin/icons/plus.svg" %}
-                          {% include "wagtailadmin/icons/tick.svg" %}
-                          {% include "wagtailadmin/icons/cross.svg" %}
-                        </defs>
+                    <div style="display: none">
+                        <svg>
+                            <defs>
+                                {% include "wagtailadmin/icons/wagtail.svg" %}
+                                {% include "wagtailadmin/icons/folder-open-inverse.svg" %}
+                                {% include "wagtailadmin/icons/edit.svg" %}
+                                {% include "wagtailadmin/icons/plus.svg" %}
+                                {% include "wagtailadmin/icons/tick.svg" %}
+                                {% include "wagtailadmin/icons/cross.svg" %}
+                            </defs>
+                        </svg>
+                    </div>
+                    <svg class="wagtail-userbar-icon" aria-hidden="true" focusable="false">
+                        <use href="#icon-wagtail-icon"></use>
                     </svg>
-                  </div>
-                  <svg class="wagtail-userbar-icon" aria-hidden="true" focusable="false">
-                    <use href="#icon-wagtail-icon"></use>
-                  </svg>
                 {% endblock %}
                 <span class="wagtail-userbar-help-text">{% trans 'View Wagtail quick actions' %}</span>
             </button>
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html
index 7b4557adbd..60a870f2d8 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html
@@ -3,7 +3,7 @@
 
 {% block item_content %}
     <a href="{% url 'wagtailadmin_pages:add_subpage' self.page.id %}" target="_parent" role="menuitem">
-      {% icon name="plus" class_name="wagtail-action-icon" %}
-      {% trans 'Add a child page' %}
+        {% icon name="plus" class_name="wagtail-action-icon" %}
+        {% trans 'Add a child page' %}
     </a>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html
index a5fe0f27a8..dfd29cb2cf 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/item_page_approve.html
@@ -5,8 +5,8 @@
     <form action="{% url 'wagtailadmin_pages:approve_moderation' self.revision.id %}" target="_parent" method="post">
         {% csrf_token %}
         <button type="submit" value="{% trans 'Approve' %}" class="button" role="menuitem">
-          {% icon name="tick" class_name="wagtail-action-icon" %}
-          {% trans 'Approve' %}
+            {% icon name="tick" class_name="wagtail-action-icon" %}
+            {% trans 'Approve' %}
         </button>
     </form>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html
index 061ffc9e9a..a38b967e84 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html
@@ -3,7 +3,7 @@
 
 {% block item_content %}
     <a href="{% url 'wagtailadmin_pages:edit' self.page.id %}" target="_parent" role="menuitem">
-      {% icon name="edit" class_name="wagtail-action-icon" %}
-      {% trans 'Edit this page' %}
+        {% icon name="edit" class_name="wagtail-action-icon" %}
+        {% trans 'Edit this page' %}
     </a>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html
index 01f23da4f6..c7637cd175 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html
@@ -3,7 +3,7 @@
 
 {% block item_content %}
     <a href="{% url 'wagtailadmin_explore' self.parent_page.id %}" target="_parent" role="menuitem">
-      {% icon name="folder-open-inverse" class_name="wagtail-action-icon" %}
-      {% trans 'Show in Explorer' %}
+        {% icon name="folder-open-inverse" class_name="wagtail-action-icon" %}
+        {% trans 'Show in Explorer' %}
     </a>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html b/wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html
index 3e32c68e69..6abe49def6 100644
--- a/wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html
+++ b/wagtail/admin/templates/wagtailadmin/userbar/item_page_reject.html
@@ -5,8 +5,8 @@
     <form action="{% url 'wagtailadmin_pages:reject_moderation' self.revision.id %}" target="_parent" method="post">
         {% csrf_token %}
         <button type="submit" value="{% trans 'Reject' %}" class="button" role="menuitem">
-          {% icon name="cross" class_name="wagtail-action-icon" %}
-          {% trans 'Reject' %}
+            {% icon name="cross" class_name="wagtail-action-icon" %}
+            {% trans 'Reject' %}
         </button>
     </form>
 {% endblock %}
diff --git a/wagtail/admin/templates/wagtailadmin/widgets/daterange_input.html b/wagtail/admin/templates/wagtailadmin/widgets/daterange_input.html
index 57bb88d44e..d5a1ddb5c1 100644
--- a/wagtail/admin/templates/wagtailadmin/widgets/daterange_input.html
+++ b/wagtail/admin/templates/wagtailadmin/widgets/daterange_input.html
@@ -1,3 +1,3 @@
 <div class="daterange_field">
-{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %}
+    {% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %}
 </div>
diff --git a/wagtail/admin/templates/wagtailadmin/widgets/time_input.html b/wagtail/admin/templates/wagtailadmin/widgets/time_input.html
index 8afe7ece65..247df98b7a 100644
--- a/wagtail/admin/templates/wagtailadmin/widgets/time_input.html
+++ b/wagtail/admin/templates/wagtailadmin/widgets/time_input.html
@@ -1 +1 @@
-{% include 'django/forms/widgets/time.html' %}<script>initTimeChooser("{{ widget.attrs.id|escapejs }}", {{ widget.config_json|safe }});</script> 
+{% include 'django/forms/widgets/time.html' %}<script>initTimeChooser("{{ widget.attrs.id|escapejs }}", {{ widget.config_json|safe }});</script>
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html b/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html
index 15358937f1..cbebb0962b 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/confirm_delete.html
@@ -7,7 +7,7 @@
 
     <div class="nice-padding">
         <p>This workflow is currently in progress on {{ workflow_states_in_progress }} pages. Deleting this workflow will cancel moderation on these page.
-        Are you sure you want to delete this workflow?</p>
+            Are you sure you want to delete this workflow?</p>
         <form action="{{ view.get_delete_url }}" method="POST">
             {% csrf_token %}
             <input type="submit" value="{% trans 'Yes, delete' %}" class="button serious" />
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/edit.html b/wagtail/admin/templates/wagtailadmin/workflows/edit.html
index 0ce959eb3c..f030675f50 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/edit.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/edit.html
@@ -43,7 +43,7 @@
                         {% if workflow.active %}
                             <div class="top-padding">
                                 <p class="help-block help-info">
-                                {% url 'wagtailadmin_workflows:usage' workflow.pk as workflow_pages_url %}
+                                    {% url 'wagtailadmin_workflows:usage' workflow.pk as workflow_pages_url %}
                                     {% blocktrans trimmed %}
                                         Workflows apply to child pages too. If you select a parent page here, its child pages will also use this workflow.
                                         See <a href="{{ workflow_pages_url }}">the list of the pages</a> your workflow applies to.
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
index 648a5ad16c..f18cf67a80 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
@@ -36,15 +36,15 @@
                     {{ field }}
                 {% endif %}
             {% endfor %}
-                <li>
-                    <div class="help-block help-info">
-                        {% for workflow in object.active_workflows %}
-                            {% if forloop.first %}<strong>{% trans "Used on the following active workflows" %}:</strong> {% endif %}
-                            <a href="{% url 'wagtailadmin_workflows:edit' workflow.pk %}">{{ workflow.name }}</a>{% if not forloop.last %}, {% endif %}
-                        {% empty %}
-                            {% trans "Not used" %}
-                        {% endfor %}
-                    </div>
+            <li>
+                <div class="help-block help-info">
+                    {% for workflow in object.active_workflows %}
+                        {% if forloop.first %}<strong>{% trans "Used on the following active workflows" %}:</strong> {% endif %}
+                        <a href="{% url 'wagtailadmin_workflows:edit' workflow.pk %}">{{ workflow.name }}</a>{% if not forloop.last %}, {% endif %}
+                    {% empty %}
+                        {% trans "Not used" %}
+                    {% endfor %}
+                </div>
             </li>
         </ul>
 
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
index df7aebae9e..2a9e5fe509 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
@@ -40,11 +40,11 @@
 </table>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-{% escapescript %}
-    <tr id="inline_child_{{ formset.empty_form.prefix }}">
+    {% escapescript %}
+        <tr id="inline_child_{{ formset.empty_form.prefix }}">
         {% include "wagtailadmin/workflows/includes/workflow_pages_form.html" with form=formset.empty_form only %}
-    </tr>
-{% endescapescript %}
+        </tr>
+    {% endescapescript %}
 </script>
 
 <p class="add">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/index.html b/wagtail/admin/templates/wagtailadmin/workflows/index.html
index 2d7624f94d..d52a2a84b8 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/index.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/index.html
@@ -7,7 +7,7 @@
             <div class="left">
                 <div class="col header-title">
                     <h1>{% if view.header_icon %}{% icon name=view.header_icon class_name="header-title-icon" %}{% endif %}
-                    {{ view.page_title }}{% if view.subtitle %} <span>{{ view.subtitle }}</span>{% endif %}</h1>
+                        {{ view.page_title }}{% if view.subtitle %} <span>{{ view.subtitle }}</span>{% endif %}</h1>
                 </div>
             </div>
             <div class="right">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
index 61bcbac996..6030b6ec61 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
@@ -3,17 +3,17 @@
 {% include "wagtailadmin/shared/header.html" with title=choose_str tabbed=1 merged=1 icon="thumbtack" %}
 
 {% if can_create %}
-<ul class="tab-nav merged" data-tab-nav>
-    <li class="active"><a href="#new">{% trans "New" %}</a></li>
-    <li><a href="#existing">{% trans "Existing" %}</a></li>
-</ul>
+    <ul class="tab-nav merged" data-tab-nav>
+        <li class="active"><a href="#new">{% trans "New" %}</a></li>
+        <li><a href="#existing">{% trans "Existing" %}</a></li>
+    </ul>
 {% endif %}
 
 <div class="tab-content">
     {% if can_create %}
-    <section id="new" class="active nice-padding">
-        {% include "wagtailadmin/workflows/task_chooser/includes/create_tab.html" %}
-    </section>
+        <section id="new" class="active nice-padding">
+            {% include "wagtailadmin/workflows/task_chooser/includes/create_tab.html" %}
+        </section>
     {% endif %}
     <section id="existing" class="nice-padding{% if not can_create %} active{% endif %}">
         <form class="task-search search-bar" action="{% url 'wagtailadmin_workflows:task_chooser_results' %}" method="GET" novalidate>
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html
index 4ea5361f8c..de4108b3d1 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html
@@ -2,11 +2,11 @@
 {% if tasks %}
     {% if search_form.is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=tasks.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=tasks.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% else %}
         <h2>{% trans "Tasks" %}</h2>
@@ -64,12 +64,12 @@
         <p role="alert">{% blocktrans %}Sorry, no tasks match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
     {% else %}
         <p>
-        {% trans "You haven't created any tasks." %}
-        {% if can_create %}
-            {% blocktrans %}
-                Why not <a class="create-one-now" href="#">create one now</a>?
-            {% endblocktrans %}
-        {% endif %}
+            {% trans "You haven't created any tasks." %}
+            {% if can_create %}
+                {% blocktrans %}
+                    Why not <a class="create-one-now" href="#">create one now</a>?
+                {% endblocktrans %}
+            {% endif %}
         </p>
     {% endif %}
 {% endif %}
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/task_index.html b/wagtail/admin/templates/wagtailadmin/workflows/task_index.html
index a7df7b6bb2..2c8a9c1a1b 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/task_index.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/task_index.html
@@ -7,7 +7,7 @@
             <div class="left">
                 <div class="col header-title">
                     <h1>{% if view.header_icon %}{% icon name=view.header_icon class_name="header-title-icon" %}{% endif %}
-                    {{ view.page_title }}{% if view.subtitle %} <span>{{ view.subtitle }}</span>{% endif %}</h1>
+                        {{ view.page_title }}{% if view.subtitle %} <span>{{ view.subtitle }}</span>{% endif %}</h1>
                 </div>
             </div>
             <div class="right">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/workflow_status.html b/wagtail/admin/templates/wagtailadmin/workflows/workflow_status.html
index 8786239749..416165e081 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/workflow_status.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/workflow_status.html
@@ -5,44 +5,44 @@
 <div class="nice-padding">
     {% if page.get_latest_revision %}
         <p>
-        {% blocktrans trimmed with workflow_name=workflow_state.workflow.name started_at=workflow_state.created_at %}
-            Submitted to <em>{{ workflow_name }}</em> at {{ started_at }}
-        {% endblocktrans %}
-        {% if workflow_state.requested_by %}
-            {% blocktrans with modified_by=workflow_state.requested_by|user_display_name %}by {{ modified_by }}{% endblocktrans %}
-            <span class="avatar small"><img src="{% avatar_url page.get_latest_revision.user size=25 %}" alt="" /></span>
-        {% endif %}
+            {% blocktrans trimmed with workflow_name=workflow_state.workflow.name started_at=workflow_state.created_at %}
+                Submitted to <em>{{ workflow_name }}</em> at {{ started_at }}
+            {% endblocktrans %}
+            {% if workflow_state.requested_by %}
+                {% blocktrans with modified_by=workflow_state.requested_by|user_display_name %}by {{ modified_by }}{% endblocktrans %}
+                <span class="avatar small"><img src="{% avatar_url page.get_latest_revision.user size=25 %}" alt="" /></span>
+            {% endif %}
         </p>
     {% endif %}
 
     <ul class="workflow-timeline">
         <li class="approved">{% icon name="success" class_name="default" %}{% trans "Submitted" %}</li>
-    {% trans "Not started" as not_started_text %}
-    {% for task in workflow_tasks %}
-        <li data-wagtail-tooltip="{{ task.name }}: {{ task.task_state.get_status_display|default:not_started_text }}" {% if task.task_state and task.task_state.status %}class="{{ task.task_state.status }}"{% endif %}>
-            {% if task.task_state.status == "rejected" %}
-                {% icon name="warning" class_name="default" %}<strong>{{ task.name }}</strong>
+        {% trans "Not started" as not_started_text %}
+        {% for task in workflow_tasks %}
+            <li data-wagtail-tooltip="{{ task.name }}: {{ task.task_state.get_status_display|default:not_started_text }}" {% if task.task_state and task.task_state.status %}class="{{ task.task_state.status }}"{% endif %}>
+                {% if task.task_state.status == "rejected" %}
+                    {% icon name="warning" class_name="default" %}<strong>{{ task.name }}</strong>
 
-                {% if task.task_state.finished_by %}
-                    {% blocktrans trimmed with requested_by=task.task_state.finished_by|user_display_name %}
-                        Changes requested by {{ requested_by }}
-                    {% endblocktrans %}
+                    {% if task.task_state.finished_by %}
+                        {% blocktrans trimmed with requested_by=task.task_state.finished_by|user_display_name %}
+                            Changes requested by {{ requested_by }}
+                        {% endblocktrans %}
+                    {% else %}
+                        {% trans "Changes requested" %}
+                    {% endif %}
                 {% else %}
-                    {% trans "Changes requested" %}
+                    {% icon name="success" class_name="default" %}{{ task.name }}
+                    {% if task.task_state.finished_by %}
+                        {% blocktrans trimmed with approved_by=task.task_state.finished_by|user_display_name %}
+                            Approved by {{ approved_by }}
+                        {% endblocktrans %}
+                    {% endif %}
                 {% endif %}
-            {% else %}
-                {% icon name="success" class_name="default" %}{{ task.name }}
-                {% if task.task_state.finished_by %}
-                    {% blocktrans trimmed with approved_by=task.task_state.finished_by|user_display_name %}
-                        Approved by {{ approved_by }}
-                    {% endblocktrans %}
+                {% if task.task_state and task.task_state.get_comment %}
+                    {% trans "with comment:" %} <em>"{{ task.task_state.get_comment }}"</em>
                 {% endif %}
-            {% endif %}
-            {% if task.task_state and task.task_state.get_comment %}
-                {% trans "with comment:" %} <em>"{{ task.task_state.get_comment }}"</em>
-            {% endif %}
-        </li>
-    {% endfor %}
+            </li>
+        {% endfor %}
         <li>{% icon name="success" class_name="default" %}{% trans "Published" %}</li>
     </ul>
 
@@ -58,9 +58,9 @@
             {% endif %}
 
             {% with latest_revision.get_previous as previous_revision %}
-            {% if previous_revision %}
-                <a href="{% url 'wagtailadmin_pages:revisions_compare' page.id previous_revision.id latest_revision.id %}" class="button button-small button-secondary">{% trans 'Compare with previous version' %}</a>
-            {% endif %}
+                {% if previous_revision %}
+                    <a href="{% url 'wagtailadmin_pages:revisions_compare' page.id previous_revision.id latest_revision.id %}" class="button button-small button-secondary">{% trans 'Compare with previous version' %}</a>
+                {% endif %}
             {% endwith %}
         {% endwith %}
     </p>
diff --git a/wagtail/contrib/forms/templates/wagtailforms/index_submissions.html b/wagtail/contrib/forms/templates/wagtailforms/index_submissions.html
index 9549ccb62e..205cb57dc0 100644
--- a/wagtail/contrib/forms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/contrib/forms/templates/wagtailforms/index_submissions.html
@@ -87,8 +87,8 @@
                 <div class="left">
                     <div class="col header-title">
                         <h1>
-                          {% icon name="form" class_name="header-title-icon" %}
-                          {% blocktrans with form_title=form_page.title|capfirst %}Form data <span>{{ form_title }}</span>{% endblocktrans %}
+                            {% icon name="form" class_name="header-title-icon" %}
+                            {% blocktrans with form_title=form_page.title|capfirst %}Form data <span>{{ form_title }}</span>{% endblocktrans %}
                         </h1>
                     </div>
                     <div class="col search-bar">
diff --git a/wagtail/contrib/forms/templates/wagtailforms/list_submissions.html b/wagtail/contrib/forms/templates/wagtailforms/list_submissions.html
index 84cd1b63b5..c561c2c3f2 100644
--- a/wagtail/contrib/forms/templates/wagtailforms/list_submissions.html
+++ b/wagtail/contrib/forms/templates/wagtailforms/list_submissions.html
@@ -1,37 +1,37 @@
 {% load i18n %}
 <div class="overflow">
-<table class="listing">
-    <col />
-    <col />
-    <col />
-    <thead>
-        <tr>
-            <th colspan="{{ data_headings|length|add:1 }}">
-                <button class="button no" id="delete-submissions" style="visibility: hidden">{% trans "Delete selected submissions" %}</button>
-            </th>
-        </tr>
-        <tr>
-            <th><input type="checkbox" id="select-all" /></th>
-            {% for heading in data_headings %}
-                <th id="{{ heading.name }}" class="{% if heading.order %}ordered {{ heading.order }}{% endif %}">
-                  {% if heading.order %}<a href="?order_by={% if heading.order == 'ascending' %}-{% endif %}{{ heading.name }}">{{ heading.label }}</a>{% else %}{{ heading.label }}{% endif %}
-                </th>
-            {% endfor %}
-        </tr>
-    </thead>
-    <tbody>
-        {% for row in data_rows %}
+    <table class="listing">
+        <col />
+        <col />
+        <col />
+        <thead>
             <tr>
-                <td>
-                    <input type="checkbox" name="selected-submissions" class="select-submission" value="{{ row.model_id }}" />
-                </td>
-                {% for cell in row.fields %}
-                    <td>
-                        {{ cell }}
-                    </td>
+                <th colspan="{{ data_headings|length|add:1 }}">
+                    <button class="button no" id="delete-submissions" style="visibility: hidden">{% trans "Delete selected submissions" %}</button>
+                </th>
+            </tr>
+            <tr>
+                <th><input type="checkbox" id="select-all" /></th>
+                {% for heading in data_headings %}
+                    <th id="{{ heading.name }}" class="{% if heading.order %}ordered {{ heading.order }}{% endif %}">
+                        {% if heading.order %}<a href="?order_by={% if heading.order == 'ascending' %}-{% endif %}{{ heading.name }}">{{ heading.label }}</a>{% else %}{{ heading.label }}{% endif %}
+                    </th>
                 {% endfor %}
             </tr>
-        {% endfor %}
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+            {% for row in data_rows %}
+                <tr>
+                    <td>
+                        <input type="checkbox" name="selected-submissions" class="select-submission" value="{{ row.model_id }}" />
+                    </td>
+                    {% for cell in row.fields %}
+                        <td>
+                            {{ cell }}
+                        </td>
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 </div>
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html b/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
index 4d19078ec1..3a90bdd774 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
@@ -20,27 +20,27 @@
 
 {% block content %}
 
-{% block header %}
-    {% include "modeladmin/includes/header_with_breadcrumb.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=True %}
-{% endblock %}
+    {% block header %}
+        {% include "modeladmin/includes/header_with_breadcrumb.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=True %}
+    {% endblock %}
 
-<div>
+    <div>
 
-    <div class="nice-padding">
-        <h2>{% blocktrans %}Choose a parent page{% endblocktrans %}</h2>
-        <p>{% blocktrans with view.verbose_name_plural|capfirst as plural %}{{ plural }} can be added to more than one place within your site. Which of the following would you like to be the parent of your new page?{% endblocktrans %}</p>
+        <div class="nice-padding">
+            <h2>{% blocktrans %}Choose a parent page{% endblocktrans %}</h2>
+            <p>{% blocktrans with view.verbose_name_plural|capfirst as plural %}{{ plural }} can be added to more than one place within your site. Which of the following would you like to be the parent of your new page?{% endblocktrans %}</p>
 
-        <form action="" method="post" novalidate>
-            {% csrf_token %}
+            <form action="" method="post" novalidate>
+                {% csrf_token %}
 
-            <ul class="fields">
-                {% include "wagtailadmin/shared/field_as_li.html" with field=form.parent_page %}
-                <li>
-                    <input type="submit" class="button" value="{% trans 'Continue' %}">
-                </li>
-            </ul>
-        </form>
+                <ul class="fields">
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=form.parent_page %}
+                    <li>
+                        <input type="submit" class="button" value="{% trans 'Continue' %}">
+                    </li>
+                </ul>
+            </form>
 
+        </div>
     </div>
-</div>
 {% endblock %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/filter.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/filter.html
index 132d2f7a90..c8de50f210 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/filter.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/filter.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}
 <ul>
-{% for choice in choices %}
-    <li{% if choice.selected %} class="selected"{% endif %}>
-    <a href="{{ choice.query_string|iriencode }}">{{ choice.display }}</a></li>
-{% endfor %}
+    {% for choice in choices %}
+        <li{% if choice.selected %} class="selected"{% endif %}>
+            <a href="{{ choice.query_string|iriencode }}">{{ choice.display }}</a></li>
+    {% endfor %}
 </ul>
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/header_with_history.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/header_with_history.html
index c334413b4a..41d973ee09 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/header_with_history.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/header_with_history.html
@@ -2,18 +2,18 @@
 {% load wagtailadmin_tags i18n %}
 
 {% block extra_rows %}
-<div class="row last-updated">
-    {% if latest_log_entry %}
-    <ul>
-        <li>
-            <span class="avatar small" data-wagtail-tooltip="{{ latest_log_entry.user_display_name }}"><img src="{% avatar_url latest_log_entry.user size=25 %}" alt="" /></span>
-            {% trans "Last updated" %}
-            {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_log_entry.timestamp time_prefix="at" %}
-        </li>
-        {% if history_url %}
-            <li><a href="{{ history_url }}">{% icon "history" class_name="default" %} {% trans "History" %}</a></li>
+    <div class="row last-updated">
+        {% if latest_log_entry %}
+            <ul>
+                <li>
+                    <span class="avatar small" data-wagtail-tooltip="{{ latest_log_entry.user_display_name }}"><img src="{% avatar_url latest_log_entry.user size=25 %}" alt="" /></span>
+                    {% trans "Last updated" %}
+                    {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_log_entry.timestamp time_prefix="at" %}
+                </li>
+                {% if history_url %}
+                    <li><a href="{{ history_url }}">{% icon "history" class_name="default" %} {% trans "History" %}</a></li>
+                {% endif %}
+            </ul>
         {% endif %}
-    </ul>
-    {% endif %}
-</div>
+    </div>
 {% endblock %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_list.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_list.html
index 5af386c544..c0491f552e 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_list.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_list.html
@@ -1,23 +1,23 @@
 {% load i18n modeladmin_tags %}
 {% if results %}
-<table class="listing full-width">
-    <thead>
-        <tr>
-            {% for header in result_headers %}
-            <th scope="col" {{ header.class_attrib }}>
-                {% if header.sortable %}<a href="{{ header.url_primary }}" class="icon {% if header.ascending %}icon-arrow-up-after{% else %}icon-arrow-down-after{% endif %}">{% endif %}
-                {{ header.text|capfirst }}
-                {% if header.sortable %}</a>{% endif %}
-           </th>
-           {% endfor %}
-       </tr>
-    </thead>
-    <tbody>
-    {% for result in results %}
-        {% result_row_display forloop.counter0 %}
-    {% endfor %}
-</tbody>
-</table>
+    <table class="listing full-width">
+        <thead>
+            <tr>
+                {% for header in result_headers %}
+                    <th scope="col" {{ header.class_attrib }}>
+                        {% if header.sortable %}<a href="{{ header.url_primary }}" class="icon {% if header.ascending %}icon-arrow-up-after{% else %}icon-arrow-down-after{% endif %}">{% endif %}
+                        {{ header.text|capfirst }}
+                        {% if header.sortable %}</a>{% endif %}
+                    </th>
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for result in results %}
+                {% result_row_display forloop.counter0 %}
+            {% endfor %}
+        </tbody>
+    </table>
 {% else %}
     <div class="nice-padding no-search-results">
         <p>{% blocktrans with view.verbose_name_plural as name %}Sorry, there are no {{ name }} matching your search parameters.{% endblocktrans %}</p>
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_row_value.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_row_value.html
index c7c355ce41..2248002ca3 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_row_value.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/result_row_value.html
@@ -1,11 +1,11 @@
 {% load i18n modeladmin_tags %}
 {{ item }}{% if add_action_buttons %}
     {% if action_buttons %}
-    <ul class="actions">
-        {% for button in action_buttons %}
-            <li>{% include 'modeladmin/includes/button.html' %}</li>
-        {% endfor %}
-    </ul>
+        <ul class="actions">
+            {% for button in action_buttons %}
+                <li>{% include 'modeladmin/includes/button.html' %}</li>
+            {% endfor %}
+        </ul>
     {% endif %}
     {{ closing_tag }}
 {% endif %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
index 7ba09b335a..eff2e386bf 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
@@ -1,20 +1,20 @@
 {% load i18n %}
 {% if show_search %}
-<form id="changelist-search" class="col search-form" action="{{ view.index_url }}" method="get">
-    <ul class="fields">
-        <li class="required">
-            <div class="field char_field text_input field-small iconfield">
-                <label for="id_q" class="visuallyhidden">{% trans 'Search for' %}</label>
-                <div class="field-content">
-                    <div class="input icon-search ">
-                        <input id="id_q" name="{{ search_var }}" value="{{ view.query }}" placeholder="{% blocktrans with view.verbose_name_plural|lower as name %}Search {{ name }}{% endblocktrans %}" type="text">
-                        <span></span>
+    <form id="changelist-search" class="col search-form" action="{{ view.index_url }}" method="get">
+        <ul class="fields">
+            <li class="required">
+                <div class="field char_field text_input field-small iconfield">
+                    <label for="id_q" class="visuallyhidden">{% trans 'Search for' %}</label>
+                    <div class="field-content">
+                        <div class="input icon-search ">
+                            <input id="id_q" name="{{ search_var }}" value="{{ view.query }}" placeholder="{% blocktrans with view.verbose_name_plural|lower as name %}Search {{ name }}{% endblocktrans %}" type="text">
+                            <span></span>
+                        </div>
                     </div>
                 </div>
-            </div>
-        </li>
-        <li class="submit visuallyhidden"><input type="submit" value="Search" class="button"></li>
-    </ul>
-</form>
-<script type="text/javascript">document.getElementById("id_q").focus();</script>
+            </li>
+            <li class="submit visuallyhidden"><input type="submit" value="Search" class="button"></li>
+        </ul>
+    </form>
+    <script type="text/javascript">document.getElementById("id_q").focus();</script>
 {% endif %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/index.html b/wagtail/contrib/modeladmin/templates/modeladmin/index.html
index a7650b7214..3a069523b9 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/index.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/index.html
@@ -61,10 +61,10 @@
 
                     {% block filters %}
                         {% if view.has_filters and all_count %}
-                        <div class="changelist-filter col3">
-                            <h2>{% trans 'Filter' %}</h2>
-                            {% for spec in view.filter_specs %}{% admin_list_filter view spec %}{% endfor %}
-                        </div>
+                            <div class="changelist-filter col3">
+                                <h2>{% trans 'Filter' %}</h2>
+                                {% for spec in view.filter_specs %}{% admin_list_filter view spec %}{% endfor %}
+                            </div>
                         {% endif %}
                     {% endblock %}
 
@@ -79,11 +79,11 @@
                                         </ul>
                                     {% else %}
                                         <p>{% blocktrans with view.verbose_name_plural as name %}No {{ name }} have been created yet.{% endblocktrans %}
-                                        {% if user_can_create %}
-                                            {% blocktrans with view.create_url as url %}
-                                                Why not <a href="{{ url }}">add one</a>?
-                                            {% endblocktrans %}
-                                        {% endif %}</p>
+                                            {% if user_can_create %}
+                                                {% blocktrans with view.create_url as url %}
+                                                    Why not <a href="{{ url }}">add one</a>?
+                                                {% endblocktrans %}
+                                            {% endif %}</p>
                                     {% endif %}
                                 </div>
                             {% else %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html b/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
index 8a7f4d2a35..ca0bae7663 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
@@ -30,10 +30,10 @@
                 {% block fields_output %}
                     {% if fields %}
                         <dl>
-                        {% for field in fields %}
-                            <dt class="{{ field.type|lower }}">{{ field.label }}</dt>
-                            <dd>{{ field.value }}</dd>
-                        {% endfor %}
+                            {% for field in fields %}
+                                <dt class="{{ field.type|lower }}">{{ field.label }}</dt>
+                                <dd>{{ field.value }}</dd>
+                            {% endfor %}
                         </dl>
                     {% endif %}
                 {% endblock %}
diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/prepopulated_slugs.html b/wagtail/contrib/modeladmin/templates/modeladmin/prepopulated_slugs.html
index 17131db616..d645ff3771 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/prepopulated_slugs.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/prepopulated_slugs.html
@@ -1,6 +1,6 @@
 {% load l10n static %}
 <script type="text/javascript"
-        id="modeladmin-prepopulated-fields-constants"
-        src="{% static "wagtailmodeladmin/js/prepopulate.js" %}"
-        data-prepopulated-fields="{{ prepopulated_fields_json }}">
+    id="modeladmin-prepopulated-fields-constants"
+    src="{% static "wagtailmodeladmin/js/prepopulate.js" %}"
+    data-prepopulated-fields="{{ prepopulated_fields_json }}">
 </script>
diff --git a/wagtail/contrib/redirects/templates/wagtailredirects/results.html b/wagtail/contrib/redirects/templates/wagtailredirects/results.html
index 5c17705390..0f6e191fec 100644
--- a/wagtail/contrib/redirects/templates/wagtailredirects/results.html
+++ b/wagtail/contrib/redirects/templates/wagtailredirects/results.html
@@ -2,11 +2,11 @@
 {% if redirects %}
     {% if query_string %}
         <h2 role="alert">
-        {% blocktrans count counter=redirects.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=redirects.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% endif %}
 
@@ -14,9 +14,9 @@
 
     {% include "wagtailadmin/shared/pagination_nav.html" with items=redirects linkurl="wagtailredirects:index" %}
 {% else %}
-     {% if query_string %}
-         <p role="alert">{% blocktrans %}Sorry, no redirects match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
-     {% else %}
+    {% if query_string %}
+        <p role="alert">{% blocktrans %}Sorry, no redirects match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
+    {% else %}
         {% url 'wagtailredirects:add' as wagtailredirects_add_redirect_url %}
         <p>{% blocktrans %}No redirects have been created. Why not <a href="{{ wagtailredirects_add_redirect_url }}">add one</a>?{% endblocktrans %}</p>
     {% endif %}
diff --git a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html
index 951a92b28c..6913fd7927 100644
--- a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html
+++ b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.html
@@ -7,9 +7,9 @@
 </ul>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-{% escapescript %}
-{% include "wagtailsearchpromotions/includes/searchpromotion_form.html" with form=formset.empty_form only %}
-{% endescapescript %}
+    {% escapescript %}
+        {% include "wagtailsearchpromotions/includes/searchpromotion_form.html" with form=formset.empty_form only %}
+    {% endescapescript %}
 </script>
 
 <p class="add">
diff --git a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/index.html b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/index.html
index 6466a18045..b464a38eaf 100644
--- a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/index.html
+++ b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/index.html
@@ -20,7 +20,7 @@
     {% url "wagtailsearchpromotions:add" as add_link %}
     {% include "wagtailadmin/shared/header.html" with title=sp_title_str action_url=add_link icon="pick" action_text=sp_text_str search_url="wagtailsearchpromotions:index" %}
 
-     <div class="nice-padding">
+    <div class="nice-padding">
         <div id="editorspicks-results" class="redirects">
             {% include "wagtailsearchpromotions/results.html" %}
         </div>
diff --git a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/results.html b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/results.html
index 0572336e55..bd72322da8 100644
--- a/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/results.html
+++ b/wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/results.html
@@ -2,11 +2,11 @@
 {% if queries %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=queries|length %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=queries|length %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% endif %}
 
@@ -15,7 +15,7 @@
     {% include "wagtailadmin/shared/pagination_nav.html" with items=queries linkurl="wagtailsearchpromotions:index" %}
 {% else %}
     {% if is_searching %}
-         <p role="alert">{% blocktrans %}Sorry, no promoted results match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
+        <p role="alert">{% blocktrans %}Sorry, no promoted results match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
     {% else %}
         {% url 'wagtailsearchpromotions:add' as wagtailsearchpromotions_add_url %}
         <p>{% blocktrans %}No promoted results have been created. Why not <a href="{{ wagtailsearchpromotions_add_url }}">add one</a>?{% endblocktrans %}</p>
diff --git a/wagtail/contrib/settings/templates/wagtailsettings/edit.html b/wagtail/contrib/settings/templates/wagtailsettings/edit.html
index 7e67fb65cb..52a1a818c3 100644
--- a/wagtail/contrib/settings/templates/wagtailsettings/edit.html
+++ b/wagtail/contrib/settings/templates/wagtailsettings/edit.html
@@ -16,17 +16,17 @@
             </div>
             <div class="right">
                 {% if site_switcher %}
-                <div class="field choice_field">
-                    <form method="get" class="setting-site-switch-form" id="settings-site-switch" novalidate>
-                        <label for="{{ site_switcher.site.id_for_label }}">
-                            {% trans "Site" %}:
-                        </label>
-                        <div class="input">
-                            {{ site_switcher.site }}
-                            <span></span>
-                        </div>
-                    </form>
-                </div>
+                    <div class="field choice_field">
+                        <form method="get" class="setting-site-switch-form" id="settings-site-switch" novalidate>
+                            <label for="{{ site_switcher.site.id_for_label }}">
+                                {% trans "Site" %}:
+                            </label>
+                            <div class="input">
+                                {{ site_switcher.site }}
+                                <span></span>
+                            </div>
+                        </form>
+                    </div>
                 {% endif %}
             </div>
         </div>
diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
index c36853878a..cc2ec17b67 100644
--- a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
@@ -71,7 +71,7 @@
 
         <section class="palette" id="accessiblecolours">
 
-        <h2>Accessible colour combinations</h2>
+            <h2>Accessible colour combinations</h2>
             <p>WCAG (Web Content Accessibility Guidelines) ensures that content is accessible by everyone, regardless of any disability or user device. To ensure text remains compliant with WCAG 2.0 AA standards, use only these permitted colour combinations.</p>
 
             <p>Use this <a href="https://accessibility.oit.ncsu.edu/tools/color-contrast/accessible-color-palette.php?colors=43b1b0,358c8b,246060,71b2d4,cd3238,e9b04d,189370,f37e77,fcf2f2,ffffff,000000,333333,404040,666666,d9d9d9,e6e6e6,fafafa,cacaca&amp;level=AA">Color Palette Accessibility Checker</a> to test new colour combinations using the existing colour palette.</p>
@@ -753,7 +753,7 @@
 
             <p>&nbsp;</p>
 
-             <div id="progress-example2" class="progress active">
+            <div id="progress-example2" class="progress active">
                 <div class="bar" style="width: 50%;">50%</div>
             </div>
         </section>
@@ -786,21 +786,21 @@
         <section id="icons" class="icons">
             <h2>SVG Icons</h2>
 
-          <style>
-            .spinning {
-              animation-name: spin-wag;
-              animation-duration: 500ms;
-              animation-iteration-count: infinite;
-              animation-timing-function: linear;
-            }
-            @keyframes spin-wag {
-                from {
-                    transform: translateY(0.6em) rotate(0deg);
-                } to {
-                    transform: translateY(0.6em) rotate(360deg);
+            <style>
+                .spinning {
+                    animation-name: spin-wag;
+                    animation-duration: 500ms;
+                    animation-iteration-count: infinite;
+                    animation-timing-function: linear;
                 }
-            }
-          </style>
+                @keyframes spin-wag {
+                    from {
+                        transform: translateY(0.6em) rotate(0deg);
+                    } to {
+                        transform: translateY(0.6em) rotate(360deg);
+                    }
+                }
+            </style>
 
             <ul class="unlist">
                 <li>{% icon 'wagtail-icon' %} wagtail</li>
diff --git a/wagtail/contrib/table_block/templates/table_block/blocks/table.html b/wagtail/contrib/table_block/templates/table_block/blocks/table.html
index 081a071952..05252ae7be 100644
--- a/wagtail/contrib/table_block/templates/table_block/blocks/table.html
+++ b/wagtail/contrib/table_block/templates/table_block/blocks/table.html
@@ -2,58 +2,58 @@
 
 <table>
     {% if table_caption %}
-       <caption>{{ table_caption }}</caption>
+        <caption>{{ table_caption }}</caption>
     {% endif %}
     {% if table_header %}
         <thead>
-        <tr>
-            {% for column in table_header %}
-            {% with forloop.counter0 as col_index %}
-                <th scope="col" {% cell_classname 0 col_index %}>
-                    {% if column.strip %}
-                        {% if html_renderer %}
-                            {{ column.strip|safe|linebreaksbr }}
-                        {% else %}
-                            {{ column.strip|linebreaksbr }}
-                        {% endif %}
-                    {% endif %}
-                </th>
-            {% endwith %}
-            {% endfor %}
-        </tr>
+            <tr>
+                {% for column in table_header %}
+                    {% with forloop.counter0 as col_index %}
+                        <th scope="col" {% cell_classname 0 col_index %}>
+                            {% if column.strip %}
+                                {% if html_renderer %}
+                                    {{ column.strip|safe|linebreaksbr }}
+                                {% else %}
+                                    {{ column.strip|linebreaksbr }}
+                                {% endif %}
+                            {% endif %}
+                        </th>
+                    {% endwith %}
+                {% endfor %}
+            </tr>
         </thead>
     {% endif %}
     <tbody>
-    {% for row in data %}
-    {% with forloop.counter0 as row_index %}
-        <tr>
-            {% for column in row %}
-            {% with forloop.counter0 as col_index %}
-                {% if first_col_is_header and forloop.first %}
-                    <th scope="row" {% cell_classname row_index col_index table_header %}>
-                        {% if column.strip %}
-                            {% if html_renderer %}
-                                {{ column.strip|safe|linebreaksbr }}
+        {% for row in data %}
+            {% with forloop.counter0 as row_index %}
+                <tr>
+                    {% for column in row %}
+                        {% with forloop.counter0 as col_index %}
+                            {% if first_col_is_header and forloop.first %}
+                                <th scope="row" {% cell_classname row_index col_index table_header %}>
+                                    {% if column.strip %}
+                                        {% if html_renderer %}
+                                            {{ column.strip|safe|linebreaksbr }}
+                                        {% else %}
+                                            {{ column.strip|linebreaksbr }}
+                                        {% endif %}
+                                    {% endif %}
+                                </th>
                             {% else %}
-                                {{ column.strip|linebreaksbr }}
+                                <td {% cell_classname row_index col_index table_header %}>
+                                    {% if column.strip %}
+                                        {% if html_renderer %}
+                                            {{ column.strip|safe|linebreaksbr }}
+                                        {% else %}
+                                            {{ column.strip|linebreaksbr }}
+                                        {% endif %}
+                                    {% endif %}
+                                </td>
                             {% endif %}
-                        {% endif %}
-                    </th>
-                 {% else %}
-                    <td {% cell_classname row_index col_index table_header %}>
-                        {% if column.strip %}
-                            {% if html_renderer %}
-                                {{ column.strip|safe|linebreaksbr }}
-                            {% else %}
-                                {{ column.strip|linebreaksbr }}
-                            {% endif %}
-                        {% endif %}
-                    </td>
-                 {% endif %}
+                        {% endwith %}
+                    {% endfor %}
+                </tr>
             {% endwith %}
-            {% endfor %}
-        </tr>
-    {% endwith %}
-    {% endfor %}
+        {% endfor %}
     </tbody>
 </table>
diff --git a/wagtail/contrib/typed_table_block/templates/typed_table_block/typed_table_block.html b/wagtail/contrib/typed_table_block/templates/typed_table_block/typed_table_block.html
index 52837555ad..66430f31b7 100644
--- a/wagtail/contrib/typed_table_block/templates/typed_table_block/typed_table_block.html
+++ b/wagtail/contrib/typed_table_block/templates/typed_table_block/typed_table_block.html
@@ -3,17 +3,17 @@
     <thead>
         <tr>
             {% for col in value.columns %}
-            <th scope="col">{{ col.heading }}</th>
+                <th scope="col">{{ col.heading }}</th>
             {% endfor %}
         </tr>
     </thead>
     <tbody>
         {% for row in value.rows %}
-        <tr>
-            {% for block in row %}
-            <td>{% include_block block %}</td>
-            {% endfor %}
-        </tr>
+            <tr>
+                {% for block in row %}
+                    <td>{% include_block block %}</td>
+                {% endfor %}
+            </tr>
         {% endfor %}
     </tbody>
 </table>
diff --git a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html
index 113698257c..7fae6c8654 100644
--- a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html
+++ b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html
@@ -22,27 +22,27 @@
 
 {% block items_with_access %}
     {% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to tag the following document?
-        {% plural %}
-        Are you sure you want to tag the following documents?
-        {% endblocktrans %}
-    </p>
-    <ul>
-        {% for document in items %}
-        <li>
-            <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
-        </li>
-        {% endfor %}
-    </ul>
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to tag the following document?
+            {% plural %}
+                Are you sure you want to tag the following documents?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% for document in items %}
+                <li>
+                    <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
+                </li>
+            {% endfor %}
+        </ul>
     {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add tags to this document{% plural %}You don't have permission to add tags to these documents{% endblocktrans %}
-{% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add tags to this document{% plural %}You don't have permission to add tags to these documents{% endblocktrans %}
+    {% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html
index 30b51749fe..bfcfea6869 100644
--- a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html
+++ b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html
@@ -10,27 +10,27 @@
 
 {% block items_with_access %}
     {% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to add the following document to the selected collection?
-        {% plural %}
-        Are you sure you want to add the following documents to the selected collection?
-        {% endblocktrans %}
-    </p>
-    <ul>
-        {% for document in items %}
-        <li>
-            <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
-        </li>
-        {% endfor %}
-    </ul>
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to add the following document to the selected collection?
+            {% plural %}
+                Are you sure you want to add the following documents to the selected collection?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% for document in items %}
+                <li>
+                    <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
+                </li>
+            {% endfor %}
+        </ul>
     {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add this document to a collection{% plural %}You don't have permission to add these documents to a collection{% endblocktrans %}
-{% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add this document to a collection{% plural %}You don't have permission to add these documents to a collection{% endblocktrans %}
+    {% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html
index 65ef2449d4..468834a16b 100644
--- a/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html
+++ b/wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html
@@ -9,31 +9,31 @@
 
 {% block items_with_access %}
     {% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to delete this document?
-        {% plural %}
-        Are you sure you want to delete these documents?
-        {% endblocktrans %}
-    </p>
-    <ul>
-    {% for document in items %}
-        <li>
-            <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
-            {% usage_count_enabled as uc_enabled %}
-            {% if uc_enabled %}
-            (<a href="{{ document.item.usage_url }}">{% blocktrans count usage_count=document.item.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
-            {% endif %}
-        </li>
-    {% endfor %}
-    </ul>
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to delete this document?
+            {% plural %}
+                Are you sure you want to delete these documents?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% for document in items %}
+                <li>
+                    <a href="{% url 'wagtaildocs:edit' document.item.id %}"  target="_blank" rel="noopener noreferrer">{{document.item.title}}</a>
+                    {% usage_count_enabled as uc_enabled %}
+                    {% if uc_enabled %}
+                        (<a href="{{ document.item.usage_url }}">{% blocktrans count usage_count=document.item.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
+                    {% endif %}
+                </li>
+            {% endfor %}
+        </ul>
     {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this document{% plural %}You don't have permission to delete these documents{% endblocktrans %}
-{% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this document{% plural %}You don't have permission to delete these documents{% endblocktrans %}
+    {% include 'wagtaildocs/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/documents/templates/wagtaildocs/bulk_actions/list_items_with_no_access.html b/wagtail/documents/templates/wagtaildocs/bulk_actions/list_items_with_no_access.html
index 003d3a85f6..86507e3ee4 100644
--- a/wagtail/documents/templates/wagtaildocs/bulk_actions/list_items_with_no_access.html
+++ b/wagtail/documents/templates/wagtaildocs/bulk_actions/list_items_with_no_access.html
@@ -3,8 +3,8 @@
 
 {% block per_item %}
     {% if item.can_edit %}
-    <a href="{% url 'wagtaildocs:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.title }}</a>
+        <a href="{% url 'wagtaildocs:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.title }}</a>
     {% else %}
-    {{ item.item.title }}
+        {{ item.item.title }}
     {% endif %}
 {% endblock per_item %}
diff --git a/wagtail/documents/templates/wagtaildocs/chooser/results.html b/wagtail/documents/templates/wagtaildocs/chooser/results.html
index 49a0c3554b..445be82105 100644
--- a/wagtail/documents/templates/wagtaildocs/chooser/results.html
+++ b/wagtail/documents/templates/wagtaildocs/chooser/results.html
@@ -2,11 +2,11 @@
 {% if documents %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=documents.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=documents.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% else %}
         <h2>{% trans "Latest documents" %}</h2>
@@ -19,17 +19,17 @@
         <p role="alert">{% blocktrans %}Sorry, no documents match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
     {% else %}
         <p>
-        {% if collection_id %}
-            {% trans "You haven't uploaded any documents in this collection." %}
-        {% else %}
-            {% trans "You haven't uploaded any documents." %}
-        {% endif %}
-        {% if uploadform %}
-            {% url 'wagtaildocs:add_multiple' as wagtaildocs_add_document_url %}
-            {% blocktrans %}
-            Why not <a class="upload-one-now" href="{{ wagtaildocs_add_document_url }}">upload one now</a>?
-            {% endblocktrans %}
-        {% endif %}
+            {% if collection_id %}
+                {% trans "You haven't uploaded any documents in this collection." %}
+            {% else %}
+                {% trans "You haven't uploaded any documents." %}
+            {% endif %}
+            {% if uploadform %}
+                {% url 'wagtaildocs:add_multiple' as wagtaildocs_add_document_url %}
+                {% blocktrans %}
+                    Why not <a class="upload-one-now" href="{{ wagtaildocs_add_document_url }}">upload one now</a>?
+                {% endblocktrans %}
+            {% endif %}
         </p>
     {% endif %}
 {% endif %}
diff --git a/wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html b/wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html
index 8676aa79a9..a974fe81ce 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html
@@ -17,9 +17,9 @@
         <p>
             {# This message will only appear in the singular, but we specify a plural so it can share the translation string with confirm_bulk_delete.html #}
             {% blocktrans trimmed count counter=1 %}
-            Are you sure you want to delete this document?
+                Are you sure you want to delete this document?
             {% plural %}
-            Are you sure you want to delete these documents?
+                Are you sure you want to delete these documents?
             {% endblocktrans %}
         </p>
         <form action="{% url 'wagtaildocs:delete' document.id %}" method="POST">
diff --git a/wagtail/documents/templates/wagtaildocs/documents/results.html b/wagtail/documents/templates/wagtaildocs/documents/results.html
index ca75dbd21c..69d98c39d0 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/results.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/results.html
@@ -2,11 +2,11 @@
 {% if documents %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=documents|length %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=documents|length %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
 
         {% search_other %}
@@ -17,9 +17,9 @@
     {% include "wagtailadmin/shared/pagination_nav.html" with items=documents %}
 {% else %}
     {% if is_searching %}
-         <h2 role="alert">{% blocktrans %}Sorry, no documents match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
+        <h2 role="alert">{% blocktrans %}Sorry, no documents match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
 
-         {% search_other %}
+        {% search_other %}
     {% else %}
         {% url 'wagtaildocs:add_multiple' as wagtaildocs_add_document_url %}
         {% if current_collection %}
diff --git a/wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html b/wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html
index 8d4d5ba327..361f721a52 100644
--- a/wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html
+++ b/wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html
@@ -3,10 +3,10 @@
 <li>
     {% icon name="doc-full-inverse" %}
     <a href="{% url 'wagtaildocs:index' %}">
-    {% blocktrans count counter=total_docs with total_docs|intcomma as total %}
-        <span>{{ total }}</span> Document <span class="visuallyhidden">created in {{ site_name }}</span>
-    {% plural %}
-        <span>{{ total }}</span> Documents <span class="visuallyhidden">created in {{ site_name }}</span>
-    {% endblocktrans %}
+        {% blocktrans count counter=total_docs with total_docs|intcomma as total %}
+            <span>{{ total }}</span> Document <span class="visuallyhidden">created in {{ site_name }}</span>
+        {% plural %}
+            <span>{{ total }}</span> Documents <span class="visuallyhidden">created in {{ site_name }}</span>
+        {% endblocktrans %}
     </a>
 </li>
diff --git a/wagtail/documents/templates/wagtaildocs/multiple/add.html b/wagtail/documents/templates/wagtaildocs/multiple/add.html
index cb61926853..2f3996deb8 100644
--- a/wagtail/documents/templates/wagtaildocs/multiple/add.html
+++ b/wagtail/documents/templates/wagtaildocs/multiple/add.html
@@ -34,13 +34,13 @@
                                 {% minimum_collection_depth collections as min_depth %}
                                 {% for collection in collections %}
                                     <option value="{{ collection.id|unlocalize }}">
-                                      {% if request.user.is_superuser %}
-                                          {# Superuser may see all collections. #}
-                                          {% format_collection collection %}
-                                      {% else %}
-                                          {# Pass the minimum depth of the permitted collections, since user isn't a superuser #}
-                                          {% format_collection collection min_depth %}
-                                      {% endif %}
+                                        {% if request.user.is_superuser %}
+                                            {# Superuser may see all collections. #}
+                                            {% format_collection collection %}
+                                        {% else %}
+                                            {# Pass the minimum depth of the permitted collections, since user isn't a superuser #}
+                                            {% format_collection collection min_depth %}
+                                        {% endif %}
                                     </option>
                                 {% endfor %}
                             </select>
diff --git a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_tags.html b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_tags.html
index d4de9705ea..a975ba8f96 100644
--- a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_tags.html
+++ b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_tags.html
@@ -22,27 +22,27 @@
 
 {% block items_with_access %}
     {% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to tag the following image?
-        {% plural %}
-        Are you sure you want to tag the following images?
-        {% endblocktrans %}
-    </p>
-    <ul>
-        {% for image in items %}
-        <li>
-            <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
-        </li>
-        {% endfor %}
-    </ul>
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to tag the following image?
+            {% plural %}
+                Are you sure you want to tag the following images?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% for image in items %}
+                <li>
+                    <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
+                </li>
+            {% endfor %}
+        </ul>
     {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add tags to this image{% plural %}You don't have permission to add tags to these images{% endblocktrans %}
-{% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add tags to this image{% plural %}You don't have permission to add tags to these images{% endblocktrans %}
+    {% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_to_collection.html b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_to_collection.html
index 25b25b2d65..be4cd42690 100644
--- a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_to_collection.html
+++ b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_add_to_collection.html
@@ -9,28 +9,28 @@
 {% endblock header %}
 
 {% block items_with_access %}
-{% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to add the following image to the selected collection?
-        {% plural %}
-        Are you sure you want to add the following images to the selected collection?
-        {% endblocktrans %}
-    </p>
-    <ul>
-        {% for image in items %}
-        <li>
-            <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
-        </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+    {% if items %}
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to add the following image to the selected collection?
+            {% plural %}
+                Are you sure you want to add the following images to the selected collection?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% for image in items %}
+                <li>
+                    <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add this image to a collection{% plural %}You don't have permission to add these images to a collection{% endblocktrans %}
-{% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to add this image to a collection{% plural %}You don't have permission to add these images to a collection{% endblocktrans %}
+    {% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_delete.html b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_delete.html
index ad10f8c9bd..b8ffc2df62 100644
--- a/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_delete.html
+++ b/wagtail/images/templates/wagtailimages/bulk_actions/confirm_bulk_delete.html
@@ -8,32 +8,32 @@
 {% endblock header %}
 
 {% block items_with_access %}
-{% if items %}
-    <p>
-        {% blocktrans trimmed count counter=items|length %}
-        Are you sure you want to delete this image?
-        {% plural %}
-        Are you sure you want to delete these images?
-        {% endblocktrans %}
-    </p>
-    <ul>
-    {% usage_count_enabled as uc_enabled %}
-    {% for image in items %}
-        <li>
-            <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
-            {% if uc_enabled %}
-            (<a href="{{ image.item.usage_url }}">{% blocktrans count usage_count=image.item.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
-            {% endif %}
-        </li>
-    {% endfor %}
-    </ul>
-{% endif %}
+    {% if items %}
+        <p>
+            {% blocktrans trimmed count counter=items|length %}
+                Are you sure you want to delete this image?
+            {% plural %}
+                Are you sure you want to delete these images?
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% usage_count_enabled as uc_enabled %}
+            {% for image in items %}
+                <li>
+                    <a href="{% url 'wagtailimages:edit' image.item.id %}"  target="_blank" rel="noopener noreferrer">{{image.item.title}}</a>
+                    {% if uc_enabled %}
+                        (<a href="{{ image.item.usage_url }}">{% blocktrans count usage_count=image.item.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
+                    {% endif %}
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this image{% plural %}You don't have permission to delete these images{% endblocktrans %}
-{% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this image{% plural %}You don't have permission to delete these images{% endblocktrans %}
+    {% include 'wagtailimages/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
diff --git a/wagtail/images/templates/wagtailimages/bulk_actions/list_items_with_no_access.html b/wagtail/images/templates/wagtailimages/bulk_actions/list_items_with_no_access.html
index 27577e9d86..1da47f46a0 100644
--- a/wagtail/images/templates/wagtailimages/bulk_actions/list_items_with_no_access.html
+++ b/wagtail/images/templates/wagtailimages/bulk_actions/list_items_with_no_access.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 
 {% block per_item %}
-{% if item.can_edit %}
-    <a href="{% url 'wagtailimages:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.title }}</a>
-{% else %}
-    {{ item.item.title }}
-{% endif %}
+    {% if item.can_edit %}
+        <a href="{% url 'wagtailimages:edit' item.item.id %}" target="_blank" rel="noopener noreferrer">{{ item.item.title }}</a>
+    {% else %}
+        {{ item.item.title }}
+    {% endif %}
 {% endblock per_item %}
diff --git a/wagtail/images/templates/wagtailimages/chooser/results.html b/wagtail/images/templates/wagtailimages/chooser/results.html
index f44e80acb8..94cb50f906 100644
--- a/wagtail/images/templates/wagtailimages/chooser/results.html
+++ b/wagtail/images/templates/wagtailimages/chooser/results.html
@@ -3,11 +3,11 @@
 {% if images %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=images.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=images.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% else %}
         <h2>{% trans "Latest images" %}</h2>
diff --git a/wagtail/images/templates/wagtailimages/homepage/site_summary_images.html b/wagtail/images/templates/wagtailimages/homepage/site_summary_images.html
index c68ddb44c1..92c92bf55e 100644
--- a/wagtail/images/templates/wagtailimages/homepage/site_summary_images.html
+++ b/wagtail/images/templates/wagtailimages/homepage/site_summary_images.html
@@ -3,10 +3,10 @@
 <li>
     {% icon name="image" %}
     <a href="{% url 'wagtailimages:index' %}">
-    {% blocktrans count counter=total_images with total_images|intcomma as total %}
-        <span>{{ total }}</span> Image <span class="visuallyhidden">created in {{ site_name }}</span>
-    {% plural %}
-        <span>{{ total }}</span> Images <span class="visuallyhidden">created in {{ site_name }}</span>
-    {% endblocktrans %}
+        {% blocktrans count counter=total_images with total_images|intcomma as total %}
+            <span>{{ total }}</span> Image <span class="visuallyhidden">created in {{ site_name }}</span>
+        {% plural %}
+            <span>{{ total }}</span> Images <span class="visuallyhidden">created in {{ site_name }}</span>
+        {% endblocktrans %}
     </a>
 </li>
diff --git a/wagtail/images/templates/wagtailimages/images/_file_field.html b/wagtail/images/templates/wagtailimages/images/_file_field.html
index 4f1d62903e..091330d165 100644
--- a/wagtail/images/templates/wagtailimages/images/_file_field.html
+++ b/wagtail/images/templates/wagtailimages/images/_file_field.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/shared/field.html" %}
 {% load i18n wagtailimages_tags %}
 {% block form_field %}
-	{% image image original as original_image %}
+    {% image image original as original_image %}
 
     <a href="{{ original_image.url }}" class="icon icon-image">{{ image.filename }}</a> ({{ original_image.width }}x{{ original_image.height}})<br /><br />
 
diff --git a/wagtail/images/templates/wagtailimages/images/index.html b/wagtail/images/templates/wagtailimages/images/index.html
index 34f88ad3e0..86af37fadd 100644
--- a/wagtail/images/templates/wagtailimages/images/index.html
+++ b/wagtail/images/templates/wagtailimages/images/index.html
@@ -46,21 +46,21 @@
                     {% endif %}
                 {% endif %}
                 {% if popular_tags %}
-                <li>
-                    <fieldset class="tagfilter">
-                    <legend>{% trans 'Popular Tags:' %}</legend>
-                      {% for tag in popular_tags %}
-                          {% if tag.name != current_tag %}
-                              <a class="button button-small button-secondary bicolor button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag=tag.name %}">{% icon name="tag" wrapped=1 %}{{ tag.name }}</a>
-                          {% else %}
-                              <a class="button button-small bicolor button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag=tag.name %}">{% icon name="tag" wrapped=1 %}{{ tag.name }}</a>
-                          {% endif %}
-                      {% endfor %}
-                      {% if current_tag %}
-                          <a class="button button-small bicolor button-secondary button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag='' %}">{% icon name="cross" wrapped=1 %}{% trans 'Clear choice' %}</a>
-                      {% endif %}
-                    </fieldset>
-                </li>
+                    <li>
+                        <fieldset class="tagfilter">
+                            <legend>{% trans 'Popular Tags:' %}</legend>
+                            {% for tag in popular_tags %}
+                                {% if tag.name != current_tag %}
+                                    <a class="button button-small button-secondary bicolor button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag=tag.name %}">{% icon name="tag" wrapped=1 %}{{ tag.name }}</a>
+                                {% else %}
+                                    <a class="button button-small bicolor button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag=tag.name %}">{% icon name="tag" wrapped=1 %}{{ tag.name }}</a>
+                                {% endif %}
+                            {% endfor %}
+                            {% if current_tag %}
+                                <a class="button button-small bicolor button-secondary button--icon" href="{% url 'wagtailimages:index' %}{% querystring tag='' %}">{% icon name="cross" wrapped=1 %}{% trans 'Clear choice' %}</a>
+                            {% endif %}
+                        </fieldset>
+                    </li>
                 {% endif %}
             </ul>
         </form>
diff --git a/wagtail/images/templates/wagtailimages/images/results.html b/wagtail/images/templates/wagtailimages/images/results.html
index 570843c189..26e87a8c51 100644
--- a/wagtail/images/templates/wagtailimages/images/results.html
+++ b/wagtail/images/templates/wagtailimages/images/results.html
@@ -3,11 +3,11 @@
 {% if images %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=images.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=images.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
 
         {% search_other %}
diff --git a/wagtail/images/templates/wagtailimages/multiple/add.html b/wagtail/images/templates/wagtailimages/multiple/add.html
index 60e0565bc0..96b06331cd 100644
--- a/wagtail/images/templates/wagtailimages/multiple/add.html
+++ b/wagtail/images/templates/wagtailimages/multiple/add.html
@@ -34,13 +34,13 @@
                                 {% minimum_collection_depth collections as min_depth %}
                                 {% for collection in collections %}
                                     <option value="{{ collection.id|unlocalize }}">
-                                      {% if request.user.is_superuser %}
-                                          {# Superuser may see all collections. #}
-                                          {% format_collection collection %}
-                                      {% else %}
-                                          {# Pass the minimum depth of the permitted collections, since user isn't a superuser #}
-                                          {% format_collection collection min_depth %}
-                                      {% endif %}
+                                        {% if request.user.is_superuser %}
+                                            {# Superuser may see all collections. #}
+                                            {% format_collection collection %}
+                                        {% else %}
+                                            {# Pass the minimum depth of the permitted collections, since user isn't a superuser #}
+                                            {% format_collection collection min_depth %}
+                                        {% endif %}
                                     </option>
                                 {% endfor %}
                             </select>
diff --git a/wagtail/project_template/home/templates/home/welcome_page.html b/wagtail/project_template/home/templates/home/welcome_page.html
index af0a372a6f..1ff62aa779 100644
--- a/wagtail/project_template/home/templates/home/welcome_page.html
+++ b/wagtail/project_template/home/templates/home/welcome_page.html
@@ -1,52 +1,52 @@
 {% templatetag openblock %} load i18n wagtailcore_tags {% templatetag closeblock %}
 
 <header class="header">
-  <div class="logo">
-    <a href="https://wagtail.org/">
-      <svg class="figure-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 342.5 126.2"><title>{% templatetag openblock %} trans "Visit the Wagtail website" {% templatetag closeblock %}</title><path fill="#FFF" d="M84 1.9v5.7s-10.2-3.8-16.8 3.1c-4.8 5-5.2 10.6-3 18.1 21.6 0 25 12.1 25 12.1L87 27l6.8-8.3c0-9.8-8.1-16.3-9.8-16.8z"/><circle cx="85.9" cy="15.9" r="2.6"/><path d="M89.2 40.9s-3.3-16.6-24.9-12.1c-2.2-7.5-1.8-13 3-18.1C73.8 3.8 84 7.6 84 7.6V1.9C80.4.3 77 0 73.2 0 59.3 0 51.6 10.4 48.3 17.4L9.2 89.3l11-2.1-20.2 39 14.1-2.5L24.9 93c30.6 0 69.8-11 64.3-52.1z"/><path d="M102.4 27l-8.6-8.3L87 27z"/><path fill="#FFF" d="M30 84.1s1-.2 2.8-.6c1.8-.4 4.3-1 7.3-1.8 1.5-.4 3.1-.9 4.8-1.5 1.7-.6 3.5-1.2 5.2-2 1.8-.7 3.6-1.6 5.4-2.6 1.8-1 3.5-2.1 5.1-3.4.4-.3.8-.6 1.2-1l1.2-1c.7-.7 1.5-1.4 2.2-2.2.7-.7 1.3-1.5 1.9-2.3l.9-1.2.4-.6.4-.6c.2-.4.5-.8.7-1.2.2-.4.4-.8.7-1.2l.3-.6.3-.6c.2-.4.4-.8.5-1.2l.9-2.4c.2-.8.5-1.6.7-2.3.2-.7.3-1.5.5-2.1.1-.7.2-1.3.3-2 .1-.6.2-1.2.2-1.7.1-.5.1-1 .2-1.5.1-1.8.1-2.8.1-2.8l1.6.1s-.1 1.1-.2 2.9c-.1.5-.1 1-.2 1.5-.1.6-.1 1.2-.3 1.8-.1.6-.3 1.3-.4 2-.2.7-.4 1.4-.6 2.2-.2.8-.5 1.5-.8 2.4-.3.8-.6 1.6-1 2.5l-.6 1.2-.3.6-.3.6c-.2.4-.5.8-.7 1.3-.3.4-.5.8-.8 1.2-.1.2-.3.4-.4.6l-.4.6-.9 1.2c-.7.8-1.3 1.6-2.1 2.3-.7.8-1.5 1.4-2.3 2.2l-1.2 1c-.4.3-.8.6-1.3.9-1.7 1.2-3.5 2.3-5.3 3.3-1.8.9-3.7 1.8-5.5 2.5-1.8.7-3.6 1.3-5.3 1.8-1.7.5-3.3 1-4.9 1.3-3 .7-5.6 1.3-7.4 1.6-1.6.6-2.6.8-2.6.8z"/><g fill="#231F20"><path d="M127 83.9h-8.8l-12.6-36.4h7.9l9 27.5 9-27.5h7.9l9 27.5 9-27.5h7.9L153 83.9h-8.8L135.6 59 127 83.9zM200.1 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM241.7 47.5v31.7c0 6.4-1.7 11.3-5.2 14.5-3.5 3.2-8 4.8-13.4 4.8-5.5 0-10.4-1.7-14.8-5.1l3.6-5.8c3.6 2.7 7.1 4 10.8 4 3.6 0 6.5-.9 8.6-2.8 2.1-1.9 3.2-4.9 3.2-9v-4.7c-1.1 2.1-2.8 3.9-4.9 5.1-2.1 1.3-4.5 1.9-7.1 1.9-4.8 0-8.8-1.7-11.9-5.1-3.1-3.4-4.7-7.6-4.7-12.6s1.6-9.2 4.7-12.6c3.1-3.4 7.1-5.1 11.9-5.1 4.8 0 8.7 2 11.7 6v-5.4h7.5zm-28.4 16.8c0 3 .9 5.6 2.8 7.7 1.8 2.2 4.3 3.2 7.5 3.2 3.1 0 5.7-1 7.6-3.1 1.9-2.1 2.9-4.7 2.9-7.8 0-3.1-1-5.8-2.9-7.9-2-2.2-4.5-3.2-7.6-3.2-3.1 0-5.6 1.1-7.4 3.4-2 2.1-2.9 4.7-2.9 7.7zM260.9 53.6v18.5c0 1.7.5 3.1 1.4 4.1.9 1 2.2 1.5 3.8 1.5 1.6 0 3.2-.8 4.7-2.4l3.1 5.4c-2.7 2.4-5.7 3.6-8.9 3.6-3.3 0-6-1.1-8.3-3.4-2.3-2.3-3.5-5.3-3.5-9.1V53.6h-4.6v-6.2h4.6V36.1h7.7v11.4h9.6v6.2h-9.6zM309.5 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM319.3 40.2c-1-1-1.4-2.1-1.4-3.4 0-1.3.5-2.5 1.4-3.4 1-1 2.1-1.4 3.4-1.4 1.3 0 2.5.5 3.4 1.4 1 1 1.4 2.1 1.4 3.4 0 1.3-.5 2.5-1.4 3.4s-2.1 1.4-3.4 1.4c-1.3.1-2.4-.4-3.4-1.4zm7.2 43.7h-7.7V47.5h7.7v36.4zM342.5 83.9h-7.7V33.1h7.7v50.8z"/></g></svg>
-    </a>
-  </div>
-  <div class="header-link">
-    {% templatetag openblock %} comment {% templatetag closeblock %}
-      This works for all cases but prerelease versions:
-    {% templatetag openblock %} endcomment {% templatetag closeblock %}
-    <a href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/releases/{% templatetag openblock %} wagtail_release_notes_path {% templatetag closeblock %}">
-      {% templatetag openblock %} trans "View the release notes" {% templatetag closeblock %}
-    </a>
-  </div>
+    <div class="logo">
+        <a href="https://wagtail.org/">
+            <svg class="figure-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 342.5 126.2"><title>{% templatetag openblock %} trans "Visit the Wagtail website" {% templatetag closeblock %}</title><path fill="#FFF" d="M84 1.9v5.7s-10.2-3.8-16.8 3.1c-4.8 5-5.2 10.6-3 18.1 21.6 0 25 12.1 25 12.1L87 27l6.8-8.3c0-9.8-8.1-16.3-9.8-16.8z"/><circle cx="85.9" cy="15.9" r="2.6"/><path d="M89.2 40.9s-3.3-16.6-24.9-12.1c-2.2-7.5-1.8-13 3-18.1C73.8 3.8 84 7.6 84 7.6V1.9C80.4.3 77 0 73.2 0 59.3 0 51.6 10.4 48.3 17.4L9.2 89.3l11-2.1-20.2 39 14.1-2.5L24.9 93c30.6 0 69.8-11 64.3-52.1z"/><path d="M102.4 27l-8.6-8.3L87 27z"/><path fill="#FFF" d="M30 84.1s1-.2 2.8-.6c1.8-.4 4.3-1 7.3-1.8 1.5-.4 3.1-.9 4.8-1.5 1.7-.6 3.5-1.2 5.2-2 1.8-.7 3.6-1.6 5.4-2.6 1.8-1 3.5-2.1 5.1-3.4.4-.3.8-.6 1.2-1l1.2-1c.7-.7 1.5-1.4 2.2-2.2.7-.7 1.3-1.5 1.9-2.3l.9-1.2.4-.6.4-.6c.2-.4.5-.8.7-1.2.2-.4.4-.8.7-1.2l.3-.6.3-.6c.2-.4.4-.8.5-1.2l.9-2.4c.2-.8.5-1.6.7-2.3.2-.7.3-1.5.5-2.1.1-.7.2-1.3.3-2 .1-.6.2-1.2.2-1.7.1-.5.1-1 .2-1.5.1-1.8.1-2.8.1-2.8l1.6.1s-.1 1.1-.2 2.9c-.1.5-.1 1-.2 1.5-.1.6-.1 1.2-.3 1.8-.1.6-.3 1.3-.4 2-.2.7-.4 1.4-.6 2.2-.2.8-.5 1.5-.8 2.4-.3.8-.6 1.6-1 2.5l-.6 1.2-.3.6-.3.6c-.2.4-.5.8-.7 1.3-.3.4-.5.8-.8 1.2-.1.2-.3.4-.4.6l-.4.6-.9 1.2c-.7.8-1.3 1.6-2.1 2.3-.7.8-1.5 1.4-2.3 2.2l-1.2 1c-.4.3-.8.6-1.3.9-1.7 1.2-3.5 2.3-5.3 3.3-1.8.9-3.7 1.8-5.5 2.5-1.8.7-3.6 1.3-5.3 1.8-1.7.5-3.3 1-4.9 1.3-3 .7-5.6 1.3-7.4 1.6-1.6.6-2.6.8-2.6.8z"/><g fill="#231F20"><path d="M127 83.9h-8.8l-12.6-36.4h7.9l9 27.5 9-27.5h7.9l9 27.5 9-27.5h7.9L153 83.9h-8.8L135.6 59 127 83.9zM200.1 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM241.7 47.5v31.7c0 6.4-1.7 11.3-5.2 14.5-3.5 3.2-8 4.8-13.4 4.8-5.5 0-10.4-1.7-14.8-5.1l3.6-5.8c3.6 2.7 7.1 4 10.8 4 3.6 0 6.5-.9 8.6-2.8 2.1-1.9 3.2-4.9 3.2-9v-4.7c-1.1 2.1-2.8 3.9-4.9 5.1-2.1 1.3-4.5 1.9-7.1 1.9-4.8 0-8.8-1.7-11.9-5.1-3.1-3.4-4.7-7.6-4.7-12.6s1.6-9.2 4.7-12.6c3.1-3.4 7.1-5.1 11.9-5.1 4.8 0 8.7 2 11.7 6v-5.4h7.5zm-28.4 16.8c0 3 .9 5.6 2.8 7.7 1.8 2.2 4.3 3.2 7.5 3.2 3.1 0 5.7-1 7.6-3.1 1.9-2.1 2.9-4.7 2.9-7.8 0-3.1-1-5.8-2.9-7.9-2-2.2-4.5-3.2-7.6-3.2-3.1 0-5.6 1.1-7.4 3.4-2 2.1-2.9 4.7-2.9 7.7zM260.9 53.6v18.5c0 1.7.5 3.1 1.4 4.1.9 1 2.2 1.5 3.8 1.5 1.6 0 3.2-.8 4.7-2.4l3.1 5.4c-2.7 2.4-5.7 3.6-8.9 3.6-3.3 0-6-1.1-8.3-3.4-2.3-2.3-3.5-5.3-3.5-9.1V53.6h-4.6v-6.2h4.6V36.1h7.7v11.4h9.6v6.2h-9.6zM309.5 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM319.3 40.2c-1-1-1.4-2.1-1.4-3.4 0-1.3.5-2.5 1.4-3.4 1-1 2.1-1.4 3.4-1.4 1.3 0 2.5.5 3.4 1.4 1 1 1.4 2.1 1.4 3.4 0 1.3-.5 2.5-1.4 3.4s-2.1 1.4-3.4 1.4c-1.3.1-2.4-.4-3.4-1.4zm7.2 43.7h-7.7V47.5h7.7v36.4zM342.5 83.9h-7.7V33.1h7.7v50.8z"/></g></svg>
+        </a>
+    </div>
+    <div class="header-link">
+        {% templatetag openblock %} comment {% templatetag closeblock %}
+        This works for all cases but prerelease versions:
+        {% templatetag openblock %} endcomment {% templatetag closeblock %}
+        <a href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/releases/{% templatetag openblock %} wagtail_release_notes_path {% templatetag closeblock %}">
+            {% templatetag openblock %} trans "View the release notes" {% templatetag closeblock %}
+        </a>
+    </div>
 </header>
 <main class="main">
-  <div class="figure">
-    <svg class="figure-space" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300" aria-hidden="true">
-      <path class="egg" fill="currentColor" d="M150 250c-42.741 0-75-32.693-75-90s42.913-110 75-110c32.088 0 75 52.693 75 110s-32.258 90-75 90z"/>
-      <ellipse fill="#ddd" cx="150" cy="270" rx="40" ry="7"/>
-    </svg>
-  </div>
-  <div class="main-text">
-    <h1>{% templatetag openblock %} trans "Welcome to your new Wagtail site!" {% templatetag closeblock %}</h1>
-    <p>{% templatetag openblock %} trans 'Please feel free to <a href="https://github.com/wagtail/wagtail/wiki/Slack">join our community on Slack</a>, or get started with one of the links below.' {% templatetag closeblock %}</p>
-  </div>
+    <div class="figure">
+        <svg class="figure-space" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300" aria-hidden="true">
+            <path class="egg" fill="currentColor" d="M150 250c-42.741 0-75-32.693-75-90s42.913-110 75-110c32.088 0 75 52.693 75 110s-32.258 90-75 90z"/>
+            <ellipse fill="#ddd" cx="150" cy="270" rx="40" ry="7"/>
+        </svg>
+    </div>
+    <div class="main-text">
+        <h1>{% templatetag openblock %} trans "Welcome to your new Wagtail site!" {% templatetag closeblock %}</h1>
+        <p>{% templatetag openblock %} trans 'Please feel free to <a href="https://github.com/wagtail/wagtail/wiki/Slack">join our community on Slack</a>, or get started with one of the links below.' {% templatetag closeblock %}</p>
+    </div>
 </main>
 <footer class="footer" role="contentinfo">
-  <a class="option option-one" href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M9 21c0 .5.4 1 1 1h4c.6 0 1-.5 1-1v-1H9v1zm3-19C8.1 2 5 5.1 5 9c0 2.4 1.2 4.5 3 5.7V17c0 .5.4 1 1 1h6c.6 0 1-.5 1-1v-2.3c1.8-1.3 3-3.4 3-5.7 0-3.9-3.1-7-7-7zm2.9 11.1l-.9.6V16h-4v-2.3l-.9-.6C7.8 12.2 7 10.6 7 9c0-2.8 2.2-5 5-5s5 2.2 5 5c0 1.6-.8 3.2-2.1 4.1z"/></svg>
-    <div>
-      <h4>{% templatetag openblock %} trans "Wagtail Documentation" {% templatetag closeblock %}</h4>
-      <p>{% templatetag openblock %} trans "Topics, references, & how-tos" {% templatetag closeblock %}</p>
-    </div>
-  </a>
-  <a class="option option-two" href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/getting_started/tutorial.html">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-    <div>
-      <h4>{% templatetag openblock %} trans "Tutorial" {% templatetag closeblock %}</h4>
-      <p>{% templatetag openblock %} trans "Build your first Wagtail site" {% templatetag closeblock %}</p>
-    </div>
-  </a>
-  <a class="option option-three" href="{% templatetag openblock %} url 'wagtailadmin_home' {% templatetag closeblock %}">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>
-    <div>
-      <h4>{% templatetag openblock %} trans "Admin Interface" {% templatetag closeblock %}</h4>
-      <p>{% templatetag openblock %} trans "Create your superuser first!" {% templatetag closeblock %}</p>
-    </div>
-  </a>
+    <a class="option option-one" href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M9 21c0 .5.4 1 1 1h4c.6 0 1-.5 1-1v-1H9v1zm3-19C8.1 2 5 5.1 5 9c0 2.4 1.2 4.5 3 5.7V17c0 .5.4 1 1 1h6c.6 0 1-.5 1-1v-2.3c1.8-1.3 3-3.4 3-5.7 0-3.9-3.1-7-7-7zm2.9 11.1l-.9.6V16h-4v-2.3l-.9-.6C7.8 12.2 7 10.6 7 9c0-2.8 2.2-5 5-5s5 2.2 5 5c0 1.6-.8 3.2-2.1 4.1z"/></svg>
+        <div>
+            <h4>{% templatetag openblock %} trans "Wagtail Documentation" {% templatetag closeblock %}</h4>
+            <p>{% templatetag openblock %} trans "Topics, references, & how-tos" {% templatetag closeblock %}</p>
+        </div>
+    </a>
+    <a class="option option-two" href="{% templatetag openblock %} wagtail_documentation_path {% templatetag closeblock %}/getting_started/tutorial.html">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
+        <div>
+            <h4>{% templatetag openblock %} trans "Tutorial" {% templatetag closeblock %}</h4>
+            <p>{% templatetag openblock %} trans "Build your first Wagtail site" {% templatetag closeblock %}</p>
+        </div>
+    </a>
+    <a class="option option-three" href="{% templatetag openblock %} url 'wagtailadmin_home' {% templatetag closeblock %}">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>
+        <div>
+            <h4>{% templatetag openblock %} trans "Admin Interface" {% templatetag closeblock %}</h4>
+            <p>{% templatetag openblock %} trans "Create your superuser first!" {% templatetag closeblock %}</p>
+        </div>
+    </a>
 </footer>
diff --git a/wagtail/project_template/project_name/templates/404.html b/wagtail/project_template/project_name/templates/404.html
index 7b25299571..10df86ff39 100644
--- a/wagtail/project_template/project_name/templates/404.html
+++ b/wagtail/project_template/project_name/templates/404.html
@@ -5,7 +5,7 @@
 {% templatetag openblock %} block body_class {% templatetag closeblock %}template-404{% templatetag openblock %} endblock {% templatetag closeblock %}
 
 {% templatetag openblock %} block content {% templatetag closeblock %}
-    <h1>Page not found</h1>
+<h1>Page not found</h1>
 
-    <h2>Sorry, this page could not be found.</h2>
+<h2>Sorry, this page could not be found.</h2>
 {% templatetag openblock %} endblock {% templatetag closeblock %}
diff --git a/wagtail/project_template/project_name/templates/base.html b/wagtail/project_template/project_name/templates/base.html
index 7777ba55d0..ecf45473cf 100644
--- a/wagtail/project_template/project_name/templates/base.html
+++ b/wagtail/project_template/project_name/templates/base.html
@@ -6,11 +6,11 @@
         <meta charset="utf-8" />
         <title>
             {% templatetag openblock %} block title %}
-                {% templatetag openblock %} if page.seo_title %}{% templatetag openvariable %} page.seo_title {% templatetag closevariable %}{% templatetag openblock %} else %}{% templatetag openvariable %} page.title {% templatetag closevariable %}{% templatetag openblock %} endif %}
+            {% templatetag openblock %} if page.seo_title %}{% templatetag openvariable %} page.seo_title {% templatetag closevariable %}{% templatetag openblock %} else %}{% templatetag openvariable %} page.title {% templatetag closevariable %}{% templatetag openblock %} endif %}
             {% templatetag openblock %} endblock %}
             {% templatetag openblock %} block title_suffix %}
-                {% templatetag openblock %} wagtail_site as current_site %}
-                {% templatetag openblock %} if current_site and current_site.site_name %}- {% templatetag openvariable %} current_site.site_name {% templatetag closevariable %}{% templatetag openblock %} endif %}
+            {% templatetag openblock %} wagtail_site as current_site %}
+            {% templatetag openblock %} if current_site and current_site.site_name %}- {% templatetag openvariable %} current_site.site_name {% templatetag closevariable %}{% templatetag openblock %} endif %}
             {% templatetag openblock %} endblock %}
         </title>
         <meta name="description" content="" />
@@ -20,7 +20,7 @@
         <link rel="stylesheet" type="text/css" href="{% templatetag openblock %} static 'css/{{ project_name }}.css' {% templatetag closeblock %}">
 
         {% templatetag openblock %} block extra_css {% templatetag closeblock %}
-            {% templatetag opencomment %} Override this in templates to add extra stylesheets {% templatetag closecomment %}
+        {% templatetag opencomment %} Override this in templates to add extra stylesheets {% templatetag closecomment %}
         {% templatetag openblock %} endblock {% templatetag closeblock %}
     </head>
 
@@ -33,7 +33,7 @@
         <script type="text/javascript" src="{% templatetag openblock %} static 'js/{{ project_name }}.js' {% templatetag closeblock %}"></script>
 
         {% templatetag openblock %} block extra_js {% templatetag closeblock %}
-            {% templatetag opencomment %} Override this in templates to add extra javascript {% templatetag closecomment %}
+        {% templatetag opencomment %} Override this in templates to add extra javascript {% templatetag closecomment %}
         {% templatetag openblock %} endblock {% templatetag closeblock %}
     </body>
 </html>
diff --git a/wagtail/project_template/search/templates/search/search.html b/wagtail/project_template/search/templates/search/search.html
index 3a94ac673e..ce43d5326f 100644
--- a/wagtail/project_template/search/templates/search/search.html
+++ b/wagtail/project_template/search/templates/search/search.html
@@ -6,33 +6,33 @@
 {% templatetag openblock %} block title {% templatetag closeblock %}Search{% templatetag openblock %} endblock {% templatetag closeblock %}
 
 {% templatetag openblock %} block content {% templatetag closeblock %}
-    <h1>Search</h1>
+<h1>Search</h1>
 
-    <form action="{% templatetag openblock %} url 'search' {% templatetag closeblock %}" method="get">
-        <input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}"{% templatetag openblock %} endif {% templatetag closeblock %}>
-        <input type="submit" value="Search" class="button">
-    </form>
+<form action="{% templatetag openblock %} url 'search' {% templatetag closeblock %}" method="get">
+    <input type="text" name="query"{% templatetag openblock %} if search_query {% templatetag closeblock %} value="{% templatetag openvariable %} search_query {% templatetag closevariable %}"{% templatetag openblock %} endif {% templatetag closeblock %}>
+    <input type="submit" value="Search" class="button">
+</form>
 
-    {% templatetag openblock %} if search_results {% templatetag closeblock %}
-        <ul>
-            {% templatetag openblock %} for result in search_results {% templatetag closeblock %}
-                <li>
-                    <h4><a href="{% templatetag openblock %} pageurl result {% templatetag closeblock %}">{% templatetag openvariable %} result {% templatetag closevariable %}</a></h4>
-                    {% templatetag openblock %} if result.search_description {% templatetag closeblock %}
-                        {% templatetag openvariable %} result.search_description {% templatetag closevariable %}
-                    {% templatetag openblock %} endif {% templatetag closeblock %}
-                </li>
-            {% templatetag openblock %} endfor {% templatetag closeblock %}
-        </ul>
-
-        {% templatetag openblock %} if search_results.has_previous {% templatetag closeblock %}
-            <a href="{% templatetag openblock %} url 'search' {% templatetag closeblock %}?query={% templatetag openvariable %} search_query|urlencode {% templatetag closevariable %}&amp;page={% templatetag openvariable %} search_results.previous_page_number {% templatetag closevariable %}">Previous</a>
+{% templatetag openblock %} if search_results {% templatetag closeblock %}
+<ul>
+    {% templatetag openblock %} for result in search_results {% templatetag closeblock %}
+    <li>
+        <h4><a href="{% templatetag openblock %} pageurl result {% templatetag closeblock %}">{% templatetag openvariable %} result {% templatetag closevariable %}</a></h4>
+        {% templatetag openblock %} if result.search_description {% templatetag closeblock %}
+        {% templatetag openvariable %} result.search_description {% templatetag closevariable %}
         {% templatetag openblock %} endif {% templatetag closeblock %}
+    </li>
+    {% templatetag openblock %} endfor {% templatetag closeblock %}
+</ul>
 
-        {% templatetag openblock %} if search_results.has_next {% templatetag closeblock %}
-            <a href="{% templatetag openblock %} url 'search' {% templatetag closeblock %}?query={% templatetag openvariable %} search_query|urlencode {% templatetag closevariable %}&amp;page={% templatetag openvariable %} search_results.next_page_number {% templatetag closevariable %}">Next</a>
-        {% templatetag openblock %} endif {% templatetag closeblock %}
-    {% templatetag openblock %} elif search_query {% templatetag closeblock %}
-        No results found
-    {% templatetag openblock %} endif {% templatetag closeblock %}
+{% templatetag openblock %} if search_results.has_previous {% templatetag closeblock %}
+<a href="{% templatetag openblock %} url 'search' {% templatetag closeblock %}?query={% templatetag openvariable %} search_query|urlencode {% templatetag closevariable %}&amp;page={% templatetag openvariable %} search_results.previous_page_number {% templatetag closevariable %}">Previous</a>
+{% templatetag openblock %} endif {% templatetag closeblock %}
+
+{% templatetag openblock %} if search_results.has_next {% templatetag closeblock %}
+<a href="{% templatetag openblock %} url 'search' {% templatetag closeblock %}?query={% templatetag openvariable %} search_query|urlencode {% templatetag closevariable %}&amp;page={% templatetag openvariable %} search_results.next_page_number {% templatetag closevariable %}">Next</a>
+{% templatetag openblock %} endif {% templatetag closeblock %}
+{% templatetag openblock %} elif search_query {% templatetag closeblock %}
+No results found
+{% templatetag openblock %} endif {% templatetag closeblock %}
 {% templatetag openblock %} endblock {% templatetag closeblock %}
diff --git a/wagtail/search/templates/wagtailsearch/queries/chooser_field.html b/wagtail/search/templates/wagtailsearch/queries/chooser_field.html
index f6e9f39462..c8e317694d 100644
--- a/wagtail/search/templates/wagtailsearch/queries/chooser_field.html
+++ b/wagtail/search/templates/wagtailsearch/queries/chooser_field.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 {% trans "Date" %}
 {% block form_field %}
-   <div class="chooser searchterm-chooser">
-       {{ field }}
+    <div class="chooser searchterm-chooser">
+        {{ field }}
 
-       <button type="button" id="{{ field.auto_id }}-chooser" class="button button-secondary searchterms-chooser">{% trans "Choose from popular search terms" %}</button>
+        <button type="button" id="{{ field.auto_id }}-chooser" class="button button-secondary searchterms-chooser">{% trans "Choose from popular search terms" %}</button>
     </div>
 {% endblock %}
diff --git a/wagtail/search/templates/wagtailsearch/search_results.html b/wagtail/search/templates/wagtailsearch/search_results.html
index e9a11550c9..d633c59345 100644
--- a/wagtail/search/templates/wagtailsearch/search_results.html
+++ b/wagtail/search/templates/wagtailsearch/search_results.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Search{% if search_results %} Results{% endif %}</title>
-</head>
-<body>
-    <h1>Search{% if search_results %} Results{% endif %}</h1>
+    <head>
+        <title>Search{% if search_results %} Results{% endif %}</title>
+    </head>
+    <body>
+        <h1>Search{% if search_results %} Results{% endif %}</h1>
 
-    <form action="{% url 'wagtailsearch_search' %}" method="get">
-        <input type="text" name="q"{% if query_string %} value="{{ query_string }}"{% endif %}>
-        <input type="submit" value="Search">
-    </form>
+        <form action="{% url 'wagtailsearch_search' %}" method="get">
+            <input type="text" name="q"{% if query_string %} value="{{ query_string }}"{% endif %}>
+            <input type="submit" value="Search">
+        </form>
 
-    {% if search_results %}
-        <ul>
-            {% for result in search_results %}
-                <li><a href="{{ result.specific.url }}">{{ result.specific }}</a></li>
-            {% endfor %}
-        </ul>
-    {% endif %}
-</body>
-</html>
\ No newline at end of file
+        {% if search_results %}
+            <ul>
+                {% for result in search_results %}
+                    <li><a href="{{ result.specific.url }}">{{ result.specific }}</a></li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+    </body>
+</html>
diff --git a/wagtail/snippets/templates/wagtailsnippets/chooser/results.html b/wagtail/snippets/templates/wagtailsnippets/chooser/results.html
index 1e1afdb26d..7824f4fec6 100644
--- a/wagtail/snippets/templates/wagtailsnippets/chooser/results.html
+++ b/wagtail/snippets/templates/wagtailsnippets/chooser/results.html
@@ -2,11 +2,11 @@
 {% if items %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=items.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=items.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% endif %}
 
@@ -16,7 +16,7 @@
     {% include "wagtailadmin/shared/pagination_nav.html" with items=items linkurl=pagination_base_url %}
 {% else %}
     {% if is_searching %}
-         <p role="alert">{% blocktrans %}Sorry, no snippets match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
+        <p role="alert">{% blocktrans %}Sorry, no snippets match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
     {% else %}
         {% url 'wagtailsnippets:add' model_opts.app_label model_opts.model_name as wagtailsnippets_create_snippet_url %}
         <p>{% blocktrans with snippet_type_name=model_opts.verbose_name %}You haven't created any {{ snippet_type_name }} snippets. Why not <a href="{{ wagtailsnippets_create_snippet_url }}" target="_blank" rel="noopener noreferrer">create one now</a>?{% endblocktrans %}</p>
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/_header_with_history.html b/wagtail/snippets/templates/wagtailsnippets/snippets/_header_with_history.html
index bfb50700e4..f0fc7e885c 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/_header_with_history.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/_header_with_history.html
@@ -5,18 +5,18 @@
     {% url 'wagtailsnippets:history' model_opts.app_label model_opts.model_name instance.pk|admin_urlquote as history_url %}
 
     {% if latest_log_entry %}
-    <div class="row last-updated">
-        <ul>
-            <li>
-                <span class="avatar small" data-wagtail-tooltip="{{ latest_log_entry.user_display_name }}"><img src="{% avatar_url latest_log_entry.user size=25 %}" alt="" /></span>
-                {% trans "Last updated" %}
-                {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_log_entry.timestamp time_prefix="at" %}
-            </li>
-            {% if history_url %}
-                <li><a href="{{ history_url }}">{% icon "history" class_name="default" %} {% trans "History" %}</a></li>
-            {% endif %}
-            <li>{% icon "snippet" class_name="default" %} {{ model_opts.verbose_name|capfirst }}</li>
-        </ul>
-    </div>
+        <div class="row last-updated">
+            <ul>
+                <li>
+                    <span class="avatar small" data-wagtail-tooltip="{{ latest_log_entry.user_display_name }}"><img src="{% avatar_url latest_log_entry.user size=25 %}" alt="" /></span>
+                    {% trans "Last updated" %}
+                    {% include "wagtailadmin/shared/last_updated.html" with last_updated=latest_log_entry.timestamp time_prefix="at" %}
+                </li>
+                {% if history_url %}
+                    <li><a href="{{ history_url }}">{% icon "history" class_name="default" %} {% trans "History" %}</a></li>
+                {% endif %}
+                <li>{% icon "snippet" class_name="default" %} {{ model_opts.verbose_name|capfirst }}</li>
+            </ul>
+        </div>
     {% endif %}
 {% endblock %}
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu.html
index 2d9fd820c1..7d07200a63 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu.html
@@ -7,7 +7,7 @@
     <ul>
         {% for item in rendered_menu_items %}
             <li>
-                 {{ item }}
+                {{ item }}
             </li>
         {% endfor %}
     </ul>
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/confirm_delete.html b/wagtail/snippets/templates/wagtailsnippets/snippets/confirm_delete.html
index e7f4455606..ea35b43cf4 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/confirm_delete.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/confirm_delete.html
@@ -2,9 +2,9 @@
 {% load wagtailadmin_tags i18n %}
 {% block titletag %}
     {% if count == 1 %}
-      {% blocktrans with snippet_type_name=model_opts.verbose_name %}Delete {{ snippet_type_name }}{% endblocktrans %} - {{ instances|first }}
+        {% blocktrans with snippet_type_name=model_opts.verbose_name %}Delete {{ snippet_type_name }}{% endblocktrans %} - {{ instances|first }}
     {% else %}
-      {{ count }} {{ model_opts.verbose_name_plural|capfirst }}
+        {{ count }} {{ model_opts.verbose_name_plural|capfirst }}
     {% endif %}
 {% endblock %}
 {% block content %}
@@ -28,7 +28,7 @@
             <p>{% blocktrans with snippet_type_name=model_opts.verbose_name_plural %}Are you sure you want to delete {{ count }} {{ snippet_type_name }}?{% endblocktrans %}</p>
             <ul>
                 {% for instance in instances %}
-                <li>{{ instance }}</li>
+                    <li>{{ instance }}</li>
                 {% endfor %}
             </ul>
         {% endif %}
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
index 9e3d7bc0d0..53f57d2799 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/edit.html
@@ -27,14 +27,14 @@
         </div>
 
         {% if uc_enabled %}
-        <div class="col2 ">
-            <dl>
+            <div class="col2 ">
+                <dl>
                     <dt>{% trans "Usage" %}</dt>
                     <dd>
                         <a href="{{ instance.usage_url }}">{% blocktrans count usage_count=instance.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>
                     </dd>
-            </dl>
-        </div>
+                </dl>
+            </div>
         {% endif %}
     </div>
 
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/results.html b/wagtail/snippets/templates/wagtailsnippets/snippets/results.html
index bf1bb982d7..7673967aad 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/results.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/results.html
@@ -2,11 +2,11 @@
 {% if items %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=items.paginator.count %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=items.paginator.count %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
     {% endif %}
 
@@ -16,7 +16,7 @@
     {% include "wagtailadmin/shared/pagination_nav.html" with items=items linkurl=wagtailsnippets_list_url %}
 {% else %}
     {% if is_searching %}
-         <p role="alert">{% blocktrans %}Sorry, no snippets match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
+        <p role="alert">{% blocktrans %}Sorry, no snippets match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
     {% else %}
         {% url 'wagtailsnippets:add' model_opts.app_label model_opts.model_name as wagtailsnippets_create_url %}
 
diff --git a/wagtail/tests/testapp/templates/tests/event_page.html b/wagtail/tests/testapp/templates/tests/event_page.html
index 953c90273d..013ee6d852 100644
--- a/wagtail/tests/testapp/templates/tests/event_page.html
+++ b/wagtail/tests/testapp/templates/tests/event_page.html
@@ -3,21 +3,21 @@
 
 {% block html_title %}Event: {{ self.title }}{% endblock %}
 {% block content %}
-  <h2>Event</h2>
-  {% if self.feed_image %}
-      {% image self.feed_image width-200 class="feed-image" %}
-  {% endif %}
-
-  {% with self.categories.all as categories %}
-    {% if categories %}
-      <ul>
-        {% for category in categories %}
-          <li>{{ category.name }}</li>
-        {% endfor %}
-      </ul>
+    <h2>Event</h2>
+    {% if self.feed_image %}
+        {% image self.feed_image width-200 class="feed-image" %}
     {% endif %}
-  {% endwith %}
 
-  {{ self.body|richtext }}
-  <p><a href="{% slugurl 'events' %}">Back to events index</a></p>
+    {% with self.categories.all as categories %}
+        {% if categories %}
+            <ul>
+                {% for category in categories %}
+                    <li>{{ category.name }}</li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+    {% endwith %}
+
+    {{ self.body|richtext }}
+    <p><a href="{% slugurl 'events' %}">Back to events index</a></p>
 {% endblock %}
diff --git a/wagtail/tests/testapp/templates/tests/form_page_landing.html b/wagtail/tests/testapp/templates/tests/form_page_landing.html
index 420f2f8c1b..6407b8ba63 100644
--- a/wagtail/tests/testapp/templates/tests/form_page_landing.html
+++ b/wagtail/tests/testapp/templates/tests/form_page_landing.html
@@ -5,8 +5,8 @@
     <p>Thank you for your feedback.</p>
 
     <ul>
-      {% for key, value in form_submission.get_data.items %}
-        <li>{{ key }}: {{ value }}</li>
-      {% endfor %}
+        {% for key, value in form_submission.get_data.items %}
+            <li>{{ key }}: {{ value }}</li>
+        {% endfor %}
     </ul>
 {% endblock %}
diff --git a/wagtail/tests/testapp/templates/tests/form_page_with_custom_form_builder_landing.html b/wagtail/tests/testapp/templates/tests/form_page_with_custom_form_builder_landing.html
index dff020a3b9..816fc42773 100644
--- a/wagtail/tests/testapp/templates/tests/form_page_with_custom_form_builder_landing.html
+++ b/wagtail/tests/testapp/templates/tests/form_page_with_custom_form_builder_landing.html
@@ -3,8 +3,8 @@
 {% block content %}
     <p>Thank you for submitting a Support Request.</p>
     <ul>
-      {% for key, value in form_submission.get_data.items %}
-        <li>{{ key }}: {{ value }}</li>
-      {% endfor %}
+        {% for key, value in form_submission.get_data.items %}
+            <li>{{ key }}: {{ value }}</li>
+        {% endfor %}
     </ul>
 {% endblock %}
diff --git a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_assign_role.html b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_assign_role.html
index d12fe64e71..42c0c3a216 100644
--- a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_assign_role.html
+++ b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_assign_role.html
@@ -9,31 +9,31 @@
 {% endblock header %}
 
 {% block items_with_access %}
-        {% if items %}
+    {% if items %}
         <p>{% trans "Are you sure you want to assign this role to these users?" %}</p>
         <ul>
             {% for user in items %}
-            <li>
-                <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
-            </li>
+                <li>
+                    <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
+                </li>
             {% endfor %}
         </ul>
-        {% endif %}
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to edit this user{% plural %}You don't have permission to edit these users{% endblocktrans %}
-{% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to edit this user{% plural %}You don't have permission to edit these users{% endblocktrans %}
+    {% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, assign' as action_button_text %}
-    {% trans "No, don't assign" as no_action_button_text %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
+    {% if items %}
+        {% trans 'Yes, assign' as action_button_text %}
+        {% trans "No, don't assign" as no_action_button_text %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+    {% else %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
+    {% endif %}
 {% endblock form_section %}
diff --git a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html
index 3f37bed8f6..738132f55e 100644
--- a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html
+++ b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_delete.html
@@ -9,31 +9,31 @@
 {% endblock header %}
 
 {% block items_with_access %}
-        {% if items %}
+    {% if items %}
         <p>{% trans "Are you sure you want to delete these users?" %}</p>
         <ul>
             {% for user in items %}
-            <li>
-                <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
-            </li>
+                <li>
+                    <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
+                </li>
             {% endfor %}
         </ul>
-        {% endif %}
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this user{% plural %}You don't have permission to delete these users{% endblocktrans %}
-{% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to delete this user{% plural %}You don't have permission to delete these users{% endblocktrans %}
+    {% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, delete' as action_button_text %}
-    {% trans "No, don't delete" as no_action_button_text %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/form.html' with action_button_class="serious" %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
+    {% if items %}
+        {% trans 'Yes, delete' as action_button_text %}
+        {% trans "No, don't delete" as no_action_button_text %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/form.html' with action_button_class="serious" %}
+    {% else %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
+    {% endif %}
 {% endblock form_section %}
diff --git a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_set_active_state.html b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_set_active_state.html
index fa3cbdd163..6b0a9cd5b5 100644
--- a/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_set_active_state.html
+++ b/wagtail/users/templates/wagtailusers/bulk_actions/confirm_bulk_set_active_state.html
@@ -9,34 +9,34 @@
 {% endblock header %}
 
 {% block items_with_access %}
-{% if items %}
-    <p>{% trans "Are you sure you want to change the active state for these users?" %}</p>
-    <ul>
-        {% for user in items %}
-        <li>
-            <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
-        </li>
-        {% endfor %}
-    </ul>
-{% endif %}
+    {% if items %}
+        <p>{% trans "Are you sure you want to change the active state for these users?" %}</p>
+        <ul>
+            {% for user in items %}
+                <li>
+                    <a href="{% url 'wagtailusers_users:edit' user.item.pk %}" target="_blank" rel="noopener noreferrer">{{user.item|user_display_name }}</a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock items_with_access %}
 
 {% block items_with_no_access %}
 
-{% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to edit this user{% plural %}You don't have permission to edit these users{% endblocktrans %}
-{% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
+    {% blocktrans asvar no_access_msg count counter=items_with_no_access|length %}You don't have permission to edit this user{% plural %}You don't have permission to edit these users{% endblocktrans %}
+    {% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=items_with_no_access no_access_msg=no_access_msg %}
 
-{% trans "You cannot change your own active status" as no_access_msg %}
-{% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=mark_self_as_inactive no_access_msg=no_access_msg %}
+    {% trans "You cannot change your own active status" as no_access_msg %}
+    {% include 'wagtailusers/bulk_actions/list_items_with_no_access.html' with items=mark_self_as_inactive no_access_msg=no_access_msg %}
 
 {% endblock items_with_no_access %}
 
 {% block form_section %}
-{% if items %}
-    {% trans 'Yes, change state' as action_button_text %}
-    {% trans "No, don't change state" as no_action_button_text %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
-{% else %}
-    {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
-{% endif %}
+    {% if items %}
+        {% trans 'Yes, change state' as action_button_text %}
+        {% trans "No, don't change state" as no_action_button_text %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/form_with_fields.html' %}
+    {% else %}
+        {% include 'wagtailadmin/bulk_actions/confirmation/go_back.html' %}
+    {% endif %}
 {% endblock form_section %}
diff --git a/wagtail/users/templates/wagtailusers/bulk_actions/list_items_with_no_access.html b/wagtail/users/templates/wagtailusers/bulk_actions/list_items_with_no_access.html
index 4d13708698..c4393ecc23 100644
--- a/wagtail/users/templates/wagtailusers/bulk_actions/list_items_with_no_access.html
+++ b/wagtail/users/templates/wagtailusers/bulk_actions/list_items_with_no_access.html
@@ -2,5 +2,5 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block per_item %}
-{{ item|user_display_name }}
+    {{ item|user_display_name }}
 {% endblock per_item %}
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
index 9600934367..d6c6b89dd6 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
@@ -9,7 +9,7 @@
         <col width="15%" />
         <col width="15%" />
         {% if custom_perms_exist %}
-        <col width="30%" />
+            <col width="30%" />
         {% endif %}
         <thead>
             <tr>
@@ -18,48 +18,48 @@
                 <th>{% trans "Change" %}</th>
                 <th>{% trans "Delete" %}</th>
                 {% if custom_perms_exist %}
-                <th>{% trans "Custom permissions" %}</th>
+                    <th>{% trans "Custom permissions" %}</th>
                 {% endif %}
             </tr>
         </thead>
         <tbody>
             {% for content_perms_dict in object_perms %}
-            <tr>
-                <td class="title"><h3>{{ content_perms_dict.object|capfirst }}</h3></td>
-                <td>
-                    {% if content_perms_dict.add %}
-                        <label for="{{ content_perms_dict.add.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.add.perm.name }}</label>
-                        {{ content_perms_dict.add.checkbox.tag }}
+                <tr>
+                    <td class="title"><h3>{{ content_perms_dict.object|capfirst }}</h3></td>
+                    <td>
+                        {% if content_perms_dict.add %}
+                            <label for="{{ content_perms_dict.add.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.add.perm.name }}</label>
+                            {{ content_perms_dict.add.checkbox.tag }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if content_perms_dict.change %}
+                            <label for="{{ content_perms_dict.change.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.change.perm.name }}</label>
+                            {{ content_perms_dict.change.checkbox.tag }}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if content_perms_dict.delete %}
+                            <label for="{{ content_perms_dict.delete.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.delete.perm.name }}</label>
+                            {{ content_perms_dict.delete.checkbox.tag }}
+                        {% endif %}
+                    </td>
+                    {% if custom_perms_exist %}
+                        <td>
+                            {% if content_perms_dict.custom %}
+                                <fieldset class="custom-permissions">
+                                    <legend>{% trans "Custom permissions" %}</legend>
+                                    {% for custom_perm in content_perms_dict.custom %}
+                                        <label class="custom-permissions-item">
+                                            <input type="checkbox" name="permissions" value="{{ custom_perm.perm.id }}" {% if custom_perm.selected %}checked{% endif %}>
+                                            {{ custom_perm.name }}
+                                        </label>
+                                    {% endfor %}
+                                </fieldset>
+                            {% endif %}
+                        </td>
                     {% endif %}
-                </td>
-                <td>
-                    {% if content_perms_dict.change %}
-                        <label for="{{ content_perms_dict.change.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.change.perm.name }}</label>
-                        {{ content_perms_dict.change.checkbox.tag }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if content_perms_dict.delete %}
-                        <label for="{{ content_perms_dict.delete.checkbox.id_for_label }}" class="visuallyhidden">{{ content_perms_dict.delete.perm.name }}</label>
-                        {{ content_perms_dict.delete.checkbox.tag }}
-                    {% endif %}
-                </td>
-                {% if custom_perms_exist %}
-                <td>
-                    {% if content_perms_dict.custom %}
-                    <fieldset class="custom-permissions">
-                        <legend>{% trans "Custom permissions" %}</legend>
-                        {% for custom_perm in content_perms_dict.custom %}
-                        <label class="custom-permissions-item">
-                            <input type="checkbox" name="permissions" value="{{ custom_perm.perm.id }}" {% if custom_perm.selected %}checked{% endif %}>
-                            {{ custom_perm.name }}
-                        </label>
-                        {% endfor %}
-                    </fieldset>
-                    {% endif %}
-                </td>
-                {% endif %}
-            </tr>
+                </tr>
             {% endfor %}
         </tbody>
     </table>
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
index 778432b623..77a5388f42 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
@@ -43,11 +43,11 @@
 </table>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-{% escapescript %}
-    <tr id="inline_child_{{ formset.empty_form.prefix }}">
+    {% escapescript %}
+        <tr id="inline_child_{{ formset.empty_form.prefix }}">
         {% include "wagtailusers/groups/includes/page_permissions_form.html" with form=formset.empty_form only %}
-    </tr>
-{% endescapescript %}
+        </tr>
+    {% endescapescript %}
 </script>
 
 <p class="add">
diff --git a/wagtail/users/templates/wagtailusers/users/index.html b/wagtail/users/templates/wagtailusers/users/index.html
index d964ffb4a7..4bba764fa5 100644
--- a/wagtail/users/templates/wagtailusers/users/index.html
+++ b/wagtail/users/templates/wagtailusers/users/index.html
@@ -6,9 +6,9 @@
     <script>
         window.headerSearch = {
             {% if group %}
-            url: "{% url 'wagtailusers_groups:users' group.id %}",
+                url: "{% url 'wagtailusers_groups:users' group.id %}",
             {% else %}
-            url: "{% url 'wagtailusers_users:index' %}",
+                url: "{% url 'wagtailusers_users:index' %}",
             {% endif %}
             termInput: "#id_q",
             targetOutput: "#user-results"
diff --git a/wagtail/users/templates/wagtailusers/users/results.html b/wagtail/users/templates/wagtailusers/users/results.html
index 1ec4c00934..3b62fd67ca 100644
--- a/wagtail/users/templates/wagtailusers/users/results.html
+++ b/wagtail/users/templates/wagtailusers/users/results.html
@@ -2,11 +2,11 @@
 {% if users %}
     {% if is_searching %}
         <h2 role="alert">
-        {% blocktrans count counter=users|length %}
-            There is {{ counter }} match
-        {% plural %}
-            There are {{ counter }} matches
-        {% endblocktrans %}
+            {% blocktrans count counter=users|length %}
+                There is {{ counter }} match
+            {% plural %}
+                There are {{ counter }} matches
+            {% endblocktrans %}
         </h2>
 
         {% search_other %}
@@ -18,9 +18,9 @@
     {% include "wagtailadmin/shared/pagination_nav.html" with items=users %}
 {% else %}
     {% if is_searching %}
-         <h2 role="alert">{% blocktrans %}Sorry, no users match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
+        <h2 role="alert">{% blocktrans %}Sorry, no users match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
 
-         {% search_other %}
+        {% search_other %}
     {% else %}
         {% url 'wagtailusers_users:add' as wagtailusers_add_url %}
         {% if group %}