This is an automated email from the ASF dual-hosted git repository.

jeb pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new f4e7c1d  SLING-8062 changed modal to be more free form
f4e7c1d is described below

commit f4e7c1d9d85df1d7a3f21e9e4689684ee890b4e0
Author: JE Bailey <[email protected]>
AuthorDate: Thu Nov 1 09:20:05 2018 -0400

    SLING-8062 changed modal to be more free form
    
    which allows for defining the modal in the modal template. add title and
    button definition to the sling form component.
---
 ui/src/main/frontend/src/js/cms.fields.js          |   2 +-
 ui/src/main/frontend/src/js/cms.modal.js           |  23 +++--
 .../components/editor/slingform/slingform.jsp      |  27 +++---
 .../sling-cms/components/pages/modal/modal.jsp     |  10 +-
 .../libs/sling-cms/content/file/upload.json        |   1 +
 .../libs/sling-cms/content/folder/create.json      | 107 +++++++++++----------
 .../libs/sling-cms/content/folder/edit.json        |   3 +-
 .../libs/sling-cms/content/mappings/create.json    |   1 +
 .../libs/sling-cms/content/mappings/edit.json      |   1 +
 .../libs/sling-cms/content/page/create.json        |   1 +
 .../libs/sling-cms/content/site/create.json        |   1 +
 .../libs/sling-cms/content/site/creategroup.json   |   1 +
 .../jcr_root/libs/sling-cms/content/site/edit.json |   3 +-
 .../libs/sling-cms/content/site/editgroup.json     |   3 +-
 .../libs/sling-cms/content/taxonomy/create.json    |  92 +++++++++---------
 .../libs/sling-cms/content/taxonomy/edit.json      |  54 +++++------
 .../libs/sling-cms/content/template/create.json    |   4 +-
 17 files changed, 180 insertions(+), 154 deletions(-)

diff --git a/ui/src/main/frontend/src/js/cms.fields.js 
b/ui/src/main/frontend/src/js/cms.fields.js
index d4077fe..9e0445e 100644
--- a/ui/src/main/frontend/src/js/cms.fields.js
+++ b/ui/src/main/frontend/src/js/cms.fields.js
@@ -56,7 +56,7 @@
                 click: function (event) {
                     event.stopPropagation();
                     event.preventDefault();
-                    var node = 
this.querySelector('.repeating__template').cloneNode(true);
+                    var node = this.querySelector('.repeating__template > 
.repeating__item').cloneNode(true);
                     
this.querySelector('.repeating__container').appendChild(node);
                 }
             },
diff --git a/ui/src/main/frontend/src/js/cms.modal.js 
b/ui/src/main/frontend/src/js/cms.modal.js
index 0cd813f..f687ec8 100644
--- a/ui/src/main/frontend/src/js/cms.modal.js
+++ b/ui/src/main/frontend/src/js/cms.modal.js
@@ -32,7 +32,7 @@
             getModal: function (title, link, button) {
                 var modal = document.createElement('div');
                 modal.classList.add('modal');
-                modal.innerHTML = '<div class="modal-background"></div><div 
class="modal-card is-draggable"><header class="modal-card-head"><p 
class="modal-card-title">' + title + '</p><button class="delete" 
aria-label="close"></button></header><section class="modal-card-body"><div 
class="loader is-loading"></div></section><footer 
class="modal-card-foot"></footer>';
+                modal.innerHTML = '<div class="loader is-loading"></div>';
                 document.querySelector('body').appendChild(modal);
                 
                 var request = new XMLHttpRequest();
@@ -42,18 +42,23 @@
                     if 
(request.responseURL.indexOf('/system/sling/form/login?resource=') !== -1) {
                         window.location.reload();
                     } else {
-                        modal.querySelector('.modal-card-body').innerHTML = 
request.responseText;
+                        modal.innerHTML = request.responseText;
+                        modal.classList.add('is-active');
                     }
                 };
                 request.send();
-                
-                
modal.querySelector('.delete,.close-modal').addEventListener("click", function 
() {
-                    modal.remove();
-                    return false;
-                });
-                modal.classList.add('is-active');
+            }
+        }
+    });
+    
+    nomnom.decorate(".modal",{
+        events:{
+            ".close,.modal-close" :{
+                click: function (event) {
+                    this.remove();
+                }
             }
         }
     });
 
-}(window.nomnom = window.nomnom || {}));
\ No newline at end of file
+}(window.nomnom = window.nomnom || {}, window.jQuery || {}));
\ No newline at end of file
diff --git 
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
index e31c57f..30d04e6 100644
--- 
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
@@ -16,15 +16,20 @@
  * specific language governing permissions and limitations
  * 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}" 
data-callback="${properties.callback}">
-       <fieldset class="form-wrapper field">
-               <input type="hidden" name="_charset_" value="utf-8" />
-               <sling:include path="fields" 
resourceType="sling-cms/components/general/container" />
-               <div class="Field-Group">
-                       <button type="submit" class="button is-primary" 
title="<sling:encode value="${properties.button}" mode="HTML_ATTR" />">
-                               <sling:encode value="${properties.button}" 
mode="HTML" />
-                       </button>
-               </div>
-       </fieldset>
+<%@include file="/libs/sling-cms/global.jsp"%>
+<h1 class="title">${properties.title}</h1>
+<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-wrapper field">
+        <input type="hidden" name="_charset_" value="utf-8" />
+        <sling:include path="fields"
+            resourceType="sling-cms/components/general/container" />
+    </fieldset>
+    <button type="submit" class="button is-primary">
+        <sling:encode value="${properties.button}" mode="HTML" />
+    </button>
+    <button type="button" class="button close">Cancel</button>
 </form>
\ No newline at end of file
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/modal/modal.jsp
 
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/modal/modal.jsp
index 16eedf0..d09bb00 100644
--- 
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/modal/modal.jsp
+++ 
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/modal/modal.jsp
@@ -16,5 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:include path="container" 
resourceType="sling-cms/components/general/container" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<div class="modal-background"></div>
+<div class="modal-content">
+<div class="box">
+<sling:include path="container" 
resourceType="sling-cms/components/general/container" />
+</div>
+</div>
+<button class="modal-close is-large" aria-label="close"></button>
\ No newline at end of file
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/upload.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/upload.json
index be0b14a..8d79ada 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/upload.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/upload.json
@@ -10,6 +10,7 @@
             "slingform": {
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
+                "title": "Add File",
                 "button": "Upload File",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
index eef71cd..9a04c29 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
@@ -1,54 +1,55 @@
 {
-       "jcr:primaryType": "sling:Page",
-       "jcr:content": {
-               "sling:resourceType": "sling-cms/components/pages/modal",
-               "jcr:title": "Create Folder",
-               "jcr:primaryType": "nt:unstructured",
-               "container": {
-                       "jcr:primaryType": "nt:unstructured",
-                       "sling:resourceType": 
"sling-cms/components/general/container",
-                       "slingform": {
-                               "jcr:primaryType": "nt:unstructured",
-                               "sling:resourceType": 
"sling-cms/components/editor/slingform",
-                               "actionSuffix": "/*",
-                               "button": "Create Folder",
-                               
"successPrepend":"/libs/sling-cms/content/site/content.html",
-                               "fields": {
-                                       "jcr:primaryType": "nt:unstructured",
-                                       "sling:resourceType": 
"sling-cms/components/general/container",
-                                       "title": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/text",
-                                               "label": "Title",
-                                               "name": "jcr:content/jcr:title",
-                                               "required": true
-                                       },
-                                       "name": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/text",
-                                               "label": "Name",
-                                               "name": ":name"
-                                       },
-                                       "nameParam": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
-                                               "name": ":nameParam",
-                                               "value":"jcr:content/jcr:title"
-                                       },
-                                       "primaryType": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
-                                               "name": "jcr:primaryType",
-                                               "value": "sling:OrderedFolder"
-                                       },
-                                       "contentPrimaryType": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
-                                               "name": 
"jcr:content/jcr:primaryType",
-                                               "value": "nt:unstructured"
-                                       }
-                               }
-                       }
-               }
-       }
-}
\ No newline at end of file
+    "jcr:primaryType": "sling:Page",
+    "jcr:content": {
+        "sling:resourceType": "sling-cms/components/pages/modal",
+        "jcr:title": "Create Folder",
+        "jcr:primaryType": "nt:unstructured",
+        "container": {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": "sling-cms/components/general/container",
+            "slingform": {
+                "jcr:primaryType": "nt:unstructured",
+                "sling:resourceType": "sling-cms/components/editor/slingform",
+                "actionSuffix": "/*",
+                "title": "Add Folder",
+                "button": "Create Folder",
+                "successPrepend": "/libs/sling-cms/content/site/content.html",
+                "fields": {
+                    "jcr:primaryType": "nt:unstructured",
+                    "sling:resourceType": 
"sling-cms/components/general/container",
+                    "title": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/text",
+                        "label": "Title",
+                        "name": "jcr:content/jcr:title",
+                        "required": true
+                    },
+                    "name": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/text",
+                        "label": "Name",
+                        "name": ":name"
+                    },
+                    "nameParam": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
+                        "name": ":nameParam",
+                        "value": "jcr:content/jcr:title"
+                    },
+                    "primaryType": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
+                        "name": "jcr:primaryType",
+                        "value": "sling:OrderedFolder"
+                    },
+                    "contentPrimaryType": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
+                        "name": "jcr:content/jcr:primaryType",
+                        "value": "nt:unstructured"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json
index 28bdc22..509fbb3 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json
@@ -10,7 +10,8 @@
             "slingform": {
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
-                "button": "Edit Folder",
+                "title":"Edit Folder",
+                "button": "Update Folder",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/create.json
index b300caf..751aeee 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/create.json
@@ -12,6 +12,7 @@
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "addDate": false,
                 "actionSuffix": "/*",
+                "title": "Add Mapping",
                 "button": "Create Mapping",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
index 338f2c5..7a39d90 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
@@ -9,6 +9,7 @@
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "addDate": false,
+                "title": "Edit Mapping",
                 "button": "Update Mapping",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
index ddf0fd3..d0a7cc1 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
@@ -10,6 +10,7 @@
             "slingform": {
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
+                "title": "Add Page",
                 "button": "Create Page",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/create.json
index 830e49a..058747f 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/create.json
@@ -11,6 +11,7 @@
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "actionSuffix": "/*",
+                "title": "Add Site",
                 "button": "Create Site",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json
index 5d49818..aec5cdc 100644
--- 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json
+++ 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json
@@ -11,6 +11,7 @@
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "actionSuffix": "/*",
+                "title": "Add Site Group",
                 "button": "Create Site Group",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json
index 49bd48b..51d0c1c 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json
@@ -10,7 +10,8 @@
             "slingform": {
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
-                "button": "Edit Site",
+                "title": "Edit Site",
+                "button": "Update Site",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",
                     "sling:resourceType": 
"sling-cms/components/general/container",
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
index b62df5e..c0510ad 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
@@ -11,7 +11,8 @@
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "actionSuffix": "/*",
-                "button": "Edit Site Group",
+                "title": "Edit Site Group",
+                "button": "Update Site Group",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/create.json
index 8ca810e..3271749 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/create.json
@@ -1,47 +1,47 @@
 {
-       "jcr:primaryType": "sling:Page",
-       "jcr:content": {
-               "sling:resourceType": "sling-cms/components/pages/modal",
-               "jcr:title": "Create Taxonomy",
-               "jcr:primaryType": "nt:unstructured",
-               "container": {
-                       "jcr:primaryType": "nt:unstructured",
-                       "sling:resourceType": 
"sling-cms/components/general/container",
-                       "slingform": {
-                               "jcr:primaryType": "nt:unstructured",
-                               "sling:resourceType": 
"sling-cms/components/editor/slingform",
-                               "actionSuffix": "/*",
-                               "button": "Create Taxonomy",
-                               "fields": {
-                                       "jcr:primaryType": "nt:unstructured",
-                                       "sling:resourceType": 
"sling-cms/components/general/container",
-                                       "title": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/text",
-                                               "label": "Title",
-                                               "name": "jcr:title",
-                                               "required": true
-                                       },
-                                       "name": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/text",
-                                               "label": "Name",
-                                               "name": ":name"
-                                       },
-                                       "nameParam": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
-                                               "name": ":nameParam",
-                                               "value": "jcr:title"
-                                       },
-                                       "primaryType": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
-                                               "name": "jcr:primaryType",
-                                               "value": "sling:Taxonomy"
-                                       }
-                               }
-                       }
-               }
-       }
-}
\ No newline at end of file
+    "jcr:primaryType": "sling:Page",
+    "jcr:content": {
+        "sling:resourceType": "sling-cms/components/pages/modal",
+        "jcr:title": "Add Taxonomy Item",
+        "modalText": "Create Taxonomy Item",
+        "jcr:primaryType": "nt:unstructured",
+        "container": {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": "sling-cms/components/general/container",
+            "slingform": {
+                "jcr:primaryType": "nt:unstructured",
+                "sling:resourceType": "sling-cms/components/editor/slingform",
+                "actionSuffix": "/*",
+                "fields": {
+                    "jcr:primaryType": "nt:unstructured",
+                    "sling:resourceType": 
"sling-cms/components/general/container",
+                    "title": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/text",
+                        "label": "Title",
+                        "name": "jcr:title",
+                        "required": true
+                    },
+                    "name": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/text",
+                        "label": "Name",
+                        "name": ":name"
+                    },
+                    "nameParam": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
+                        "name": ":nameParam",
+                        "value": "jcr:title"
+                    },
+                    "primaryType": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/hidden",
+                        "name": "jcr:primaryType",
+                        "value": "sling:Taxonomy"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/edit.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/edit.json
index 7528fe0..e2043de 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/edit.json
@@ -1,28 +1,28 @@
 {
-       "jcr:primaryType": "sling:Page",
-       "jcr:content": {
-               "sling:resourceType": "sling-cms/components/pages/modal",
-               "jcr:title": "Edit Taxonomy Item",
-               "jcr:primaryType": "nt:unstructured",
-               "container": {
-                       "jcr:primaryType": "nt:unstructured",
-                       "sling:resourceType": 
"sling-cms/components/general/container",
-                       "slingform": {
-                               "jcr:primaryType": "nt:unstructured",
-                               "sling:resourceType": 
"sling-cms/components/editor/slingform",
-                               "button": "Update Taxonomy",
-                               "fields": {
-                                       "jcr:primaryType": "nt:unstructured",
-                                       "sling:resourceType": 
"sling-cms/components/general/container",
-                                       "title": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "sling:resourceType": 
"sling-cms/components/editor/fields/text",
-                                               "label": "Title",
-                                               "name": "jcr:title",
-                                               "required": true
-                                       }
-                               }
-                       }
-               }
-       }
-}
\ No newline at end of file
+    "jcr:primaryType": "sling:Page",
+    "jcr:content": {
+        "sling:resourceType": "sling-cms/components/pages/modal",
+        "jcr:title": "Edit Taxonomy Item",
+        "modalText": "Update Taxonomy",
+        "jcr:primaryType": "nt:unstructured",
+        "container": {
+            "jcr:primaryType": "nt:unstructured",
+            "sling:resourceType": "sling-cms/components/general/container",
+            "slingform": {
+                "jcr:primaryType": "nt:unstructured",
+                "sling:resourceType": "sling-cms/components/editor/slingform",
+                "fields": {
+                    "jcr:primaryType": "nt:unstructured",
+                    "sling:resourceType": 
"sling-cms/components/general/container",
+                    "title": {
+                        "jcr:primaryType": "nt:unstructured",
+                        "sling:resourceType": 
"sling-cms/components/editor/fields/text",
+                        "label": "Title",
+                        "name": "jcr:title",
+                        "required": true
+                    }
+                }
+            }
+        }
+    }
+}
diff --git 
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/create.json 
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/create.json
index bce0362..0e4d80a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/create.json
@@ -2,7 +2,8 @@
     "jcr:primaryType": "sling:Page",
     "jcr:content": {
         "sling:resourceType": "sling-cms/components/pages/modal",
-        "jcr:title": "Create Template",
+        "jcr:title": "Add Template",
+        "modalText": "Create Template",
         "jcr:primaryType": "nt:unstructured",
         "container": {
             "jcr:primaryType": "nt:unstructured",
@@ -11,7 +12,6 @@
                 "jcr:primaryType": "nt:unstructured",
                 "sling:resourceType": "sling-cms/components/editor/slingform",
                 "actionSuffix": "/templates/",
-                "button": "Create Template",
                 "successPrepend": "/libs/sling-cms/content/site/content.html",
                 "fields": {
                     "jcr:primaryType": "nt:unstructured",

Reply via email to