This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 10cafc2 Moving the content table columns to sub-components
10cafc2 is described below
commit 10cafc236bc353edf4b766e40e0ac1dd541e18f4
Author: Dan Klco <[email protected]>
AuthorDate: Tue Feb 6 21:43:03 2018 -0500
Moving the content table columns to sub-components
---
.../components/cms/columns/actions/actions.jsp | 35 ++++++++
.../lastmodified/lastmodified.jsp} | 20 ++---
.../fileeditorconfig.jsp => columns/name/name.jsp} | 26 +++---
.../publish/publish.jsp} | 27 ++++---
.../static/static.jsp} | 17 ++--
.../fileeditorconfig.jsp => columns/text/text.jsp} | 26 +++---
.../components/cms/contenttable/contenttable.jsp | 68 +---------------
.../cms/fileeditorconfig/fileeditorconfig.jsp | 6 +-
.../libs/sling-cms/content/file/editors.json | 22 ++----
.../libs/sling-cms/content/i18n/dictionaries.json | 20 ++---
.../libs/sling-cms/content/site/content.json | 92 +++++++++-------------
.../libs/sling-cms/content/taxonomy/list.json | 23 ++----
12 files changed, 153 insertions(+), 229 deletions(-)
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
new file mode 100644
index 0000000..edc394a
--- /dev/null
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/actions/actions.jsp
@@ -0,0 +1,35 @@
+<%-- /*
+ * 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"%>
+<td class="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')}">
+ ${actionConfig.valueMap.text}
+ </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')}">
+ ${actionConfig.valueMap.text}
+ </a>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
similarity index 54%
copy from
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
copy to
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
index df7e614..471d139 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
@@ -16,15 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
-<c:set var="cmsEditEnabled" value="true" scope="request" />
-
-<h3>Page Templates</h3>
-<c:set var="oldAvailableTypes" value="${availableTypes}" />
-<c:set var="availableTypes" value="SlingCMS-FileEditor" scope="request" />
-<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
-<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<c:set var="modifiedProperty"
value="${colConfig.valueMap.subPath}jcr:lastModified" />
+<c:set var="modifiedByProperty"
value="${colConfig.valueMap.subPath}jcr:lastModifiedBy" />
+<fmt:formatDate var="lastModified" type = "both" dateStyle = "medium"
timeStyle = "medium" value="${resource.valueMap[modifiedProperty].time}" />
+<td class="Cell-Static" title="${sling:encode(colValue,'HTML_ATTR')}">
+ <sling:encode value="${lastModified}" mode="HTML" /><br/>
+ <sling:encode value="${resource.valueMap[modifiedByProperty]}"
mode="HTML" />
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/name/name.jsp
similarity index 54%
copy from
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
copy to
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/name/name.jsp
index df7e614..0016ef0 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/name/name.jsp
@@ -16,15 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
-<c:set var="cmsEditEnabled" value="true" scope="request" />
-
-<h3>Page Templates</h3>
-<c:set var="oldAvailableTypes" value="${availableTypes}" />
-<c:set var="availableTypes" value="SlingCMS-FileEditor" scope="request" />
-<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
-<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<td class="Cell-Name">
+ <c:set var="colValue" value="${resource.name}" />
+ <c:choose>
+ <c:when test="${colConfig.valueMap.link}">
+ <a href="${colConfig.valueMap.prefix}${resource.path}">
+ <sling:encode value="${colValue}" mode="HTML" />
+ </a>
+ </c:when>
+ <c:otherwise>
+ <sling:encode value="${colValue}" mode="HTML" />
+ </c:otherwise>
+ </c:choose>
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
similarity index 54%
copy from
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
copy to
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
index df7e614..71a7e00 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
-<c:set var="cmsEditEnabled" value="true" scope="request" />
-
-<h3>Page Templates</h3>
-<c:set var="oldAvailableTypes" value="${availableTypes}" />
-<c:set var="availableTypes" value="SlingCMS-FileEditor" scope="request" />
-<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
-<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<td class="Cell-Publish">
+ <c:choose>
+ <c:when
test="${sling:getRelativeResource(resource,'jcr:content').valueMap.published}">
+ <a class="Button Fetch-Modal"
href="/cms/shared/unpublish.html${resource.path}" title="Content Published"
data-title="Unpublish" data-path=".Main-Content form">
+ ✓
+ </a>
+ </c:when>
+ <c:otherwise>
+ <a class="Button Fetch-Modal"
href="/cms/shared/publish.html${resource.path}" title="Content Not Published"
data-title="Publish" data-path=".Main-Content form">
+ ✗
+ </a>
+ </c:otherwise>
+ </c:choose>
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/static/static.jsp
similarity index 54%
copy from
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
copy to
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/static/static.jsp
index df7e614..484c5b7 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/static/static.jsp
@@ -16,15 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
-<c:set var="cmsEditEnabled" value="true" scope="request" />
-
-<h3>Page Templates</h3>
-<c:set var="oldAvailableTypes" value="${availableTypes}" />
-<c:set var="availableTypes" value="SlingCMS-FileEditor" scope="request" />
-<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
-<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<c:set var="colValue" value="${colConfig.valueMap.value}" />
+<td class="Cell-Static" title="${sling:encode(colValue,'HTML_ATTR')}">
+ <sling:encode value="${colValue}" mode="HTML" />
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/text/text.jsp
similarity index 54%
copy from
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
copy to
cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/text/text.jsp
index df7e614..80b0222 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/text/text.jsp
@@ -16,15 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
-<c:set var="cmsEditEnabled" value="true" scope="request" />
-
-<h3>Page Templates</h3>
-<c:set var="oldAvailableTypes" value="${availableTypes}" />
-<c:set var="availableTypes" value="SlingCMS-FileEditor" scope="request" />
-<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
-<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<c:set var="colValue"
value="${resource.valueMap[colConfig.valueMap.property]}" />
+<td class="Cell-Text" title="${sling:encode(colValue,'HTML_ATTR')}">
+ <c:choose>
+ <c:when test="${colConfig.valueMap.link}">
+ <a href="${colConfig.valueMap.prefix}${resource.path}">
+ <sling:encode value="${colValue}" mode="HTML" />
+ </a>
+ </c:when>
+ <c:otherwise>
+ <sling:encode value="${colValue}" mode="HTML" />
+ </c:otherwise>
+ </c:choose>
+</td>
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
index d10a660..a94786f 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
@@ -33,72 +33,10 @@
<c:if test="${typeConfig != null &&
!fn:contains(child.name,':')}">
<tr data-resource="${child.path}"
data-type="${typeConfig.path}">
<c:forEach var="column"
items="${sling:listChildren(sling:getRelativeResource(typeConfig,'columns'))}">
- <sling:getResource var="colConfig"
base="${typeConfig}" path="columns/${column.name}" />
+ <c:set var="configPath"
value="columns/${column.name}"/>
+ <c:set var="colConfig"
value="${sling:getRelativeResource(typeConfig,configPath)}" scope="request" />
<c:if test="${colConfig !=
null}">
- <c:choose>
- <c:when
test="${colConfig.valueMap.type == 'Actions'}">
- <td
class="Cell-${colConfig.valueMap.type}">
-
<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')}">
-
${actionConfig.valueMap.text}
-
</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')}">
-
${actionConfig.valueMap.text}
-
</a>
-
</c:otherwise>
-
</c:choose>
-
</c:forEach>
- </td>
- </c:when>
- <c:when
test="${colConfig.valueMap.type == 'Publish'}">
- <td
class="Cell-${colConfig.valueMap.type}">
-
<c:choose>
-
<c:when
test="${sling:getRelativeResource(child,'jcr:content').valueMap.published}">
-
<a class="Button Fetch-Modal"
href="/cms/shared/unpublish.html${child.path}" title="Content Published"
data-title="Unpublish" data-path=".Main-Content form">
-
✓
-
</a>
-
</c:when>
-
<c:otherwise>
-
<a class="Button Fetch-Modal"
href="/cms/shared/publish.html${child.path}" title="Content Not Published"
data-title="Publish" data-path=".Main-Content form">
-
✗
-
</a>
-
</c:otherwise>
-
</c:choose>
- </td>
- </c:when>
- <c:otherwise>
-
<c:choose>
-
<c:when test="${colConfig.valueMap.type == 'Static'}">
-
<c:set var="colValue" value="${colConfig.valueMap.value}" />
-
</c:when>
-
<c:when test="${colConfig.valueMap.type == 'String'}">
-
<c:set var="colValue"
value="${child.valueMap[colConfig.valueMap.property]}" />
-
</c:when>
-
<c:when test="${colConfig.valueMap.type == 'Date'}">
-
<fmt:formatDate var="colValue" type = "both" dateStyle = "medium"
timeStyle = "medium" value =
"${child.valueMap[colConfig.valueMap.property].time}" />
-
</c:when>
-
<c:when test="${colConfig.valueMap.type == 'Name'}">
-
<c:set var="colValue" value="${child.name}" />
-
</c:when>
-
</c:choose>
- <td
class="Cell-${colConfig.valueMap.type}"
title="${sling:encode(colValue,'HTML_ATTR')}">
-
<c:choose>
-
<c:when test="${colConfig.valueMap.link}">
-
<a href="${colConfig.valueMap.prefix}${child.path}">
-
<sling:encode value="${colValue}" mode="HTML" />
-
</a>
-
</c:when>
-
<c:otherwise>
-
<sling:encode value="${colValue}" mode="HTML" />
-
</c:otherwise>
-
</c:choose>
- </td>
- </c:otherwise>
- </c:choose>
+ <sling:include
path="${child.path}" resourceType="${colConfig.valueMap['sling:resourceType']}"
/>
</c:if>
</c:forEach>
</tr>
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
index df7e614..7d77ee9 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/fileeditorconfig/fileeditorconfig.jsp
@@ -17,8 +17,8 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
<c:set var="cmsEditEnabled" value="true" scope="request" />
+<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
<h3>Page Templates</h3>
<c:set var="oldAvailableTypes" value="${availableTypes}" />
@@ -26,5 +26,5 @@
<sling:include path="${slingRequest.requestPathInfo.suffix}/editors"
resourceType="sling-cms/components/general/container" />
<c:set var="availableTypes" value="${oldAvailableTypes}" scope="request" />
-<c:set var="cmsEditEnabled" value="false" scope="request" />
-<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
\ No newline at end of file
+<sling:call script="/libs/sling-cms/components/editor/scripts/finalize.jsp" />
+<c:set var="cmsEditEnabled" value="false" scope="request" />
\ No newline at end of file
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/editors.json
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/editors.json
index b13f593..3c6eb9f 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/editors.json
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/editors.json
@@ -40,10 +40,6 @@
"jcr:primaryType":
"nt:unstructured",
"title": "Last Modified"
},
- "lastModifiedBy": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified By"
- },
"actions": {
"jcr:primaryType":
"nt:unstructured",
"title": "Actions"
@@ -57,27 +53,23 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
- "link": false,
- "type": "Name"
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
+ "link": false
},
"title": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:title",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
+ "property":
"jcr:title"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath": ""
},
"actions": {
"jcr:primaryType": "nt:unstructured",
"type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": false,
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
index 7ce89c1..d7b6c44 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
@@ -40,10 +40,6 @@
"jcr:primaryType":
"nt:unstructured",
"title": "Last Modified"
},
- "lastModifiedBy": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified By"
- },
"actions": {
"jcr:primaryType":
"nt:unstructured",
"title": "Actions"
@@ -57,28 +53,24 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
"link": true,
- "type": "Name",
"prefix":
"/cms/i18n/dictionary.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:title",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
+ "property":
"jcr:content/jcr:title"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastModified",
+ "subPath":
"jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
"type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
index 840d658..8916a11 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
@@ -64,10 +64,6 @@
"jcr:primaryType":
"nt:unstructured",
"title": "Last Modified"
},
- "lastModifiedBy": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified By"
- },
"actions": {
"jcr:primaryType":
"nt:unstructured",
"title": "Actions"
@@ -81,37 +77,33 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
"link": true,
- "prefix":
"/cms/site/content.html",
- "type": "Name"
+ "prefix":
"/cms/site/content.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
"property":
"jcr:content/jcr:title",
"type": "String"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Publish"
+
"sling:resourceType": "sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
- "value": "Page",
- "type": "Static"
+
"sling:resourceType": "sling-cms/components/cms/columns/static",
+ "value": "Page"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath":
"jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": false,
@@ -150,36 +142,32 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
- "link": false,
- "type": "Name"
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
+ "link": false
},
"title": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
"link": false,
"type": "Name"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Publish"
+
"sling:resourceType": "sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
- "value": "File",
- "type": "Static"
+
"sling:resourceType": "sling-cms/components/cms/columns/static",
+ "value": "File"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath":
"jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
@@ -224,37 +212,33 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
"link": true,
- "prefix":
"/cms/site/content.html",
- "type": "Name"
+ "prefix":
"/cms/site/content.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
"property":
"jcr:content/jcr:title",
"type": "String"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Publish"
+
"sling:resourceType": "sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
- "value":
"Folder",
- "type": "Static"
+
"sling:resourceType": "sling-cms/components/cms/columns/static",
+ "value":
"Folder"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath":
"jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
@@ -285,37 +269,33 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
"link": true,
- "prefix":
"/cms/site/content.html",
- "type": "Name"
+ "prefix":
"/cms/site/content.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
"property":
"jcr:content/jcr:title",
"type": "String"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Publish"
+
"sling:resourceType": "sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
- "value":
"Folder",
- "type": "Static"
+
"sling:resourceType": "sling-cms/components/cms/columns/static",
+ "value":
"Folder"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath":
"jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
index cb81efc..cd8861e 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/list.json
@@ -41,10 +41,6 @@
"jcr:primaryType":
"nt:unstructured",
"title": "Last Modified"
},
- "lastModifiedBy": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified By"
- },
"actions": {
"jcr:primaryType":
"nt:unstructured",
"title": "Actions"
@@ -58,28 +54,23 @@
"jcr:primaryType":
"nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
+
"sling:resourceType": "sling-cms/components/cms/columns/name",
"link": true,
- "prefix":
"/cms/taxonomy/list.html",
- "type": "Name"
+ "prefix":
"/cms/taxonomy/list.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:title",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/text",
+ "property":
"jcr:title"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModified",
- "type": "Date"
- },
- "lastModifiedBy": {
-
"jcr:primaryType": "nt:unstructured",
- "property":
"jcr:content/jcr:lastModifiedBy",
- "type": "String"
+
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+ "subPath": ""
},
"actions": {
"jcr:primaryType": "nt:unstructured",
- "type":
"Actions",
+
"sling:resourceType": "sling-cms/components/cms/columns/actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
--
To stop receiving notification emails like this one, please contact
[email protected].
