You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/08/12 20:48:54 UTC
[sling-org-apache-sling-app-cms] 04/05: Enabling actions to have a
resource type
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 42f1f915ba0d1e50cd7850031e808d3f4406301a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Aug 12 16:48:14 2020 -0400
Enabling actions to have a resource type
---
.../components/cms/actions/basic/basic.jsp | 26 +++++++++++
.../components/cms/actions/modal/modal.jsp | 26 +++++++++++
.../components/cms/columns/actions/actions.jsp | 24 ++--------
.../components/cms/contentgrid/contentgrid.jsp | 27 +++--------
.../jcr_root/libs/sling-cms/content/auth/list.json | 26 +++++------
.../libs/sling-cms/content/config/bucket.json | 8 ++--
.../libs/sling-cms/content/config/buckets.json | 8 ++--
.../libs/sling-cms/content/config/configs.json | 8 ++--
.../libs/sling-cms/content/i18n/dictionaries.json | 4 +-
.../libs/sling-cms/content/i18n/dictionary.json | 2 +-
.../libs/sling-cms/content/mappings/list.json | 12 ++---
.../jcr_root/libs/sling-cms/content/page/edit.json | 12 ++---
.../libs/sling-cms/content/site/content.json | 52 +++++++++++-----------
.../libs/sling-cms/content/site/sites.json | 12 ++---
.../libs/sling-cms/content/siteconfig/editor.json | 8 ++--
.../libs/sling-cms/content/static/content.json | 38 ++++++++--------
.../libs/sling-cms/content/taxonomy/list.json | 8 ++--
.../sling-cms/content/transformations/editor.json | 8 ++--
.../sling-cms/content/usergenerated/content.json | 10 ++---
19 files changed, 168 insertions(+), 151 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp
new file mode 100644
index 0000000..4aa1684
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/basic/basic.jsp
@@ -0,0 +1,26 @@
+<%-- /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */ --%>
+<%@include file="/libs/sling-cms/global.jsp"%>
+<a class="button" ${actionConfig.valueMap.new != false ? 'target="_blank"' : ''} href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
+ <span class="jam jam-${actionConfig.valueMap.icon}">
+ <span class="is-vhidden">
+ ${sling:encode(actionConfig.valueMap.title,'HTML')}
+ </span>
+ </span>
+</a>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp
new file mode 100644
index 0000000..6902f05
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/actions/modal/modal.jsp
@@ -0,0 +1,26 @@
+<%-- /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */ --%>
+<%@include file="/libs/sling-cms/global.jsp"%>
+<a class="button Fetch-Modal" data-title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}" data-path="${actionConfig.valueMap.ajaxPath != null ? actionConfig.valueMap.ajaxPath : '.Main-Content form'}" href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
+ <span class="jam jam-${actionConfig.valueMap.icon}">
+ <span class="is-vhidden">
+ ${sling:encode(actionConfig.valueMap.title,'HTML')}
+ </span>
+ </span>
+</a>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
index f2b3f07..4790956 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
@@ -18,26 +18,8 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<td class="is-vhidden cell-actions">
- <c:forEach var="actionConfig" items="${sling:listChildren(colConfig)}">
- <c:choose>
- <c:when test="${actionConfig.valueMap.modal}">
- <a class="button Fetch-Modal" data-title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}" data-path="${actionConfig.valueMap.ajaxPath != null ? actionConfig.valueMap.ajaxPath : '.Main-Content form'}" href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
- <span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
- ${sling:encode(actionConfig.valueMap.title,'HTML')}
- </span>
- </span>
- </a>
- </c:when>
- <c:otherwise>
- <a class="button" ${actionConfig.valueMap.new != false ? 'target="_blank"' : ''} href="${actionConfig.valueMap.prefix}${resource.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
- <span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
- ${sling:encode(actionConfig.valueMap.title,'HTML')}
- </span>
- </span>
- </a>
- </c:otherwise>
- </c:choose>
+ <c:forEach var="ac" items="${sling:listChildren(colConfig)}">
+ <c:set var="actionConfig" value="${ac}" scope="request" />
+ <sling:include path="${resource.path}" resourceType="${actionConfig.resourceType}" />
</c:forEach>
</td>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
index 200494c..7678f2c 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
@@ -60,28 +60,11 @@
</figure>
<div class="is-vhidden cell-actions">
<sling:getResource base="${resource}" path="types/${child.valueMap['jcr:primaryType']}/columns/actions" var="colConfig" />
-
- <c:forEach var="actionConfig" items="${sling:listChildren(colConfig)}">
- <c:choose>
- <c:when test="${actionConfig.valueMap.modal}">
- <a class="button Fetch-Modal" data-title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}" data-path="${actionConfig.valueMap.ajaxPath != null ? actionConfig.valueMap.ajaxPath : '.Main-Content form'}" href="${actionConfig.valueMap.prefix}${child.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
- <span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
- ${sling:encode(actionConfig.valueMap.title,'HTML')}
- </span>
- </span>
- </a>
- </c:when>
- <c:otherwise>
- <a class="button" ${actionConfig.valueMap.new != false ? 'target="_blank"' : ''} href="${actionConfig.valueMap.prefix}${child.path}" title="${sling:encode(actionConfig.valueMap.title,'HTML_ATTR')}">
- <span class="jam jam-${actionConfig.valueMap.icon}">
- <span class="is-vhidden">
- ${sling:encode(actionConfig.valueMap.title,'HTML')}
- </span>
- </span>
- </a>
- </c:otherwise>
- </c:choose>
+ <c:forEach var="ac" items="${sling:listChildren(colConfig)}">
+ <c:set var="actionConfig" value="${ac}" scope="request" />
+ <!-- Resource: ${resource} -->
+ <!-- Action Config: ${actionConfig} -->
+ <sling:include path="${child.path}" resourceType="${actionConfig.resourceType}" />
</c:forEach>
</div>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/auth/list.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/auth/list.json
index 376fcad..4bb4849 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/auth/list.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/auth/list.json
@@ -64,14 +64,14 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -93,28 +93,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"membership": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Group Membership",
"icon": "user-circle",
"prefix": "/cms/auth/membership.html"
},
"members": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Group Members",
"icon": "users",
"prefix": "/cms/auth/group/members.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Group",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Group",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -136,7 +136,7 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"membership": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Group Membership",
"icon": "user-circle",
"prefix": "/cms/auth/membership.html"
@@ -158,42 +158,42 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"profile": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "User Profile",
"icon": "id-card",
"prefix": "/cms/auth/user/profile.html"
},
"password": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Change Password",
"icon": "key",
"prefix": "/cms/auth/user/password.html"
},
"status": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Status",
"icon": "stop-sign",
"prefix": "/cms/auth/user/status.html"
},
"membership": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Group Membership",
"icon": "user-circle",
"prefix": "/cms/auth/membership.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy User",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete User",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/bucket.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/bucket.json
index 28ef374..dbeda1f 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/bucket.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/bucket.json
@@ -73,28 +73,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Config Properties",
"icon": "cog",
"prefix": "/cms/config/metadata.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Config",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Site Config",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/buckets.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/buckets.json
index 308ebde..4da37e7 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/buckets.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/buckets.json
@@ -73,28 +73,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/configs.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/configs.json
index fd81c6a..8d98689 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/configs.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/configs.json
@@ -73,28 +73,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
index 9ca5c0c..5e819d2 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
@@ -68,7 +68,7 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"new": false,
"title": "Edit Dictionary Properties",
"icon": "cog",
@@ -76,7 +76,7 @@
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete i18n Dictionary",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionary.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionary.json
index 330916f..355cd9c 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionary.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionary.json
@@ -64,7 +64,7 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete i18n Dictionary",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
index 5c90695..a83d004 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
@@ -77,21 +77,21 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Mapping",
"icon": "pencil-f",
"prefix": "/cms/mappings/edit.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Mapping",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Mapping",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -124,21 +124,21 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
index af50c6c..ecf9b86 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
@@ -16,28 +16,28 @@
"edit": {
"jcr:primaryType": "nt:unstructured",
"ajaxPath": ".Form-Ajax",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"prefix": "/cms/page/editproperties.html",
"title": "Edit Page Properties",
"icon": "cog"
},
"insights": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Insights",
"icon": "info",
"prefix": "/cms/shared/insights.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Page",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
@@ -45,14 +45,14 @@
"version": {
"jcr:primaryType": "nt:unstructured",
"ajaxPath": ".versionmanager",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Manage Versions",
"icon": "history",
"prefix": "/cms/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Page",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
index 4040af6..2c860ba 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
@@ -102,35 +102,35 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Edit Page",
"icon": "pencil-f",
"prefix": "/cms/page/edit.html"
},
"properties": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Page Properties",
"icon": "cog",
"prefix": "/cms/page/editproperties.html"
},
"insights": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Insights",
"icon": "info",
"prefix": "/cms/shared/insights.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Page",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
@@ -138,14 +138,14 @@
"version": {
"jcr:primaryType": "nt:unstructured",
"ajaxPath": ".versionmanager",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Manage Versions",
"icon": "history",
"prefix": "/cms/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete the specified page",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -188,28 +188,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"download": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Download file",
"icon": "download",
"prefix": "/cms/file/download.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy File",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete File",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -251,35 +251,35 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit File Properties",
"icon": "cog",
"prefix": "/cms/file/edit.html"
},
"optimize": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Optimize File",
"icon": "archive",
"prefix": "/cms/file/optimize.html"
},
"download": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Download file",
"icon": "download",
"prefix": "/cms/file/download.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy File",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
@@ -287,14 +287,14 @@
"version": {
"jcr:primaryType": "nt:unstructured",
"ajaxPath": ".versionmanager",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Manage Versions",
"icon": "history",
"prefix": "/cms/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete File",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -337,28 +337,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -401,28 +401,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
index e0d7a9c..283964a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
@@ -81,21 +81,21 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Site Properties",
"icon": "cog",
"prefix": "/cms/site/edit.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Site",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete the specified site",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -129,14 +129,14 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Site Group Properties",
"icon": "cog",
"prefix": "/cms/site/editgroup.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Site Group",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
@@ -146,7 +146,7 @@
"title": "Delete Site Group",
"icon": "trash",
"prefix": "/cms/shared/delete.html",
- "modal": true
+ "sling:resourceType": "sling-cms/components/cms/actions/modal"
}
}
}
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/siteconfig/editor.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/siteconfig/editor.json
index 8df1da5..224977d 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/siteconfig/editor.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/siteconfig/editor.json
@@ -67,7 +67,7 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"new": false,
"title": "Edit Template",
"icon": "pencil-f",
@@ -75,21 +75,21 @@
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Template",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Template",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/static/content.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/static/content.json
index 1f2f122..8ae278a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/static/content.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/static/content.json
@@ -96,35 +96,35 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit File Properties",
"icon": "cog",
"prefix": "/cms/file/edit.html"
},
"optimize": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Optimize File",
"icon": "archive",
"prefix": "/cms/file/optimize.html"
},
"download": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Download file",
"icon": "download",
"prefix": "/cms/file/download.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy File",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
@@ -132,14 +132,14 @@
"version": {
"jcr:primaryType": "nt:unstructured",
"ajaxPath": ".versionmanager",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Manage Versions",
"icon": "history",
"prefix": "/cms/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete File",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -182,28 +182,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"download": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Download file",
"icon": "download",
"prefix": "/cms/file/download.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy File",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete File",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -246,28 +246,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -310,28 +310,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
index 7c7604e..5b24ddf 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
@@ -72,28 +72,28 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Taxonomy Item",
"icon": "pencil-f",
"prefix": "/cms/taxonomy/edit.html"
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Taxonomy Item",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Taxonomy Item",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/transformations/editor.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/transformations/editor.json
index c686ccc..4d0e44a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/transformations/editor.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/transformations/editor.json
@@ -67,7 +67,7 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"new": false,
"title": "Edit Transformation",
"icon": "pencil-f",
@@ -75,21 +75,21 @@
},
"references": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "References",
"icon": "directions",
"prefix": "/cms/shared/references.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Transformation",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Transformation",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
index e91504e..2786147 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
@@ -88,14 +88,14 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": false,
+ "sling:resourceType": "sling-cms/components/cms/actions/basic",
"title": "Review User Generated Content",
"icon": "eye",
"prefix": "/cms/usergenerated/review.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete User Generated Content",
"icon": "trash",
"prefix": "/cms/shared/delete.html"
@@ -138,21 +138,21 @@
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Edit Folder Properties",
"icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Move / Copy Folder",
"icon": "move-alt",
"prefix": "/cms/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
- "modal": true,
+ "sling:resourceType": "sling-cms/components/cms/actions/modal",
"title": "Delete Folder",
"icon": "trash",
"prefix": "/cms/shared/delete.html"