Move template paths from edit_handlers to panels

.eslintignore

@@ -13,5 +13,5 @@ wagtail/search/static
 wagtail/snippets/static
 wagtail/users/static
 wagtail/contrib/*/static
-wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.js
+wagtail/admin/templates/wagtailadmin/panels/inline_panel.js
 wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js

.prettierignore

@@ -11,5 +11,5 @@ _build
 *.md
 # Files which contain incompatible syntax.
 *.html
-wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.js
+wagtail/admin/templates/wagtailadmin/panels/inline_panel.js
 wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js

docs/reference/pages/panels.rst

@@ -114,7 +114,7 @@ FieldRowPanel
 HelpPanel
 ~~~~~~~~~
 
-.. class:: HelpPanel(content='', template='wagtailadmin/edit_handlers/help_panel.html', heading='', classname='')
+.. class:: HelpPanel(content='', template='wagtailadmin/panels/help_panel.html', heading='', classname='')
 
     .. attribute:: HelpPanel.content
 

tsconfig.json

@@ -20,7 +20,7 @@
     "node_modules",
     "static",
     // Files with template syntax.
-    "wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel.js",
+    "wagtail/admin/templates/wagtailadmin/panels/inline_panel.js",
     "wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js"
   ]
 }

wagtail/admin/panels.py

@@ -401,7 +401,7 @@ class BaseFormEditHandler(BaseCompositeEditHandler):
 
 
 class TabbedInterface(BaseFormEditHandler):
-    template = "wagtailadmin/edit_handlers/tabbed_interface.html"
+    template = "wagtailadmin/panels/tabbed_interface.html"
 
     def __init__(self, *args, show_comments_toggle=None, **kwargs):
         self.base_form_class = kwargs.pop("base_form_class", None)
@@ -431,11 +431,11 @@ class TabbedInterface(BaseFormEditHandler):
 
 
 class ObjectList(TabbedInterface):
-    template = "wagtailadmin/edit_handlers/object_list.html"
+    template = "wagtailadmin/panels/object_list.html"
 
 
 class FieldRowPanel(BaseCompositeEditHandler):
-    template = "wagtailadmin/edit_handlers/field_row_panel.html"
+    template = "wagtailadmin/panels/field_row_panel.html"
 
     def on_instance_bound(self):
         super().on_instance_bound()
@@ -449,7 +449,7 @@ class FieldRowPanel(BaseCompositeEditHandler):
 
 
 class MultiFieldPanel(BaseCompositeEditHandler):
-    template = "wagtailadmin/edit_handlers/multi_field_panel.html"
+    template = "wagtailadmin/panels/multi_field_panel.html"
 
     def classes(self):
         classes = super().classes()
@@ -461,7 +461,7 @@ class HelpPanel(EditHandler):
     def __init__(
         self,
         content="",
-        template="wagtailadmin/edit_handlers/help_panel.html",
+        template="wagtailadmin/panels/help_panel.html",
         heading="",
         classname="",
     ):
@@ -557,7 +557,7 @@ class FieldPanel(EditHandler):
         else:
             return not self.disable_comments
 
-    object_template = "wagtailadmin/edit_handlers/single_field_panel.html"
+    object_template = "wagtailadmin/panels/single_field_panel.html"
 
     def render_as_object(self):
         return mark_safe(
@@ -575,7 +575,7 @@ class FieldPanel(EditHandler):
             )
         )
 
-    field_template = "wagtailadmin/edit_handlers/field_panel_field.html"
+    field_template = "wagtailadmin/panels/field_panel_field.html"
 
     def render_as_field(self):
         return mark_safe(
@@ -827,7 +827,7 @@ class InlinePanel(EditHandler):
             instance=empty_form.instance, request=self.request, form=empty_form
         )
 
-    template = "wagtailadmin/edit_handlers/inline_panel.html"
+    template = "wagtailadmin/panels/inline_panel.html"
 
     def render(self):
         formset = render_to_string(
@@ -840,7 +840,7 @@ class InlinePanel(EditHandler):
         js = self.render_js_init()
         return widget_with_script(formset, js)
 
-    js_template = "wagtailadmin/edit_handlers/inline_panel.js"
+    js_template = "wagtailadmin/panels/inline_panel.js"
 
     def render_js_init(self):
         return mark_safe(
@@ -927,10 +927,8 @@ class CommentPanel(EditHandler):
             }
         }
 
-    template = "wagtailadmin/edit_handlers/comments/comment_panel.html"
+    template = "wagtailadmin/panels/comments/comment_panel.html"
-    declarations_template = (
+    declarations_template = "wagtailadmin/panels/comments/comment_declarations.html"
-        "wagtailadmin/edit_handlers/comments/comment_declarations.html"
-    )
 
     def html_declarations(self):
         return render_to_string(self.declarations_template)

wagtail/admin/templates/wagtailadmin/panels/inline_panel.html

@@ -13,13 +13,13 @@
     {% endif %}
 
     {% for child in self.children %}
-        {% include "wagtailadmin/edit_handlers/inline_panel_child.html" %}
+        {% include "wagtailadmin/panels/inline_panel_child.html" %}
     {% endfor %}
 </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 %}
+        {% include "wagtailadmin/panels/inline_panel_child.html" with child=self.empty_child %}
     {% endescapescript %}
 </script>
 

wagtail/contrib/forms/panels.py

@@ -6,7 +6,7 @@ from wagtail.admin.panels import EditHandler
 
 
 class FormSubmissionsPanel(EditHandler):
-    template = "wagtailforms/edit_handlers/form_responses_panel.html"
+    template = "wagtailforms/panels/form_responses_panel.html"
 
     def render(self):
         form_page_model = self.model