This is an automated email from the ASF dual-hosted git repository. jeb pushed a commit to branch SLING-7900 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 4d532b2777d9d9efdbf39edbf1704f8d1c66b61d Merge: 9dc63c1 7fa94f7 Author: JE Bailey <[email protected]> AuthorDate: Mon Oct 1 13:15:26 2018 -0400 Merge remote-tracking branch 'origin/master' into SLING-7900 Conflicts: ui/src/main/resources/jcr_root/conf/global.json docs/configure-site.md | 6 +- ui/src/main/resources/jcr_root/conf/global.json | 2 +- .../components/editor/fields/repeating/field.jsp | 2 +- .../components/editor/fields/taxonomy/field.jsp | 2 +- .../components/editor/fields/well/well.jsp | 48 ++++++++ .../libs/sling-cms/content/admin/loadcontent.json | 137 +++++++++++---------- vagrant/Vagrantfile | 2 +- 7 files changed, 128 insertions(+), 71 deletions(-) diff --cc ui/src/main/resources/jcr_root/conf/global.json index 12f7383,c2ea9ad..1110ed2 --- a/ui/src/main/resources/jcr_root/conf/global.json +++ b/ui/src/main/resources/jcr_root/conf/global.json @@@ -1,139 -1,139 +1,139 @@@ { - "jcr:primaryType": "sling:OrderedFolder", - "jcr:content": { - "jcr:primaryType": "nt:unstructured", - "jcr:title": "Global" - }, - "files": { - "jcr:primaryType": "sling:OrderedFolder", - "jcr:content": { - "jcr:primaryType": "nt:unstructured", - "jcr:title": "File Configurations" - }, - "editors": { - "jcr:primaryType": "sling:OrderedFolder", - "jcr:content": { - "jcr:primaryType": "nt:unstructured", - "jcr:title": "File Editor" - }, - "default": { - "jcr:primaryType": "sling:Config", - "jcr:title": "Default File Editor", - "sling:resourceType": "sling-cms/components/cms/fileeditorconfig", - "fields": { - "jcr:primaryType": "nt:unstructured", - "title": { - "jcr:primaryType": "nt:unstructured", - "required": false, - "name": "jcr:content/jcr:title", - "type": "text", - "label": "Title", - "sling:resourceType": "sling-cms/components/editor/fields/text" - }, - "jcrmimeType": { - "jcr:primaryType": "nt:unstructured", - "required": true, - "name": "jcr:content/jcr:mimeType", - "type": "text", - "label": "MIME Type", - "sling:resourceType": "sling-cms/components/editor/fields/text" - }, - "licensing": { - "jcr:primaryType": "nt:unstructured", - "required": false, - "name": "jcr:content/licensing", - "type": "text", - "label": "Licensing", - "sling:resourceType": "sling-cms/components/editor/fields/text" - }, - "taxonomy": { - "jcr:primaryType": "nt:unstructured", - "name": "jcr:content/sling:taxonomy", - "label": "Taxonomy", - "sling:resourceType": "sling-cms/components/editor/fields/taxonomy" - }, - "taxonomyTypeHint": { - "jcr:primaryType": "nt:unstructured", - "name": "jcr:content/sling:taxonomy@TypeHint", - "value": "String[]", - "sling:resourceType": "sling-cms/components/editor/fields/hidden" - }, - "published": { - "jcr:primaryType": "nt:unstructured", - "options": "Yes=true, No=false", - "name": "jcr:content/published", - "label": "Published", - "sling:resourceType": "sling-cms/components/editor/fields/select" - }, - "publishedTypeHint": { - "jcr:primaryType": "nt:unstructured", - "name": "jcr:content/published@TypeHint", - "value": "Boolean", - "sling:resourceType": "sling-cms/components/editor/fields/hidden" - } - } - } - } - }, - "site": { - "jcr:primaryType": "sling:Config", - "sling:resourceType": "sling-cms/components/cms/siteconfig", - "jcr:title": "Default Site Configuration", - "rewrite": { - "jcr:primaryType": "nt:unstructured", - "doctype": "<!DOCTYPE html>", - "attributes": [ - "action", - "href", - "src" - ] - }, - "templates": { - "jcr:primaryType": "nt:unstructured", - "base-page": { - "jcr:primaryType": "nt:unstructured", - "jcr:title": "Base Page", - "template": "{\r\n \"jcr:primaryType\": \"sling:Page\",\r\n \"jcr:content\": {\r\n \"jcr:primaryType\": \"nt:unstructured\",\r\n \"jcr:title\": \"{{title}}\",\r\n \"sling:template\": \"/conf/global/site/templates/base-page\",\r\n \"sling:resourceType\": \"reference/components/pages/base\",\r\n \"published\": false\r\n }\r\n}", - "availableComponentTypes": [ - "General" - ], - "allowedPaths": [ - "/content/apache/sling-apache-org.*" - ], - "sling:resourceType": "sling-cms/components/cms/pagetemplate", - "fields": { - "jcr:primaryType": "nt:unstructured", - "text": { - "jcr:primaryType": "nt:unstructured", - "required": true, - "name": "title", - "type": "text", - "label": "Title", - "sling:resourceType": "sling-cms/components/editor/fields/text" - }, - "text_1147023191": { - "jcr:primaryType": "nt:unstructured", - "required": true, - "name": ":name", - "type": "text", - "label": "Name", - "sling:resourceType": "sling-cms/components/editor/fields/text" - } - }, - "componentConfigurations": { - "jcr:primaryType": "nt:unstructured", - "componentconfig": { - "jcr:primaryType": "nt:unstructured", - "type": "reference/components/general/columncontrol", - "containerclass": "container", - "columns": [ - "50-50=col-md-6 col-md-6", - "100=col-md-12" - ], - "sling:resourceType": "sling-cms/components/cms/componentconfig" - } - } - } - } - } + "jcr:primaryType": "sling:OrderedFolder", + "jcr:content": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "Global" + }, + "files": { + "jcr:primaryType": "sling:OrderedFolder", + "jcr:content": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "File Configurations" + }, + "editors": { + "jcr:primaryType": "sling:OrderedFolder", + "jcr:content": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "File Editor" + }, + "default": { + "jcr:primaryType": "sling:Config", + "jcr:title": "Default File Editor", + "sling:resourceType": "sling-cms/components/cms/fileeditorconfig", + "fields": { + "jcr:primaryType": "nt:unstructured", + "title": { + "jcr:primaryType": "nt:unstructured", + "required": false, + "name": "jcr:content/jcr:title", + "type": "text", + "label": "Title", + "sling:resourceType": "sling-cms/components/editor/fields/text" + }, + "jcrmimeType": { + "jcr:primaryType": "nt:unstructured", + "required": true, + "name": "jcr:content/jcr:mimeType", + "type": "text", + "label": "MIME Type", + "sling:resourceType": "sling-cms/components/editor/fields/text" + }, + "licensing": { + "jcr:primaryType": "nt:unstructured", + "required": false, + "name": "jcr:content/licensing", + "type": "text", + "label": "Licensing", + "sling:resourceType": "sling-cms/components/editor/fields/text" + }, + "taxonomy": { + "jcr:primaryType": "nt:unstructured", + "name": "jcr:content/sling:taxonomy", + "label": "Taxonomy", + "sling:resourceType": "sling-cms/components/editor/fields/taxonomy" + }, + "taxonomyTypeHint": { + "jcr:primaryType": "nt:unstructured", + "name": "jcr:content/sling:taxonomy@TypeHint", + "value": "String[]", + "sling:resourceType": "sling-cms/components/editor/fields/hidden" + }, + "published": { + "jcr:primaryType": "nt:unstructured", + "options": "Yes=true, No=false", + "name": "jcr:content/published", + "label": "Published", + "sling:resourceType": "sling-cms/components/editor/fields/select" + }, + "publishedTypeHint": { + "jcr:primaryType": "nt:unstructured", + "name": "jcr:content/published@TypeHint", + "value": "Boolean", + "sling:resourceType": "sling-cms/components/editor/fields/hidden" + } + } + } + } + }, + "site": { + "jcr:primaryType": "sling:Config", + "sling:resourceType": "sling-cms/components/cms/siteconfig", + "jcr:title": "Default Site Configuration", + "rewrite": { + "jcr:primaryType": "nt:unstructured", + "doctype": "<!DOCTYPE html>", + "attributes": [ + "action", + "href", + "src" + ] + }, + "templates": { + "jcr:primaryType": "nt:unstructured", + "base-page": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "Base Page", + "template": "{\r\n \"jcr:primaryType\": \"sling:Page\",\r\n \"jcr:content\": {\r\n \"jcr:primaryType\": \"nt:unstructured\",\r\n \"jcr:title\": \"{{title}}\",\r\n \"sling:template\": \"/conf/global/site/templates/base-page\",\r\n \"sling:resourceType\": \"reference/components/pages/base\",\r\n \"published\": false\r\n }\r\n}", + "availableComponentTypes": [ + "General" + ], + "allowedPaths": [ - "/content/apache/apache-sling-org.*" ++ "/content/apache/sling-apache-org.*" + ], + "sling:resourceType": "sling-cms/components/cms/pagetemplate", + "fields": { + "jcr:primaryType": "nt:unstructured", + "text": { + "jcr:primaryType": "nt:unstructured", + "required": true, + "name": "title", + "type": "text", + "label": "Title", + "sling:resourceType": "sling-cms/components/editor/fields/text" + }, + "text_1147023191": { + "jcr:primaryType": "nt:unstructured", + "required": true, + "name": ":name", + "type": "text", + "label": "Name", + "sling:resourceType": "sling-cms/components/editor/fields/text" + } + }, + "componentConfigurations": { + "jcr:primaryType": "nt:unstructured", + "componentconfig": { + "jcr:primaryType": "nt:unstructured", + "type": "reference/components/general/columncontrol", + "containerclass": "container", + "columns": [ + "50-50=col-md-6 col-md-6", + "100=col-md-12" + ], + "sling:resourceType": "sling-cms/components/cms/componentconfig" + } + } + } + } + } }
