This is an automated email from the ASF dual-hosted git repository.
jeb 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 8f6a1a8 Minor structural changes to improve the layout
8f6a1a8 is described below
commit 8f6a1a86c3cd9794a3df81c27a0aa8ac5c868f8a
Author: JE Bailey <[email protected]>
AuthorDate: Wed Oct 10 14:57:02 2018 -0400
Minor structural changes to improve the layout
---
.../libs/sling-cms/components/pages/base/body.jsp | 25 ++++---
.../jcr_root/libs/sling-cms/content/start.json | 79 +++++++++-------------
2 files changed, 44 insertions(+), 60 deletions(-)
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
index c7b0279..70ad807 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
@@ -16,23 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
+<%@include file="/libs/sling-cms/global.jsp"%>
<body class="cms">
- <div class="gradient"></div>
- <section class="container is-fluid">
+ <div class="gradient"></div>
+ <div class="container is-fluid">
<sling:call script="nav.jsp" />
- </section>
- <section class="container is-fluid">
<div class="columns">
- <div class="column is-one-fifth">
- <sling:include
path="/mnt/overlay/sling-cms/content/start/jcr:content/nav"
resourceType="sling-cms/components/general/container" />
+ <div class="column is-2">
+ <sling:include
+ path="/mnt/overlay/sling-cms/content/start/jcr:content/nav"
+ resourceType="sling-cms/components/general/container" />
+ </div>
+ <div class="column">
+ <main class="Main-Content"> <sling:call
+ script="content.jsp" /> </main>
+ </div>
</div>
- <div class="column">
- <main class="Main-Content">
- <sling:call script="content.jsp" />
- </main>
</div>
- </div>
- </section>
<sling:call script="scripts.jsp" />
</body>
\ No newline at end of file
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 d8bce41..53105a2 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
@@ -19,53 +19,38 @@
"nav": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/general/container",
- "sitenav": {
+ "othernav": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentnav",
- "createPath": "/cms/site/creategroup.html/content",
- "createTitle": "Site Group",
- "prefix": "/cms/site",
- "itemPrefix": "/cms/site/sites.html",
- "query": "SELECT * FROM [sling:OrderedFolder] AS s WHERE
ISCHILDNODE(s,'/content') ORDER BY NAME()",
- "title": "Sites"
- },
- "staticnav": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentnav",
- "createPath": "/cms/folder/create.html/static",
- "createTitle": "Folder",
- "prefix": "/cms/static",
- "itemPrefix": "/cms/static/content.html",
- "query": "SELECT * FROM [sling:Folder] AS s WHERE
ISCHILDNODE(s,'/static') ORDER BY NAME()",
- "title": "Static Content"
- },
- "taxonomynav": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentnav",
- "createPath": "/cms/taxonomy/create.html/etc/taxonomy",
- "prefix": "/cms/taxonomy",
- "itemPrefix": "/cms/taxonomy/list.html",
- "query": "SELECT * FROM [sling:Taxonomy] AS s WHERE
ISCHILDNODE(s,'/etc/taxonomy') ORDER BY NAME()",
- "title": "Taxonomy"
- },
- "configurationnav": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentnav",
- "createPath": "/cms/folder/create.html/conf",
- "prefix": "/cms/config",
- "itemPrefix": "/cms/config/list.html",
- "query": "SELECT * FROM [sling:OrderedFolder] AS s WHERE
ISCHILDNODE(s,'/conf') ORDER BY NAME()",
- "title": "Configuration"
- },
- "usergeneratednav": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/cms/contentnav",
- "createPath": "/cms/folder/create.html/etc/usergenerated",
- "createFolder": "Bucket",
- "prefix": "/cms/usergenerated",
- "itemPrefix": "/cms/usergenerated/content.html",
- "query": "SELECT * FROM [sling:OrderedFolder] AS s WHERE
ISCHILDNODE(s,'/etc/usergenerated') ORDER BY NAME()",
- "title": "User Generated"
+ "sling:resourceType": "sling-cms/components/cms/staticnav",
+ "title": "Manage",
+ "links": {
+ "jcr:primaryType": "nt:unstructured",
+ "sitenav": {
+ "jcr:primaryType": "nt:unstructured",
+ "link": "/cms/site/sites.html/content",
+ "text": "Sites"
+ },
+ "staticnav": {
+ "jcr:primaryType": "nt:unstructured",
+ "link": "/cms/static/content.html/static",
+ "text": "Static Content"
+ },
+ "taxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "link": "/cms/taxonomy/list.html/etc/taxonomy",
+ "text": "Taxonomy"
+ },
+ "config": {
+ "jcr:primaryType": "nt:unstructured",
+ "link": "/cms/config/list.html/conf",
+ "text": "Configuration"
+ },
+ "usergenerated": {
+ "jcr:primaryType": "nt:unstructured",
+ "link":
"/cms/usergenerated/content.html/etc/usergenerated",
+ "text": "User Generated"
+ }
+ }
},
"toolsnav": {
"jcr:primaryType": "nt:unstructured",
@@ -117,4 +102,4 @@
}
}
}
-}
\ No newline at end of file
+}
