You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/10/31 12:58:26 UTC
[sling-org-apache-sling-app-cms] branch master updated (a0ef72e ->
a2e522c)
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
discard a0ef72e initial changes for modal structure
new a2e522c SLING-8062 initial commit
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a0ef72e)
\
N -- N -- N refs/heads/master (a2e522c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/resources/jcr_root/libs/sling-cms/content/shared/delete.json | 2 +-
.../main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json | 1 +
.../main/resources/jcr_root/libs/sling-cms/content/shared/publish.json | 1 +
.../main/resources/jcr_root/libs/sling-cms/content/shared/search.json | 1 +
ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json | 2 +-
.../main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json | 1 -
6 files changed, 5 insertions(+), 3 deletions(-)
[sling-org-apache-sling-app-cms] 01/01: SLING-8062 initial commit
Posted by je...@apache.org.
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
commit a2e522cb4b8ebe46c9fa6e2cd9d7629aba4e557c
Author: JE Bailey <je...@apache.org>
AuthorDate: Tue Oct 30 15:15:35 2018 -0400
SLING-8062 initial commit
---
ui/src/main/frontend/src/js/cms.fields.js | 2 +-
ui/src/main/frontend/src/js/cms.modal.js | 15 ++--
.../components/editor/slingform/slingform.jsp | 22 +++---
.../sling-cms/components/pages/modal/modal.jsp | 18 ++++-
.../libs/sling-cms/content/file/upload.json | 4 +-
.../libs/sling-cms/content/folder/create.json | 4 +-
.../libs/sling-cms/content/folder/edit.json | 2 +-
.../libs/sling-cms/content/mappings/create.json | 5 +-
.../libs/sling-cms/content/mappings/edit.json | 3 +-
.../libs/sling-cms/content/shared/delete.json | 2 +-
.../libs/sling-cms/content/shared/movecopy.json | 1 +
.../libs/sling-cms/content/shared/publish.json | 1 +
.../libs/sling-cms/content/shared/search.json | 1 +
.../libs/sling-cms/content/site/create.json | 4 +-
.../libs/sling-cms/content/site/creategroup.json | 4 +-
.../jcr_root/libs/sling-cms/content/site/edit.json | 2 +-
.../libs/sling-cms/content/site/editgroup.json | 2 +-
.../libs/sling-cms/content/taxonomy/create.json | 92 +++++++++++-----------
.../libs/sling-cms/content/taxonomy/edit.json | 54 ++++++-------
.../libs/sling-cms/content/template/create.json | 4 +-
20 files changed, 130 insertions(+), 112 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..d81faf7 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,16 +42,15 @@
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.querySelector('.delete,.close-modal').addEventListener("click", function () {
+ modal.remove();
+ return false;
+ });
+ modal.classList.add('is-active');
}
};
request.send();
-
- modal.querySelector('.delete,.close-modal').addEventListener("click", function () {
- modal.remove();
- return false;
- });
- modal.classList.add('is-active');
}
}
});
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..6ace17b 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,15 @@
* 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"%>
+<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>
</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..64ea85a 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,19 @@
* 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-card is-draggable">
+<header class="modal-card-head"><p class="modal-card-title">${properties['jcr:title']}</p>
+<button class="delete" aria-label="close"></button></header>
+<section class="modal-card-body">
+<sling:include path="container" resourceType="sling-cms/components/general/container" />
+</section>
+<footer class="modal-card-foot">
+ <div class="Field-Group">
+ <button type="submit" class="button is-primary" title="<sling:encode value="${properties['sling:buttonText']}" mode="HTML_ATTR" />">
+ <sling:encode value="${properties['modalText']}" mode="HTML" />
+ </button>
+ </div>
+</footer>
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..2ab1d5a 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
@@ -2,15 +2,15 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Upload File",
+ "jcr:title": "Add File",
"jcr:primaryType": "nt:unstructured",
+ "modalText":"Upload File",
"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": "Upload File",
"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/folder/create.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
index eef71cd..eb1bd77 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
@@ -2,7 +2,8 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Create Folder",
+ "jcr:title": "Add Folder",
+ "modalText": "Create Folder",
"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": "/*",
- "button": "Create 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/folder/edit.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json
index 28bdc22..7bcd99c 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
@@ -4,13 +4,13 @@
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Edit Folder",
"jcr:primaryType": "nt:unstructured",
+ "modalText": "Edit Folder",
"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": "Edit 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..12d1f1e 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
@@ -2,7 +2,8 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Create Mapping",
+ "jcr:title": "Add Mapping",
+ "modalText": "Create Mapping",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -12,7 +13,7 @@
"sling:resourceType": "sling-cms/components/editor/slingform",
"addDate": false,
"actionSuffix": "/*",
- "button": "Create Mapping",
+
"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/edit.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
index 338f2c5..21280e3 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
@@ -2,7 +2,8 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Update Mapping",
+ "jcr:title": "Edit Mapping",
+ "modalText": "Update Mapping",
"jcr:primaryType": "nt:unstructured",
"container": {
"slingform": {
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/delete.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/delete.json
index bfe553b..55d6b3a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/delete.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/delete.json
@@ -3,6 +3,7 @@
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Delete Content",
+ "modalText": "Delete",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,7 +11,6 @@
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
- "button": "Delete",
"callback": "handledelete",
"fields": {
"jcr:primaryType": "nt:unstructured",
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json
index 144030f..7d23425 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json
@@ -4,6 +4,7 @@
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Move/Copy Content",
"jcr:primaryType": "nt:unstructured",
+ "modalText": "Move/Copy",
"container": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/container",
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/publish.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/publish.json
index bb76104..0fac406 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/publish.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/publish.json
@@ -3,6 +3,7 @@
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Publish Content",
+ "modalText": "Publish",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/search.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/search.json
index b9eeea0..1a6b5bc 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/search.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/search.json
@@ -3,6 +3,7 @@
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Search",
+
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
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..e0bc4ba 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
@@ -2,7 +2,8 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Create Site",
+ "jcr:title": "Add Site",
+ "modalText": "Create Site",
"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": "/*",
- "button": "Create Site",
"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/site/creategroup.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json
index 5d49818..57e8aca 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
@@ -2,7 +2,8 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Create Folder",
+ "jcr:title": "Add Site Group",
+ "modalText": "Create Site Group",
"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": "/*",
- "button": "Create 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/site/edit.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json
index 49bd48b..359d069 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
@@ -3,6 +3,7 @@
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Edit Site",
+ "modalText":"Update Site",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,7 +11,6 @@
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
- "button": "Edit 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..57b005a 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
@@ -3,6 +3,7 @@
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Edit Site Group",
+ "modal": "Update Site Group",
"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": "/*",
- "button": "Edit 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",