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 2018/09/24 21:23:39 UTC
[sling-org-apache-sling-app-cms] 02/02: Adding all of the fields
for SLING-7951
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-org-apache-sling-app-cms.git
commit 2fb9c2136960d5549c32a025b095488875a6322d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Sep 24 17:23:22 2018 -0400
Adding all of the fields for SLING-7951
---
.../components/editor/fields/well/well.jsp | 48 ++++++++
.../libs/sling-cms/content/admin/loadcontent.json | 137 +++++++++++----------
2 files changed, 121 insertions(+), 64 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/well/well.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/well/well.jsp
new file mode 100644
index 0000000..4295785
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/well/well.jsp
@@ -0,0 +1,48 @@
+<%-- /*
+ * 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"%>
+<div class="card field">
+ <c:choose>
+ <c:when test="${properties.collapse}">
+ <header class="card-header toggle-hidden" data-target="#${resource.name}">
+ <p class="card-header-title">
+ <sling:encode value="${properties.title}" mode="HTML" />
+ </p>
+ <a href="#" class="card-header-icon" aria-label="Expand">
+ <span class="icon">
+ <i class="jam jam-chevron-down" aria-hidden="true"></i>
+ </span>
+ </a>
+ </header>
+ <div class="card-content is-hidden" id="${resource.name}">
+ <sling:include path="content" resourceType="sling-cms/components/general/container" />
+ </div>
+ </c:when>
+ <c:otherwise>
+ <header class="card-header">
+ <p class="card-header-title">
+ <sling:encode value="${properties.title}" mode="HTML" />
+ </p>
+ </header>
+ <div class="card-content">
+ <sling:include path="content" resourceType="sling-cms/components/general/container" />
+ </div>
+ </c:otherwise>
+ </c:choose>
+</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/admin/loadcontent.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/admin/loadcontent.json
index c239456..cf5d9e0 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/admin/loadcontent.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/admin/loadcontent.json
@@ -40,70 +40,6 @@
"name": ":operation",
"value": "import"
},
- "autoCheckout": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/select",
- "label": "Auto Checkout",
- "name": ":autoCheckout",
- "options": {
- "no": {
- "label": "No",
- "value": "false"
- },
- "yes": {
- "label": "Yes",
- "value": "true"
- }
- }
- },
- "checkin": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/select",
- "label": "Checkin",
- "name": ":checkin",
- "options": {
- "no": {
- "label": "No",
- "value": "false"
- },
- "yes": {
- "label": "Yes",
- "value": "true"
- }
- }
- },
- "replace": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/select",
- "label": "Replace",
- "name": ":replace",
- "options": {
- "no": {
- "label": "No",
- "value": "false"
- },
- "yes": {
- "label": "Yes",
- "value": "true"
- }
- }
- },
- "replaceProperties": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/select",
- "label": "Replace Properties",
- "name": ":replaceProperties",
- "options": {
- "yes": {
- "label": "Yes",
- "value": "true"
- },
- "no": {
- "label": "No",
- "value": "false"
- }
- }
- },
"contentType": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/fields/select",
@@ -137,6 +73,79 @@
"sling:resourceType": "sling-cms/components/editor/fields/textarea",
"label": "Content",
"name": ":content"
+ },
+ "advanced": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/well",
+ "collapse": true,
+ "title": "Advanced",
+ "content": {
+ "jcr:primaryType": "nt:unstructured",
+ "autoCheckout": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/select",
+ "label": "Auto Checkout",
+ "name": ":autoCheckout",
+ "options": {
+ "no": {
+ "label": "No",
+ "value": "false"
+ },
+ "yes": {
+ "label": "Yes",
+ "value": "true"
+ }
+ }
+ },
+ "checkin": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/select",
+ "label": "Checkin",
+ "name": ":checkin",
+ "options": {
+ "no": {
+ "label": "No",
+ "value": "false"
+ },
+ "yes": {
+ "label": "Yes",
+ "value": "true"
+ }
+ }
+ },
+ "replace": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/select",
+ "label": "Replace",
+ "name": ":replace",
+ "options": {
+ "no": {
+ "label": "No",
+ "value": "false"
+ },
+ "yes": {
+ "label": "Yes",
+ "value": "true"
+ }
+ }
+ },
+ "replaceProperties": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/select",
+ "label": "Replace Properties",
+ "name": ":replaceProperties",
+ "options": {
+ "yes": {
+ "label": "Yes",
+ "value": "true"
+ },
+ "no": {
+ "label": "No",
+ "value": "false"
+ }
+ }
+ }
+ }
}
}
}