This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-7900
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 7ac67c636903c459ba69d9a0a1cb7b363f7469a7
Author: JE Bailey <jason.bai...@sas.com>
AuthorDate: Thu Sep 13 10:30:08 2018 -0400
UI Updates - Content Browsing
Taxonomy & Config Updates
---
.../create.json => actions/create/config.json} | 23 +-
.../editgroup.json => actions/create/page.json} | 28 +--
.../create.json => actions/create/taxonomy.json} | 19 +-
.../create.json => actions/create/template.json} | 2 +-
.../libs/sling-cms/content/actions/edit/file.json | 40 ++--
.../sling-cms/content/actions/edit/folder.json | 66 +++---
.../libs/sling-cms/content/actions/edit/site.json | 2 +-
.../editgroup.json => actions/edit/sitegroup.json} | 2 +-
.../editgroup.json => actions/edit/taxonomy.json} | 19 +-
.../sling-cms/content/actions/edit/template.json | 21 ++
.../content/actions/optimize/optimize.json | 21 ++
.../content/{ => actions}/shared/delete.json | 0
.../content/{ => actions}/shared/movecopy.json | 0
.../content/{ => actions}/shared/publish.json | 0
.../content/{ => actions}/shared/search.json | 0
.../content/{ => actions}/shared/unpublish.json | 0
.../content/{ => actions}/shared/versions.json | 0
.../editgroup.json => actions/upload/file.json} | 32 +--
.../libs/sling-cms/content/config/create.json | 66 ------
.../libs/sling-cms/content/config/list.json | 243 +++++++--------------
.../jcr_root/libs/sling-cms/content/file/edit.json | 21 --
.../libs/sling-cms/content/file/optimize.json | 21 --
.../libs/sling-cms/content/file/upload.json | 34 ---
.../libs/sling-cms/content/folder/edit.json | 34 ---
.../libs/sling-cms/content/page/create.json | 38 ----
.../libs/sling-cms/content/site/content.json | 114 +++++-----
.../libs/sling-cms/content/site/create.json | 72 ------
.../libs/sling-cms/content/site/creategroup.json | 68 ------
.../jcr_root/libs/sling-cms/content/site/edit.json | 64 ------
.../libs/sling-cms/content/site/sites.json | 14 +-
.../libs/sling-cms/content/siteconfig/editor.json | 186 ++++++++--------
.../jcr_root/libs/sling-cms/content/start.json | 5 -
.../libs/sling-cms/content/static/content.json | 231 +++++---------------
.../libs/sling-cms/content/taxonomy/create.json | 52 -----
.../libs/sling-cms/content/taxonomy/edit.json | 33 ---
.../libs/sling-cms/content/taxonomy/list.json | 187 ++++++++--------
.../libs/sling-cms/content/template/edit.json | 21 --
.../sling-cms/content/templates/sitegroup.json | 5 -
38 files changed, 534 insertions(+), 1250 deletions(-)
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/actions/create/config.json
similarity index 73%
copy from
ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
copy to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/create/config.json
index 8c04f36..2d1d7ff 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/actions/create/config.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Create Folder",
+ "jcr:title": "Create Site Config",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,13 +10,13 @@
"richtext": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<h3>Create Folder</h3>"
+ "text": "<h3>Create Site Config</h3>"
},
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
"actionSuffix": "/*",
- "button": "Create Folder",
+ "button": "Create Site Config",
"successPrepend": "/libs/sling-cms/content/site/content.html",
"fields": {
"jcr:primaryType": "nt:unstructured",
@@ -25,7 +25,7 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/text",
"label": "Title",
- "name": "jcr:content/jcr:title",
+ "name": "jcr:title",
"required": true
},
"name": {
@@ -38,19 +38,26 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/hidden",
"name": ":nameParam",
- "value": "jcr:content/jcr:title"
+ "value": "jcr:title"
},
"primaryType": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/hidden",
"name": "jcr:primaryType",
- "value": "sling:OrderedFolder"
+ "value": "sling:Config"
},
- "contentPrimaryType": {
+ "pageTemplatesPrimaryType": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "jcr:content/jcr:primaryType",
+ "name": "pageTemplates/jcr:primaryType",
"value": "nt:unstructured"
+ },
+ "type": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/select",
+ "name": "sling:resourceType",
+ "optionsScript":
"/libs/sling-cms/components/editor/scripts/configResourceTypeOptions.jsp",
+ "required": true
}
}
}
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/actions/create/page.json
similarity index 62%
copy from
ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
copy to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/create/page.json
index 44c9b33..003f562 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/actions/create/page.json
@@ -1,8 +1,8 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Site Group",
+ "sling:resourceType": "sling-cms/components/pages/form",
+ "jcr:title": "Create Page",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,32 +10,26 @@
"richtext": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<h3>Edit Site Group</h3>"
+ "text": "<h3>Create Page</h3>"
},
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
- "actionSuffix": "/*",
- "button": "Create Folder",
+ "button": "Create Page",
"successPrepend": "/libs/sling-cms/content/site/content.html",
"fields": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/general/container",
- "title": {
+ "pageTemplate": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:content/jcr:title",
- "required": true
+ "sling:resourceType":
"sling-cms/components/editor/fields/select",
+ "label": "Page Template",
+ "name": "pageTemplate",
+ "optionsScript":
"/libs/sling-cms/components/editor/scripts/pageTemplateOptions.jsp"
},
- "config": {
+ "pageproperties": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
+ "sling:resourceType":
"sling-cms/components/cms/pageproperties"
}
}
}
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/actions/create/taxonomy.json
similarity index 73%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/create.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/create/taxonomy.json
index 8c04f36..5bb6b4f 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/actions/create/taxonomy.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Create Folder",
+ "jcr:title": "Create Taxonomy",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,14 +10,13 @@
"richtext": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<h3>Create Folder</h3>"
+ "text": "<h3>Create Taxonomy</h3>"
},
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
"actionSuffix": "/*",
- "button": "Create Folder",
- "successPrepend": "/libs/sling-cms/content/site/content.html",
+ "button": "Create Taxonomy",
"fields": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/general/container",
@@ -25,7 +24,7 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/text",
"label": "Title",
- "name": "jcr:content/jcr:title",
+ "name": "jcr:title",
"required": true
},
"name": {
@@ -38,19 +37,13 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/hidden",
"name": ":nameParam",
- "value": "jcr:content/jcr:title"
+ "value": "jcr:title"
},
"primaryType": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/hidden",
"name": "jcr:primaryType",
- "value": "sling:OrderedFolder"
- },
- "contentPrimaryType": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "jcr:content/jcr:primaryType",
- "value": "nt:unstructured"
+ "value": "sling:Taxonomy"
}
}
}
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/actions/create/template.json
similarity index 97%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/template/create.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/create/template.json
index 9a96b51..9a33987 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/actions/create/template.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
+ "sling:resourceType": "sling-cms/components/pages/form",
"jcr:title": "Create Template",
"jcr:primaryType": "nt:unstructured",
"container": {
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/file.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/file.json
index f11fdf7..c454066 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/file.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/file.json
@@ -1,21 +1,21 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Edit File",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit File</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/fileeditorinclude"
- }
- }
- }
-}
\ No newline at end of file
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/form",
+ "jcr:title": "Edit File",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "richtext": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/richtext",
+ "text": "<h3>Edit File</h3>"
+ },
+ "slingform": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/fileeditorinclude"
+ }
+ }
+ }
+}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/folder.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/folder.json
index b2092a5..bb2371b 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/folder.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/folder.json
@@ -1,34 +1,34 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Folder",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit Folder</h3>"
- },
- "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",
- "sling:resourceType":
"sling-cms/components/general/container",
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:content/jcr:title",
- "required": true
- }
- }
- }
- }
- }
-}
\ No newline at end of file
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/form",
+ "jcr:title": "Edit Folder",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "richtext": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/richtext",
+ "text": "<h3>Edit Folder</h3>"
+ },
+ "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",
+ "sling:resourceType":
"sling-cms/components/general/container",
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/text",
+ "label": "Title",
+ "name": "jcr:content/jcr:title",
+ "required": true
+ }
+ }
+ }
+ }
+ }
+}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/site.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/site.json
index 319e9a5..e73af63 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/site.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/site.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
+ "sling:resourceType": "sling-cms/components/pages/form",
"jcr:title": "Edit Site",
"jcr:primaryType": "nt:unstructured",
"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/actions/edit/sitegroup.json
similarity index 96%
copy from
ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
copy to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/sitegroup.json
index 44c9b33..6c29d0f 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/actions/edit/sitegroup.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
+ "sling:resourceType": "sling-cms/components/pages/form",
"jcr:title": "Edit Site Group",
"jcr:primaryType": "nt:unstructured",
"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/actions/edit/taxonomy.json
similarity index 61%
copy from
ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
copy to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/taxonomy.json
index 44c9b33..2f46bd1 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/actions/edit/taxonomy.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:Page",
"jcr:content": {
"sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Site Group",
+ "jcr:title": "Edit Taxonomy Item",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
@@ -10,14 +10,12 @@
"richtext": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<h3>Edit Site Group</h3>"
+ "text": "<h3>Edit Taxonomy Item</h3>"
},
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
- "actionSuffix": "/*",
- "button": "Create Folder",
- "successPrepend": "/libs/sling-cms/content/site/content.html",
+ "button": "Update Taxonomy",
"fields": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/general/container",
@@ -25,17 +23,8 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/editor/fields/text",
"label": "Title",
- "name": "jcr:content/jcr:title",
+ "name": "jcr:title",
"required": true
- },
- "config": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
}
}
}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/template.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/template.json
new file mode 100644
index 0000000..9ae587a
--- /dev/null
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/edit/template.json
@@ -0,0 +1,21 @@
+{
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/form",
+ "jcr:title": "Configure Site",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "richtext": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/richtext",
+ "text": "<h2>Edit Template</h2>"
+ },
+ "siteconfig": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/templateeditor"
+ }
+ }
+ }
+}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/optimize/optimize.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/optimize/optimize.json
new file mode 100644
index 0000000..5c92acd
--- /dev/null
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/optimize/optimize.json
@@ -0,0 +1,21 @@
+{
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Optimize File",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "richtext": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/richtext",
+ "text": "<h3>Optimize File</h3>"
+ },
+ "slingform": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/optimizefile"
+ }
+ }
+ }
+}
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/actions/shared/delete.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/delete.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/delete.json
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/actions/shared/movecopy.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/movecopy.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/movecopy.json
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/actions/shared/publish.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/publish.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/publish.json
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/actions/shared/search.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/search.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/search.json
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/unpublish.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/unpublish.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/unpublish.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/unpublish.json
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/versions.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/versions.json
similarity index 100%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/shared/versions.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/shared/versions.json
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/actions/upload/file.json
similarity index 51%
rename from
ui/src/main/resources/jcr_root/libs/sling-cms/content/site/editgroup.json
rename to
ui/src/main/resources/jcr_root/libs/sling-cms/content/actions/upload/file.json
index 44c9b33..2f0bdbb 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/actions/upload/file.json
@@ -1,41 +1,31 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Site Group",
+ "sling:resourceType": "sling-cms/components/pages/form",
+ "jcr:title": "Upload File",
"jcr:primaryType": "nt:unstructured",
"container": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<h3>Edit Site Group</h3>"
- },
"slingform": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/slingform",
- "actionSuffix": "/*",
- "button": "Create Folder",
- "successPrepend": "/libs/sling-cms/content/site/content.html",
+ "button": "Upload File",
"fields": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/general/container",
- "title": {
+ "file": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:content/jcr:title",
+ "sling:resourceType":
"sling-cms/components/editor/fields/file",
+ "label": "File",
+ "name": "*",
"required": true
},
- "config": {
+ "typeHint": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
+ "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
+ "name": "*@TypeHint",
+ "value": "sling:File"
}
}
}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
deleted file mode 100644
index 65707c6..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Create Site Config",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Create Site Config</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/slingform",
- "actionSuffix": "/*",
- "button": "Create Site Config",
- "successPrepend":
"/libs/sling-cms/content/site/content.html",
- "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:Config"
- },
- "pageTemplatesPrimaryType": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name":
"pageTemplates/jcr:primaryType",
- "value": "nt:unstructured"
- },
- "type": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/select",
- "name": "sling:resourceType",
- "optionsScript":
"/libs/sling-cms/components/editor/scripts/configResourceTypeOptions.jsp",
- "required": true
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
index 71e2a81..e71a744 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
@@ -1,159 +1,86 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Site Configurations",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Configurations</h3>"
- },
- "contentactions": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentactions",
- "actions": {
- "folder": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Folder",
- "prefix":
"/cms/folder/create.html"
- },
- "config": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Config",
- "prefix":
"/cms/config/create.html"
- }
- }
- },
- "contentbreadcrumb": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
- "depth": 2,
- "prefix": "/cms/config/list.html"
- },
- "contenttable": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contenttable",
- "columns": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Name"
- },
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Title"
- },
- "lastModified": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified"
- },
- "actions": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Actions"
- }
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "sling:Config": {
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
- "jcr:primaryType":
"nt:unstructured",
- "name": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/name",
- "prefix":
"/cms/config/edit.html",
- "link": true
- },
- "title": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/text",
- "property":
"jcr:title"
- },
- "lastModified": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
- "subPath": ""
- },
- "actions": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/actions",
- "edit": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Site Config",
- "icon":
"pencil-f",
-
"prefix": "/cms/config/metadata.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Config",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete Site Config",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- },
- "sling:OrderedFolder": {
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
- "jcr:primaryType":
"nt:unstructured",
- "name": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/name",
- "link": true,
- "prefix":
"/cms/config/list.html"
- },
- "title": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/text",
- "property":
"jcr:content/jcr:title"
- },
- "lastModified": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
- "subPath":
"jcr:content"
- },
- "actions": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/actions",
- "edit": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Folder",
- "icon":
"pencil-f",
-
"prefix": "/cms/folder/edit.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Folder",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete Folder",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Site Configurations",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "contentactions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentactions",
+ "actions": {
+ "folder": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Folder",
+ "prefix": "/cms/folder/create.html"
+ },
+ "config": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Config",
+ "prefix": "/cms/config/create.html"
+ }
+ }
+ },
+ "contentbreadcrumb": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
+ "depth": 2,
+ "prefix": "/cms/config/list.html"
+ },
+ "contenttable": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contenttable",
+ "columns": {
+ "jcr:primaryType": "nt:unstructured",
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/name",
+ "jcr:title": "Name",
+ "prefix": "/cms/config/edit.html",
+ "link": true
+ },
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/text",
+ "jcr:title": "Title",
+ "property": "jcr:title"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
+ "jcr:title": "Last Modified",
+ "subPath": ""
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/actions",
+ "edit": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Edit Site Config",
+ "icon": "pencil-f",
+ "prefix": "/cms/config/metadata.html"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Move / Copy Config",
+ "icon": "move-alt",
+ "prefix": "/cms/actions/shared/movecopy.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Delete Site Config",
+ "icon": "trash",
+ "prefix": "/cms/actions/shared/delete.html"
+ }
+ }
+ }
+ }
+ }
+ }
+}
+}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/edit.json
deleted file mode 100644
index f11fdf7..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/edit.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Edit File",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit File</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/fileeditorinclude"
- }
- }
- }
-}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/optimize.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/optimize.json
deleted file mode 100644
index 373a184..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/optimize.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Optimize File",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Optimize File</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/optimizefile"
- }
- }
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index f8ae93f..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/file/upload.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Upload File",
- "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": "Upload File",
- "fields": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "file": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/file",
- "label": "File",
- "name": "*",
- "required": true
- },
- "typeHint": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "*@TypeHint",
- "value": "sling:File"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index b2092a5..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/folder/edit.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Folder",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit Folder</h3>"
- },
- "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",
- "sling:resourceType":
"sling-cms/components/general/container",
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:content/jcr:title",
- "required": true
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
deleted file mode 100644
index e04c69a..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/create.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Create Page",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Create Page</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/slingform",
- "button": "Create Page",
-
"successPrepend":"/libs/sling-cms/content/site/content.html",
- "fields": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "pageTemplate": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/select",
- "label": "Page Template",
- "name": "pageTemplate",
- "optionsScript":
"/libs/sling-cms/components/editor/scripts/pageTemplateOptions.jsp"
- },
- "pageproperties": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/pageproperties"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
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 9383b5d..365848c 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
@@ -1,80 +1,86 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Site Content",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "contentactions": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentactions",
- "actions": {
- "page": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Page",
- "prefix":
"/cms/page/create.html"
- },
- "file": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "File",
- "prefix":
"/cms/file/upload.html"
- },
- "folder": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Folder",
- "prefix":
"/cms/folder/create.html"
- }
- }
- },
- "contentbreadcrumb": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
- "depth": 2,
- "prefix": "/cms/site/content.html",
- "titleProp": "jcr:content/jcr:title"
- },
- "contenttable": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contenttable",
- "columns": {
- "resourceTypes" :
["sling:Page","sling:File","sling:OrderedFolder","sling:Folder"],
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Site Content",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "contentactions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentactions",
+ "actions": {
+ "page": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Page",
+ "prefix": "/cms/actions/create/page.html"
+ },
+ "file": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "File",
+ "prefix": "/cms/actions/upload/file.html"
+ },
+ "folder": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Folder",
+ "prefix": "/cms/actons/create/folder/create.html"
+ }
+ }
+ },
+ "contentbreadcrumb": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
+ "depth": 2,
+ "prefix": "/cms/site/content.html",
+ "titleProp": "jcr:content/jcr:title"
+ },
+ "contenttable": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contenttable",
+ "columns": {
+ "resourceTypes": [
+ "sling:Page",
+ "sling:File",
+ "sling:Site",
+ "sling:OrderedFolder",
+ "sling:Folder"
+ ],
"name": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/name",
"link": true,
- "jcr:title":"Name",
+ "jcr:title": "Name",
"prefix": "/cms/site/content.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/text",
"property": "jcr:content/jcr:title",
- "jcr:title":"Title",
+ "jcr:title": "Title",
"type": "String"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "jcr:title":"Publish",
+ "jcr:title": "Publish",
"sling:resourceType":
"sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/static",
- "jcr:title":"Type",
+ "jcr:title": "Type",
"value": "Page"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
- "jcr:title":"Last Modified",
+ "jcr:title": "Last Modified",
"subPath": "jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/actions",
- "jcr:title":"Actions",
+ "jcr:title": "Actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": false,
@@ -94,7 +100,7 @@
"modal": true,
"title": "Move / Copy Page",
"icon": "move-alt",
- "prefix": "/cms/shared/movecopy.html"
+ "prefix": "/cms/actions/shared/movecopy.html"
},
"version": {
"jcr:primaryType": "nt:unstructured",
@@ -102,18 +108,18 @@
"modal": true,
"title": "Manage Versions",
"icon": "history",
- "prefix": "/cms/shared/versions.html"
+ "prefix": "/cms/actions/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
"title": "Delete the specified page",
"icon": "trash",
- "prefix": "/cms/shared/delete.html"
+ "prefix": "/cms/actions/shared/delete.html"
}
}
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
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
deleted file mode 100644
index d2c64c9..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/create.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Create Site",
- "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 Site",
- "successPrepend":
"/libs/sling-cms/content/site/content.html",
- "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"
- },
- "url": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Primary URL",
- "name": "sling:url",
- "required": true
- },
- "locale": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/select",
- "label": "Language",
- "name": "jcr:language",
- "optionsScript":
"/libs/sling-cms/components/editor/scripts/localeOptions.jsp",
- "required": true
- },
- "config": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
- },
- "primaryType": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "jcr:primaryType",
- "value": "sling:Site"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index 353affa..0000000
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/creategroup.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/form",
- "jcr:title": "Create Folder",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Create Site Group</h3>"
- },
- "slingform": {
- "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",
- "sling:resourceType":
"sling-cms/components/general/container",
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:content/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:content/jcr:title"
- },
- "config": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
- },
- "primaryType": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "jcr:primaryType",
- "value": "sling:OrderedFolder"
- },
- "contentPrimaryType": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name":
"jcr:content/jcr:primaryType",
- "value": "nt:unstructured"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index 319e9a5..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/edit.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Site",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit Site</h3>"
- },
- "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",
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Title",
- "name": "jcr:title",
- "required": true
- },
- "description": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/textarea",
- "label": "Description",
- "name": "jcr:description",
- "required": false
- },
- "url": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Primary URL",
- "name": "sling:url",
- "required": true
- },
- "locale": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/select",
- "label": "Language",
- "name": "jcr:language",
- "optionsScript":
"/libs/sling-cms/components/editor/scripts/localeOptions.jsp",
- "required": true
- },
- "config": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/path",
- "basePath": "/conf",
- "label": "Config",
- "name": "sling:configRef",
- "required": false,
- "type": "config"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
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 9c37266..628c6bc 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
@@ -39,15 +39,17 @@
"columns": {
"jcr:primaryType": "nt:unstructured",
"resourceTypes": [
- "sling:Site",
- "sling:OrderedFolder"
+ "sling:Page",
+ "sling:File",
+ "sling:OrderedFolder",
+ "sling:Folder"
],
"name": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/name",
"link": true,
"jcr:title": "Name",
- "prefix": "/cms/site/sites.html"
+ "prefix": "/cms/site/content.html"
},
"title": {
"jcr:primaryType": "nt:unstructured",
@@ -71,20 +73,20 @@
"modal": true,
"title": "Edit Site Group",
"icon": "pencil-f",
- "prefix": "/cms/site/editgroup.html"
+ "prefix": "/cms/actions/edit/sitegroup.html"
},
"movecopy": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
"title": "Move / Copy Site Group",
"icon": "move-alt",
- "prefix": "/cms/shared/movecopy.html"
+ "prefix": "/cms/actions/shared/movecopy.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
"title": "Delete Site Group",
"icon": "trash",
- "prefix": "/cms/shared/delete.html",
+ "prefix": "/cms/actions/shared/delete.html",
"modal": true
}
}
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 49ce2d8..453c58f 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
@@ -1,94 +1,94 @@
{
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/general/richtext",
- "text": "<br/><h3>Templates</h3>"
- },
- "contentactions": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentactions",
- "actions": {
- "template": {
- "jcr:primaryType": "nt:unstructured",
- "label": "Template",
- "prefix": "/cms/template/create.html"
- }
- }
- },
- "contenttable": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contenttable",
- "appendSuffix": "/templates",
- "columns": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType": "nt:unstructured",
- "title": "Name"
- },
- "title": {
- "jcr:primaryType": "nt:unstructured",
- "title": "Title"
- },
- "lastModified": {
- "jcr:primaryType": "nt:unstructured",
- "title": "Last Modified"
- },
- "actions": {
- "jcr:primaryType": "nt:unstructured",
- "title": "Actions"
- }
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "nt:unstructured": {
- "jcr:primaryType": "nt:unstructured",
- "columns": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/columns/name",
- "link": false
- },
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/columns/text",
- "property": "jcr:title"
- },
- "lastModified": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
- "subPath": ""
- },
- "actions": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/columns/actions",
- "edit": {
- "jcr:primaryType":
"nt:unstructured",
- "modal": false,
- "new": false,
- "title": "Edit
Template",
- "icon": "pencil-f",
- "prefix":
"/cms/template/edit.html"
- },
- "movecopy": {
- "jcr:primaryType":
"nt:unstructured",
- "modal": true,
- "title": "Move / Copy
Template",
- "icon": "move-alt",
- "prefix":
"/cms/shared/movecopy.html"
- },
- "delete": {
- "jcr:primaryType":
"nt:unstructured",
- "modal": true,
- "title": "Delete
Template",
- "icon": "trash",
- "prefix":
"/cms/shared/delete.html"
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "richtext": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/richtext",
+ "text": "<br/><h3>Templates</h3>"
+ },
+ "contentactions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contentactions",
+ "actions": {
+ "template": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Template",
+ "prefix": "/cms/template/create.html"
+ }
+ }
+ },
+ "contenttable": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contenttable",
+ "appendSuffix": "/templates",
+ "columns": {
+ "jcr:primaryType": "nt:unstructured",
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Name"
+ },
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Title"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Last Modified"
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Actions"
+ }
+ },
+ "types": {
+ "jcr:primaryType": "nt:unstructured",
+ "nt:unstructured": {
+ "jcr:primaryType": "nt:unstructured",
+ "columns": {
+ "jcr:primaryType": "nt:unstructured",
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/name",
+ "link": false
+ },
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/text",
+ "property": "jcr:title"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
+ "subPath": ""
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/actions",
+ "edit": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": false,
+ "new": false,
+ "title": "Edit Template",
+ "icon": "pencil-f",
+ "prefix": "/cms/template/edit.html"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Move / Copy Template",
+ "icon": "move-alt",
+ "prefix": "/cms/shared/movecopy.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Delete Template",
+ "icon": "trash",
+ "prefix": "/cms/shared/delete.html"
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/start.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/start.json
index b4ec947..fa03c4a 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/start.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/start.json
@@ -40,11 +40,6 @@
"link": "/cms/taxonomy/list.html/etc/taxonomy",
"text": "Taxonomy"
},
- "templates": {
- "jcr:primaryType": "nt:unstructured",
- "link": "/cms/taxonomy/list.html/etc/taxonomy",
- "text": "Templates"
- },
"config": {
"jcr:primaryType": "nt:unstructured",
"link": "/cms/config/list.html/conf",
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 71a2c04..3c38b2f 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
@@ -1,45 +1,51 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Static Content",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "contentactions": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentactions",
- "actions": {
- "file": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "File",
- "prefix":
"/cms/file/upload.html"
- },
- "folder": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Folder",
- "prefix":
"/cms/folder/create.html"
- }
- }
- },
- "contentbreadcrumb": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
- "depth": 2,
- "prefix": "/cms/static/content.html",
- "titleProp": "jcr:content/jcr:title"
- },
- "contenttable": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contenttable",
- "columns": {
-
"resourceTypes":["sling:File","sling:OrderedFolder","sling:Folder","nt:file"],
- "jcr:primaryType": "nt:unstructured",
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Static Content",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "contentactions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentactions",
+ "actions": {
+ "file": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "File",
+ "prefix": "/cms/actions/upload/file.html"
+ },
+ "folder": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Folder",
+ "prefix": "/cms/actions/create/folder.html"
+ }
+ }
+ },
+ "contentbreadcrumb": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
+ "depth": 2,
+ "prefix": "/cms/static/content.html",
+ "titleProp": "jcr:content/jcr:title"
+ },
+ "contenttable": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contenttable",
+ "defaultPath": "/content",
+ "columns": {
+ "resourceTypes": [
+ "sling:File",
+ "sling:OrderedFolder",
+ "sling:Folder",
+ "nt:file"
+ ],
+ "jcr:primaryType": "nt:unstructured",
"name": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/name",
- "jcr:title":"Name",
+ "jcr:title": "Name",
"prefix": "/cms/static/content.html",
"link": true
},
@@ -47,36 +53,36 @@
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/text",
"link": false,
- "jcr:title":"Title",
+ "jcr:title": "Title",
"type": "Name"
},
"publish": {
"jcr:primaryType": "nt:unstructured",
- "jcr:title":"Publish",
+ "jcr:title": "Publish",
"sling:resourceType":
"sling-cms/components/cms/columns/publish"
},
"type": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/static",
- "jcr:title":"Type",
+ "jcr:title": "Type",
"value": "Folder"
},
"lastModified": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
- "jcr:title":"Last Modified",
+ "jcr:title": "Last Modified",
"subPath": "jcr:content/"
},
"actions": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType":
"sling-cms/components/cms/columns/actions",
- "jcr:title":"Actions",
+ "jcr:title": "Actions",
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
"title": "Edit File",
"icon": "pencil-f",
- "prefix": "/cms/file/edit.html"
+ "prefix": "/cms/actions/edit/file.html"
},
"optimize": {
"jcr:primaryType": "nt:unstructured",
@@ -96,7 +102,7 @@
"modal": true,
"title": "Move / Copy File",
"icon": "move-alt",
- "prefix": "/cms/shared/movecopy.html"
+ "prefix": "/cms/actions/shared/movecopy.html"
},
"version": {
"jcr:primaryType": "nt:unstructured",
@@ -104,141 +110,18 @@
"modal": true,
"title": "Manage Versions",
"icon": "history",
- "prefix": "/cms/shared/versions.html"
+ "prefix": "/cms/actions/shared/versions.html"
},
"delete": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
"title": "Delete File",
"icon": "trash",
- "prefix": "/cms/shared/delete.html"
+ "prefix": "/cms/actions/shared/delete.html"
}
}
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "sling:File":{
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
-
- }
- },
- "sling:OrderedFolder":{
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
- "jcr:primaryType":
"nt:unstructured",
- "name": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/name",
- "link": true,
- "prefix":
"/cms/static/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",
-
"sling:resourceType": "sling-cms/components/cms/columns/publish"
- },
- "type": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/static",
- "value":
"Folder"
- },
- "lastModified": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
- "subPath":
"jcr:content/"
- },
- "actions": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/actions",
- "edit": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Folder",
- "icon":
"pencil-f",
-
"prefix": "/cms/folder/edit.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Folder",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete Folder",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- },
- "sling:Folder":{
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
- "jcr:primaryType":
"nt:unstructured",
- "name": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/name",
- "link": true,
- "prefix":
"/cms/static/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",
-
"sling:resourceType": "sling-cms/components/cms/columns/publish"
- },
- "type": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/static",
- "value":
"Folder"
- },
- "lastModified": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
- "subPath":
"jcr:content/"
- },
- "actions": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/actions",
- "edit": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Folder",
- "icon":
"pencil-f",
-
"prefix": "/cms/folder/edit.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Folder",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete Folder",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- }
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
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
deleted file mode 100644
index 88a7528..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/create.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Create Taxonomy",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Create Taxonomy</h3>"
- },
- "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
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
deleted file mode 100644
index 3da06ed..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/taxonomy/edit.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Edit Taxonomy Item",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h3>Edit Taxonomy Item</h3>"
- },
- "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
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 5d4d4c5..0b69881 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
@@ -1,102 +1,87 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Taxonomy",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "contentactions": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentactions",
- "actions": {
- "taxonomy": {
- "jcr:primaryType":
"nt:unstructured",
- "label": "Taxonomy Item",
- "prefix":
"/cms/taxonomy/create.html"
- }
- }
- },
- "contentbreadcrumb": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
- "depth": 2,
- "prefix": "/cms/taxonomy/list.html"
- },
- "contenttable": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contenttable",
- "columns": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Name"
- },
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Title"
- },
- "lastModified": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified"
- },
- "actions": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Actions"
- }
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "sling:Taxonomy":{
- "jcr:primaryType":
"nt:unstructured",
- "columns": {
- "jcr:primaryType":
"nt:unstructured",
- "name": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/name",
- "link": true,
- "prefix":
"/cms/taxonomy/list.html"
- },
- "title": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/text",
- "property":
"jcr:title"
- },
- "lastModified": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
- "subPath": ""
- },
- "actions": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/actions",
- "edit": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Taxonomy Item",
- "icon":
"pencil-f",
-
"prefix": "/cms/taxonomy/edit.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Taxonomy Item",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete Taxonomy Item",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Taxonomy",
+ "jcr:primaryType": "nt:unstructured",
+ "container": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "contentactions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentactions",
+ "actions": {
+ "taxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "label": "Taxonomy Item",
+ "prefix": "/cms/actions/create/taxonomy.html"
+ }
+ }
+ },
+ "contentbreadcrumb": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
+ "depth": 2,
+ "prefix": "/cms/taxonomy/list.html"
+ },
+ "contenttable": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/contenttable",
+ "columns": {
+ "jcr:primaryType": "nt:unstructured",
+ "resourceTypes": [
+ "sling:Page",
+ "sling:Taxonomy",
+ "sling:File",
+ "sling:OrderedFolder",
+ "sling:Folder"
+ ],
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/name",
+ "link": true,
+ "jcr:title": "Name",
+ "prefix": "/cms/taxonomy/list.html"
+ },
+ "jcr:title": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/text",
+ "jcr:title": "Title",
+ "property": "jcr:title"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/lastmodified",
+ "jcr:title": "Last Modified",
+ "subPath": ""
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/actions",
+ "edit": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "jcr:title": "Edit Taxonomy Item",
+ "icon": "pencil-f",
+ "prefix": "/cms/actions/edit/taxonomy.html"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "jcr:title": "Move / Copy Taxonomy Item",
+ "icon": "move-alt",
+ "prefix": "/cms/actions/shared/movecopy.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "jcr:title": "Delete Taxonomy Item",
+ "icon": "trash",
+ "prefix": "/cms/actions/shared/delete.html"
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/edit.json
deleted file mode 100644
index c406ac7..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/edit.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Configure Site",
- "jcr:primaryType": "nt:unstructured",
- "container": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "richtext": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/richtext",
- "text": "<h2>Edit Template</h2>"
- },
- "siteconfig": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/templateeditor"
- }
- }
- }
-}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/templates/sitegroup.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/templates/sitegroup.json
deleted file mode 100644
index 8533f67..0000000
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/templates/sitegroup.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "jcr:contentType": "nt:unstructured",
- "sling:resourceType" : "cms/template"
-
-}
