Remove duplicate definition of form media in settings - fixes #2664

Form media declarations are output in edit.html, but this is redundant as they're already output in _editor_css.html / _editor_js.html,
and the duplicate definitions cause the rich text editor to fail to activate for some reason.

CHANGELOG.txt

@@ -14,6 +14,7 @@ Changelog
  * Fix: When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
  * Fix: Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
  * Fix: Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
+ * Fix: Rich text editor is no longer broken in settings (Matt Westcott)
 
 
 1.5 (31.05.2016)

docs/releases/1.5.1.rst

@@ -17,3 +17,4 @@ Bug fixes
  * When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
  * Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
  * Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
+ * Rich text editor is no longer broken in settings (Matt Westcott)

wagtail/contrib/settings/templates/wagtailsettings/edit.html

@@ -43,11 +43,9 @@
 
 {% block extra_css %}
     {% include "wagtailadmin/pages/_editor_css.html" %}
-    {{ form.media.css }}
     {{ site_switcher.media.css }}
 {% endblock %}
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ form.media.js }}
     {{ site_switcher.media.js }}
 {% endblock %}