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
The following commit(s) were added to refs/heads/master by this push:
new 52f75bc Updating to make the icon usage more consistent around edit
properties and cleaning up some incorrect modal / base page usage
52f75bc is described below
commit 52f75bc2cf52e8ec52f6381fdb5c393dad708784
Author: Dan Klco <[email protected]>
AuthorDate: Thu Oct 11 10:32:42 2018 -0400
Updating to make the icon usage more consistent around edit properties
and cleaning up some incorrect modal / base page usage
---
.../components/editor/fields/repeating/field.jsp | 64 +-
.../libs/sling-cms/content/config/edit.json | 50 +-
.../libs/sling-cms/content/config/list.json | 314 +++++-----
.../libs/sling-cms/content/i18n/dictionaries.json | 4 +-
.../libs/sling-cms/content/i18n/entry/create.json | 104 ++--
.../libs/sling-cms/content/mappings/edit.json | 2 +-
.../libs/sling-cms/content/mappings/list.json | 4 +-
.../jcr_root/libs/sling-cms/content/page/edit.json | 4 +-
.../libs/sling-cms/content/site/content.json | 670 ++++++++++-----------
.../libs/sling-cms/content/site/sites.json | 8 +-
.../libs/sling-cms/content/static/content.json | 516 ++++++++--------
.../libs/sling-cms/content/template/edit.json | 2 +-
.../sling-cms/content/usergenerated/content.json | 4 +-
13 files changed, 873 insertions(+), 873 deletions(-)
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
index 341d1af..05352a1 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
@@ -16,35 +16,35 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
- <div class="repeating">
- <fieldset disabled="disabled" class="repeating__template is-hidden">
- <div class="repeating__item field has-addons">
- <div class="control is-expanded">
- <input type="${properties.type}" value=""
class="input" name="${properties.name}" ${required} ${disabled} />
- </div>
- <div class="control">
- <button class="repeating__remove button">
- <span class="jam jam-minus"></span>
- </button>
- </div>
- </div>
- </fieldset>
- <div class="repeating__container">
- <c:forEach var="value"
items="${editProperties[properties.name]}">
- <div class="repeating__item field has-addons">
- <div class="control">
- <input type="${properties.type}"
value="${value}" class="input" name="${properties.name}" ${required}
${disabled} />
- </div>
- <div class="control">
- <button class="repeating__remove
button">
- <span class="jam
jam-minus"></span>
- </button>
- </div>
- </div>
- </c:forEach>
- </div>
- <button type="button" class="repeating__add button">
- <span class="jam jam-plus"></span>
- </button>
- </div>
\ No newline at end of file
+<%@include file="/libs/sling-cms/global.jsp"%>
+<div class="repeating">
+ <fieldset disabled="disabled" class="repeating__template is-hidden">
+ <div class="repeating__item field has-addons">
+ <div class="control is-expanded">
+ <input type="${properties.type}" value="" class="input"
name="${properties.name}" ${required} ${disabled} />
+ </div>
+ <div class="control">
+ <button class="repeating__remove button">
+ <span class="jam jam-minus"></span>
+ </button>
+ </div>
+ </div>
+ </fieldset>
+ <div class="repeating__container">
+ <c:forEach var="value" items="${editProperties[properties.name]}">
+ <div class="repeating__item field has-addons">
+ <div class="control is-expanded">
+ <input type="${properties.type}" value="${value}"
class="input" name="${properties.name}" ${required} ${disabled} />
+ </div>
+ <div class="control">
+ <button class="repeating__remove button">
+ <span class="jam jam-minus"></span>
+ </button>
+ </div>
+ </div>
+ </c:forEach>
+ </div>
+ <button type="button" class="repeating__add button">
+ <span class="jam jam-plus"></span>
+ </button>
+</div>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/edit.json
index dc5fbe4..7f552c3 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/edit.json
@@ -1,27 +1,27 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/modal",
- "jcr:title": "Edit Configuration",
- "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 Configuration</h2>"
- },
- "contentbreadcrumb": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
- "depth": 2,
- "prefix": "/cms/config/list.html"
- },
- "editconfig": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/cms/editconfig"
- }
- }
- }
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/base",
+ "jcr:title": "Edit Configuration",
+ "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 Configuration</h2>"
+ },
+ "contentbreadcrumb": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/contentbreadcrumb",
+ "depth": 2,
+ "prefix": "/cms/config/list.html"
+ },
+ "editconfig": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/cms/editconfig"
+ }
+ }
+ }
}
\ 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..1972ed9 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,159 @@
{
- "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"
- }
- }
- }
- }
- }
- }
- }
- }
+ "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 Config Properties",
+ "icon": "cog",
+ "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 Properties",
+ "icon": "cog",
+ "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
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
index d8da104..9ca5c0c 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/dictionaries.json
@@ -70,8 +70,8 @@
"jcr:primaryType": "nt:unstructured",
"modal": true,
"new": false,
- "title": "Edit Dictionary",
- "icon": "pencil-f",
+ "title": "Edit Dictionary Properties",
+ "icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"delete": {
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/entry/create.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/entry/create.json
index cc1d08c..bf6e536 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/entry/create.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/i18n/entry/create.json
@@ -1,54 +1,54 @@
{
- "jcr:primaryType": "sling:Page",
- "jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
- "jcr:title": "Create i18n Entry",
- "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 Entry</h3>"
- },
- "slingform": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/slingform",
- "actionSuffix": "/*",
- "addDate": false,
- "button": "Create Language",
- "successPrepend":
"/libs/sling-cms/content/site/content.html",
- "fields": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType":
"sling-cms/components/general/container",
- "key": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/text",
- "label": "Key",
- "name": "sling:key",
- "required": true
- },
- "value": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "sling:message",
- "value": ""
- },
- "nameHint": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "value": "entry",
- "name": ":nameHint"
- },
- "primaryType": {
- "jcr:primaryType":
"nt:unstructured",
- "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
- "name": "jcr:primaryType",
- "value": "sling:MessageEntry"
- }
- }
- }
- }
- }
+ "jcr:primaryType": "sling:Page",
+ "jcr:content": {
+ "sling:resourceType": "sling-cms/components/pages/modal",
+ "jcr:title": "Create i18n Entry",
+ "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 Entry</h3>"
+ },
+ "slingform": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/slingform",
+ "actionSuffix": "/*",
+ "addDate": false,
+ "button": "Create Language",
+ "successPrepend": "/libs/sling-cms/content/site/content.html",
+ "fields": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/general/container",
+ "key": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/text",
+ "label": "Key",
+ "name": "sling:key",
+ "required": true
+ },
+ "value": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
+ "name": "sling:message",
+ "value": ""
+ },
+ "nameHint": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
+ "value": "entry",
+ "name": ":nameHint"
+ },
+ "primaryType": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/editor/fields/hidden",
+ "name": "jcr:primaryType",
+ "value": "sling:MessageEntry"
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
index d7b028c..338f2c5 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/edit.json
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/base",
+ "sling:resourceType": "sling-cms/components/pages/modal",
"jcr:title": "Update Mapping",
"jcr:primaryType": "nt:unstructured",
"container": {
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
index b1ba3cf..5c90695 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/mappings/list.json
@@ -125,8 +125,8 @@
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
- "title": "Edit Folder",
- "icon": "pencil-f",
+ "title": "Edit Folder Properties",
+ "icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"movecopy": {
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
index 63b8a90..33bf007 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/page/edit.json
@@ -18,8 +18,8 @@
"ajaxPath": ".Form-Ajax",
"modal": true,
"prefix": "/cms/page/editproperties.html",
- "title": "Edit Page",
- "icon": "pencil-f"
+ "title": "Edit Page Properties",
+ "icon": "cog"
},
"version": {
"jcr:primaryType": "nt:unstructured",
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 7b1cc8e..7094de0 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,337 +1,337 @@
{
- "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": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Name"
- },
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Title"
- },
- "published": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Published"
- },
- "type": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Type"
- },
- "lastModified": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified"
- },
- "actions": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Actions"
- }
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "sling:Page": {
- "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/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",
-
"sling:resourceType": "sling-cms/components/cms/columns/publish"
- },
- "type": {
-
"jcr:primaryType": "nt:unstructured",
-
"sling:resourceType": "sling-cms/components/cms/columns/static",
- "value": "Page"
- },
- "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": false,
-
"title": "Edit Page",
- "icon":
"pencil-f",
-
"prefix": "/cms/page/edit.html"
- },
- "properties": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Edit Page Properties",
- "icon":
"cog",
-
"prefix": "/cms/page/siteeditproperties.html"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy Page",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "version": {
-
"jcr:primaryType": "nt:unstructured",
-
"ajaxPath": ".versionmanager",
-
"modal": true,
-
"title": "Manage Versions",
- "icon":
"history",
-
"prefix": "/cms/shared/versions.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete the specified page",
- "icon":
"trash",
-
"prefix": "/cms/shared/delete.html"
- }
- }
- }
- },
- "sling:File": {
- "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",
- "link": false,
- "type": "Name"
- },
- "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": "File"
- },
- "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 File",
- "icon":
"pencil-f",
-
"prefix": "/cms/file/edit.html"
- },
- "optimize": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": false,
-
"title": "Optimize File",
- "icon":
"archive",
-
"prefix": "/cms/file/optimize.html"
- },
- "download": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": false,
-
"title": "Download file",
- "icon":
"download"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy File",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "version": {
-
"jcr:primaryType": "nt:unstructured",
-
"ajaxPath": ".versionmanager",
-
"modal": true,
-
"title": "Manage Versions",
- "icon":
"history",
-
"prefix": "/cms/shared/versions.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete File",
- "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/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",
-
"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/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",
-
"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"
- }
- }
- }
- }
- }
- }
- }
- }
+ "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": {
+ "jcr:primaryType": "nt:unstructured",
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Name"
+ },
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Title"
+ },
+ "published": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Published"
+ },
+ "type": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Type"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Last Modified"
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Actions"
+ }
+ },
+ "types": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:Page": {
+ "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/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",
+ "sling:resourceType":
"sling-cms/components/cms/columns/publish"
+ },
+ "type": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType":
"sling-cms/components/cms/columns/static",
+ "value": "Page"
+ },
+ "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": false,
+ "title": "Edit Page",
+ "icon": "pencil-f",
+ "prefix": "/cms/page/edit.html"
+ },
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Edit Page Properties",
+ "icon": "cog",
+ "prefix":
"/cms/page/siteeditproperties.html"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Move / Copy Page",
+ "icon": "move-alt",
+ "prefix": "/cms/shared/movecopy.html"
+ },
+ "version": {
+ "jcr:primaryType": "nt:unstructured",
+ "ajaxPath": ".versionmanager",
+ "modal": true,
+ "title": "Manage Versions",
+ "icon": "history",
+ "prefix": "/cms/shared/versions.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Delete the specified page",
+ "icon": "trash",
+ "prefix": "/cms/shared/delete.html"
+ }
+ }
+ }
+ },
+ "sling:File": {
+ "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",
+ "link": false,
+ "type": "Name"
+ },
+ "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": "File"
+ },
+ "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 File Properties",
+ "icon": "cog",
+ "prefix": "/cms/file/edit.html"
+ },
+ "optimize": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": false,
+ "title": "Optimize File",
+ "icon": "archive",
+ "prefix": "/cms/file/optimize.html"
+ },
+ "download": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": false,
+ "title": "Download file",
+ "icon": "download"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Move / Copy File",
+ "icon": "move-alt",
+ "prefix": "/cms/shared/movecopy.html"
+ },
+ "version": {
+ "jcr:primaryType": "nt:unstructured",
+ "ajaxPath": ".versionmanager",
+ "modal": true,
+ "title": "Manage Versions",
+ "icon": "history",
+ "prefix": "/cms/shared/versions.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Delete File",
+ "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/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",
+ "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 Properties",
+ "icon": "cog",
+ "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/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",
+ "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 Properties",
+ "icon": "cog",
+ "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/site/sites.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
index 297bcf5..4abc99a 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
@@ -82,8 +82,8 @@
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
- "title": "Edit Site",
- "icon": "pencil-f",
+ "title": "Edit Site Properties",
+ "icon": "cog",
"prefix": "/cms/site/edit.html"
},
"movecopy": {
@@ -130,8 +130,8 @@
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
- "title": "Edit Site Group",
- "icon": "pencil-f",
+ "title": "Edit Site Group Properties",
+ "icon": "cog",
"prefix": "/cms/site/editgroup.html"
},
"movecopy": {
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 d7ede68..b3a04d5 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,260 +1,260 @@
{
- "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": {
- "jcr:primaryType": "nt:unstructured",
- "name": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Name"
- },
- "title": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Title"
- },
- "published": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Published"
- },
- "type": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Type"
- },
- "lastModified": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Last Modified"
- },
- "actions": {
- "jcr:primaryType":
"nt:unstructured",
- "title": "Actions"
- }
- },
- "types": {
- "jcr:primaryType": "nt:unstructured",
- "sling:File":{
- "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",
- "link": false,
- "type": "Name"
- },
- "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": "File"
- },
- "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 File",
- "icon":
"pencil-f",
-
"prefix": "/cms/file/edit.html"
- },
- "optimize": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": false,
-
"title": "Optimize File",
- "icon":
"archive",
-
"prefix": "/cms/file/optimize.html"
- },
- "download": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": false,
-
"title": "Download file",
- "icon":
"download"
- },
- "movecopy": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Move / Copy File",
- "icon":
"move-alt",
-
"prefix": "/cms/shared/movecopy.html"
- },
- "version": {
-
"jcr:primaryType": "nt:unstructured",
-
"ajaxPath": ".versionmanager",
-
"modal": true,
-
"title": "Manage Versions",
- "icon":
"history",
-
"prefix": "/cms/shared/versions.html"
- },
- "delete": {
-
"jcr:primaryType": "nt:unstructured",
-
"modal": true,
-
"title": "Delete File",
- "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/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"
- }
- }
- }
- }
- }
- }
- }
- }
+ "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": {
+ "jcr:primaryType": "nt:unstructured",
+ "name": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Name"
+ },
+ "title": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Title"
+ },
+ "published": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Published"
+ },
+ "type": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Type"
+ },
+ "lastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Last Modified"
+ },
+ "actions": {
+ "jcr:primaryType": "nt:unstructured",
+ "title": "Actions"
+ }
+ },
+ "types": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:File": {
+ "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",
+ "link": false,
+ "type": "Name"
+ },
+ "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": "File"
+ },
+ "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 File Properties",
+ "icon": "cog",
+ "prefix": "/cms/file/edit.html"
+ },
+ "optimize": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": false,
+ "title": "Optimize File",
+ "icon": "archive",
+ "prefix": "/cms/file/optimize.html"
+ },
+ "download": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": false,
+ "title": "Download file",
+ "icon": "download"
+ },
+ "movecopy": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Move / Copy File",
+ "icon": "move-alt",
+ "prefix": "/cms/shared/movecopy.html"
+ },
+ "version": {
+ "jcr:primaryType": "nt:unstructured",
+ "ajaxPath": ".versionmanager",
+ "modal": true,
+ "title": "Manage Versions",
+ "icon": "history",
+ "prefix": "/cms/shared/versions.html"
+ },
+ "delete": {
+ "jcr:primaryType": "nt:unstructured",
+ "modal": true,
+ "title": "Delete File",
+ "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/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 Properties",
+ "icon": "cog",
+ "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 Properties",
+ "icon": "cog",
+ "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/template/edit.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/template/edit.json
index 53e7d4e..f895837 100644
--- 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
@@ -1,7 +1,7 @@
{
"jcr:primaryType": "sling:Page",
"jcr:content": {
- "sling:resourceType": "sling-cms/components/pages/modal",
+ "sling:resourceType": "sling-cms/components/pages/base",
"jcr:title": "Configure Site",
"jcr:primaryType": "nt:unstructured",
"container": {
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
index b6cea05..e5223f0 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/content/usergenerated/content.json
@@ -140,8 +140,8 @@
"edit": {
"jcr:primaryType": "nt:unstructured",
"modal": true,
- "title": "Edit Folder",
- "icon": "pencil-f",
+ "title": "Edit Folder Properties",
+ "icon": "cog",
"prefix": "/cms/folder/edit.html"
},
"movecopy": {
