From eaaeabb959c107e59825233774aec244813844b1 Mon Sep 17 00:00:00 2001
From: Martin Sanders <martin@hiveonline.co.uk>
Date: Fri, 3 Jul 2015 09:19:33 +0100
Subject: [PATCH] Calling block.super in extra_js and extra_css.

The specific usecase is if you'd globally like to inject css and js
then you can via django overextending `wagtailadmin/base.html`.

Why not just use the `insert_editor_js` and `insert_editor_css` hooks?

- It isn't global across the admin, only on editor pages.
- In my opinion, this stuff shouldn't be in python.

Why not overextend `wagtailadmin/admin_base.html`?

- Can't use super if you need to insert code after loading vendor libs
  like jquery, bootstrap etc but before extra_js. So you then have to
  copy-paste a ton of code from the parent - this goes against the
  open closed principle and should be avoided.

So given the current build process for front end admin/dashboard assets
in wagtail, this seems like the best solution for now.
---
 .../wagtailstyleguide/templates/wagtailstyleguide/base.html   | 4 ++++
 .../wagtailadmin/account/password_reset/complete.html         | 2 ++
 .../wagtailadmin/account/password_reset/confirm.html          | 2 ++
 .../templates/wagtailadmin/account/password_reset/done.html   | 2 ++
 .../templates/wagtailadmin/account/password_reset/form.html   | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/home.html         | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/login.html        | 3 +++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html   | 1 +
 wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html   | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html  | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html | 2 ++
 wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html  | 2 ++
 wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html | 2 ++
 .../wagtaildocs/templates/wagtaildocs/documents/index.html    | 1 +
 .../templates/wagtailforms/index_submissions.html             | 1 +
 wagtail/wagtailimages/templates/wagtailimages/images/add.html | 2 ++
 .../wagtailimages/templates/wagtailimages/images/edit.html    | 4 ++++
 .../wagtailimages/templates/wagtailimages/images/index.html   | 1 +
 .../templates/wagtailimages/images/url_generator.html         | 3 ++-
 .../wagtailimages/templates/wagtailimages/multiple/add.html   | 4 ++++
 wagtail/wagtailredirects/templates/wagtailredirects/add.html  | 3 ++-
 wagtail/wagtailredirects/templates/wagtailredirects/edit.html | 3 ++-
 .../wagtailredirects/templates/wagtailredirects/index.html    | 1 +
 .../templates/wagtailsearch/editorspicks/add.html             | 2 ++
 .../templates/wagtailsearch/editorspicks/edit.html            | 4 +++-
 .../templates/wagtailsearch/editorspicks/index.html           | 3 ++-
 wagtail/wagtailsites/templates/wagtailsites/create.html       | 1 +
 wagtail/wagtailsites/templates/wagtailsites/edit.html         | 1 +
 .../templates/wagtailsnippets/snippets/create.html            | 2 ++
 .../templates/wagtailsnippets/snippets/edit.html              | 2 ++
 .../wagtailusers/templates/wagtailusers/groups/create.html    | 4 ++++
 wagtail/wagtailusers/templates/wagtailusers/groups/edit.html  | 3 +++
 wagtail/wagtailusers/templates/wagtailusers/groups/index.html | 1 +
 wagtail/wagtailusers/templates/wagtailusers/users/index.html  | 1 +
 35 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
index f4e859987..45b6c9f60 100644
--- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
+++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
@@ -2,6 +2,8 @@
 {% load wagtailadmin_tags compress i18n static gravatar %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailstyleguide/css/styleguide.css' %}" type="text/css" />
     {% endcompress %}
@@ -567,6 +569,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/pages/_editor_js.html" %}
     <script>
         $(function(){
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
index 23f096caa..5c56d0eae 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/complete.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
index 54326736c..b7014608f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/confirm.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
index 8a0d1e5b2..495006f1c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/done.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
index 26db15ea9..722327eff 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/form.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home.html b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
index 09b3cf1c3..f4a43b186 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}homepage{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/home.css' %}" type="text/css" />
     {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index 3364cf684..e03a3fe4d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -4,6 +4,8 @@
 {% block bodyclass %}login{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/login.css' %}" type="text/css" />
     {% endcompress %}
@@ -64,6 +66,7 @@
 {% endblock %}
 
 {% block extra_js %}
+{{ block.super }}
 <script>
     $(function(){
         $('form input[name=username]').focus();
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
index b0ccf3397..007175064 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
@@ -30,5 +30,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index 7834da176..940d22b67 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -62,9 +62,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 977076f69..3e7fb63ce 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -91,8 +91,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index fa5f25109..ab3036032 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -19,6 +19,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
     <script src="{% static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% static 'wagtailadmin/js/privacy-switch.js' %}"></script>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
index 989c22aa4..664245408 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
@@ -3,6 +3,8 @@
 {% block titletag %}{% trans 'Search' %}{% endblock %}
 {% block bodyclass %}menu-search{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
+
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailadmin_pages_search' %}",
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index f9a221bb3..2654ffd2e 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -4,10 +4,12 @@
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index 124cf1993..dcef948ce 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -4,10 +4,12 @@
 {% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
index e634d4080..594388ab7 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
@@ -3,6 +3,7 @@
 {% block titletag %}Documents{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtaildocs_index' %}",
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
index 0fe73d5ab..2cb4d63a3 100644
--- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
+++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
@@ -3,6 +3,7 @@
 {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-forms{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/datetimepicker_translations.html" %}
 
     <script>
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index 81a6a2832..3abc45def 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -4,10 +4,12 @@
 {% block titletag %}{% trans "Add an image" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 {% endblock %}
 
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index 8762bb555..47f449f28 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -3,6 +3,8 @@
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
+
     {% include "wagtailadmin/shared/tag_field_css.html" %}
 
     <!-- Focal point chooser -->
@@ -13,6 +15,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/shared/tag_field_js.html" %}
 
     <!-- Focal point chooser -->
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index 2a9d4bf8c..09f075025 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -5,6 +5,7 @@
 {% block titletag %}{% trans "Images" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailimages_index' %}",
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
index e725fd2f9..e416da7ff 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
@@ -37,8 +37,9 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% compress js %}
         <script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
         <script src="{% static 'wagtailimages/js/image-url-generator.js' %}"></script>
     {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
index b9fb8e418..436c2cc7d 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
@@ -3,6 +3,8 @@
 {% block titletag %}{% trans "Add multiple images" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailimages/css/add-multiple.css' %}" type="text/css" />
     {% endcompress %}
@@ -54,6 +56,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% compress js %}
         <!-- this exact order of plugins is vital -->
         <script src="{% static 'wagtailimages/js/vendor/load-image.min.js' %}"></script>
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/add.html b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
index 5fcf22e08..aee31135f 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/add.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/add.html
@@ -18,5 +18,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
index 88ddc9274..eac85d31d 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html
@@ -19,5 +19,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/index.html b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
index ef9b349dd..fda83f362 100644
--- a/wagtail/wagtailredirects/templates/wagtailredirects/index.html
+++ b/wagtail/wagtailredirects/templates/wagtailredirects/index.html
@@ -4,6 +4,7 @@
 {% block bodyclass %}menu-redirects{% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailredirects_index' %}",
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
index 3135ce5f8..ab947c8cd 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/add.html
@@ -32,9 +32,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
index fe4b4593c..138d80441 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/edit.html
@@ -24,9 +24,11 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script type="text/javascript">
@@ -37,4 +39,4 @@
             createQueryChooser('{{ query_form.query_string.auto_id }}');
         });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
index e8e72f238..b65e71805 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/index.html
@@ -4,6 +4,7 @@
 {% block bodyclass %}menu-editorspicks{% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailsearch_editorspicks_index' %}",
@@ -23,4 +24,4 @@
             {% include "wagtailsearch/editorspicks/results.html" %}
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wagtail/wagtailsites/templates/wagtailsites/create.html b/wagtail/wagtailsites/templates/wagtailsites/create.html
index 8a94b372a..56442cc91 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/create.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/create.html
@@ -24,5 +24,6 @@
     </form>
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsites/templates/wagtailsites/edit.html b/wagtail/wagtailsites/templates/wagtailsites/edit.html
index c1b2c31e2..85bbc6db9 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/edit.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/edit.html
@@ -31,5 +31,6 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
index 58c0d43df..3cb77d0d2 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/create.html
@@ -24,8 +24,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
index 6fa7b258d..b2a928912 100644
--- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
+++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/edit.html
@@ -28,8 +28,10 @@
 {% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
 {% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
index 1ab92dba0..028b13149 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html
@@ -5,6 +5,8 @@
 {% block bodyclass %}menu-groups{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
+
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
     {% endcompress %}
@@ -34,6 +36,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
index fc1f357d4..578397852 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html
@@ -5,6 +5,7 @@
 {% block bodyclass %}menu-groups{% endblock %}
 
 {% block extra_css %}
+    {{ block.super }}
     {% compress css %}
         <link rel="stylesheet" href="{% static 'wagtailusers/css/groups_edit.css' %}" type="text/css" />
     {% endcompress %}
@@ -42,6 +43,8 @@
 {% endblock %}
 
 {% block extra_js %}
+    {{ block.super }}
+
     {% include "wagtailadmin/pages/_editor_js.html" %}
 
     <script>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/index.html b/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
index 45934be39..678d7642b 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/index.html
@@ -4,6 +4,7 @@
 {% block titletag %}{% trans "groups" %}{% endblock %}
 {% block bodyclass %}menu-groups{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailusers_groups_index' %}",
diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/index.html b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
index 67589aaaf..78482da0f 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/users/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
@@ -4,6 +4,7 @@
 {% block titletag %}{% trans "Users" %}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
 {% block extra_js %}
+    {{ block.super }}
     <script>
         window.headerSearch = {
             url: "{% url 'wagtailusers_users_index' %}",