This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch SLING-7858 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 2d8d2acc94ddde6585ad621515118a7c4d87fc84 Merge: 02cf9fd 25d8cb5 Author: Dan Klco <[email protected]> AuthorDate: Tue Aug 28 11:24:21 2018 -0400 Merging latest code from master ui/src/main/frontend/src/js/scripts.js | 84 +++++++++++++-------- .../components/editor/fields/text/edit.json | 2 +- .../editor/fields/{text => textarea}/edit.json | 43 ----------- .../components/editor/scripts/finalize.jsp | 1 - .../components/editor/slingform/slingform.jsp | 2 +- .../libs/sling-cms/content/shared/delete.json | 3 +- .../libs/sling-cms/content/shared/movecopy.json | 1 + .../static/clientlibs/sling-cms-editor/editor.css | 3 +- .../static/clientlibs/sling-cms-editor/editor.js | 2 +- .../static/clientlibs/sling-cms-editor/loader.gif | Bin 0 -> 673 bytes 10 files changed, 62 insertions(+), 79 deletions(-) diff --cc ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp index 0621b52,f2e2e9b..33b1924 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp @@@ -17,8 -17,8 +17,8 @@@ * under the License. */ --%> <%@include file="/libs/sling-cms/global.jsp"%> - <form method="post" action="${slingRequest.requestPathInfo.suffix}${properties.actionSuffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="${properties.addDate != false}"> + <form method="post" action="${slingRequest.requestPathInfo.suffix}${properties.actionSuffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="${properties.addDate != false}" data-callback="${properties.callback}"> - <fieldset class="Form-Ajax__wrapper"> + <div class="Form-Ajax__wrapper field"> <input type="hidden" name="_charset_" value="utf-8" /> <sling:include path="fields" resourceType="sling-cms/components/general/container" /> <div class="Field-Group">
