move schemaeditor buttons

collective · Jan 20, 2021 · 8b39631 · 8b39631
1 parent d120b98
commit 8b39631
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/news/260.feature b/news/260.feature
@@ -0,0 +1,2 @@
+Update Field/Actions listing to work with Plone 6
+[petschki]
diff --git a/src/collective/easyform/browser/actions_listing.pt b/src/collective/easyform/browser/actions_listing.pt
@@ -4,7 +4,13 @@
       i18n:domain="plone.schemaeditor"
 >
   <metal:form metal:use-macro="context/@@ploneform-macros/form">
-    <metal:description-slot metal:fill-slot="description">
+    <metal:top-slot metal:fill-slot="formtop">
+      <input tal:replace="structure context/@@authenticator/authenticator" />
+      <script type="text/javascript"
+              tal:attributes="
+                src context/++resource++schemaeditor.js;
+              "
+      ></script>
       <div class="extraActions">
         <a class="pat-modal pat-plone-modal"
            id="add-field"
@@ -19,15 +25,6 @@
         </a>
 
       </div>
-    </metal:description-slot>
-
-    <metal:top-slot metal:fill-slot="formtop">
-      <input tal:replace="structure context/@@authenticator/authenticator" />
-      <script type="text/javascript"
-              tal:attributes="
-                src context/++resource++schemaeditor.js;
-              "
-      ></script>
     </metal:top-slot>
 
     <metal:fields-slot metal:fill-slot="fields">

diff --git a/src/collective/easyform/browser/fields_listing.pt b/src/collective/easyform/browser/fields_listing.pt
@@ -5,7 +5,13 @@
       i18n:domain="plone.schemaeditor"
 >
   <metal:form metal:use-macro="context/@@ploneform-macros/form">
-    <metal:description-slot metal:fill-slot="description">
+    <metal:top-slot metal:fill-slot="formtop">
+      <input tal:replace="structure context/@@authenticator/authenticator" />
+      <script type="text/javascript"
+              tal:attributes="
+                src context/++resource++schemaeditor.js;
+              "
+      ></script>
       <div class="extraActions">
         <a class="pat-modal pat-plone-modal"
            id="add-field"
@@ -32,15 +38,6 @@
           >Add new fieldset&hellip;</button>
         </a>
       </div>
-    </metal:description-slot>
-
-    <metal:top-slot metal:fill-slot="formtop">
-      <input tal:replace="structure context/@@authenticator/authenticator" />
-      <script type="text/javascript"
-              tal:attributes="
-                src context/++resource++schemaeditor.js;
-              "
-      ></script>
     </metal:top-slot>
 
     <metal:fields-slot metal:fill-slot="fields">