This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 251062778fab45fd80aaed69e72896f9546ff785 Author: Dan Klco <[email protected]> AuthorDate: Thu Jul 9 23:34:01 2020 -0400 Minor - UI Tweaks / cleanup --- ui/src/main/frontend/scss/cms.scss | 6 ++++++ .../cms/scrollcontainer/scrollcontainer.jsp | 22 ++++++++++++++++++++++ .../components/cms/startcontent/startcontent.jsp | 2 +- .../jcr_root/libs/sling-cms/content/start.json | 21 ++++++++++++++++++--- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/ui/src/main/frontend/scss/cms.scss b/ui/src/main/frontend/scss/cms.scss index b876ef9..ede12e8 100644 --- a/ui/src/main/frontend/scss/cms.scss +++ b/ui/src/main/frontend/scss/cms.scss @@ -20,6 +20,12 @@ @import "overrides"; @import "../../../../node_modules/bulma/bulma.sass"; +@media screen and (min-width: $tablet) { + html { + overflow: hidden; + } +} + body.cms { min-height: 100vh; @media screen and (min-width: $tablet), print { diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/scrollcontainer/scrollcontainer.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/scrollcontainer/scrollcontainer.jsp new file mode 100644 index 0000000..a9c030c --- /dev/null +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/scrollcontainer/scrollcontainer.jsp @@ -0,0 +1,22 @@ +<%-- /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ --%> +<%@include file="/libs/sling-cms/global.jsp"%> +<div class="scroll-container"> + <sling:include path="${resource.path}" resourceType="sling-cms/components/general/container" /> +<div> \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp index 94be095..f3b5309 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/startcontent/startcontent.jsp @@ -17,7 +17,7 @@ * under the License. */ --%> <%@include file="/libs/sling-cms/global.jsp"%> -<br/><hr/><br/> +<br/><br/> <sling:adaptTo adaptable="${slingRequest}" adaptTo="org.apache.sling.cms.core.models.StartContent" var="startContent" /> <div class="columns"> <div class="column"> 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 59e4751..eda1e55 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 @@ -13,11 +13,15 @@ "richtext": { "jcr:primaryType": "nt:unstructured", "sling:resourceType": "sling-cms/components/general/richtext", - "text": "<h2>Welcome to the Apache Sling CMS!<\/h2><p>This is a full-featured Content Management System built using the Apache Sling Framework! To begin, select Manage >> Site on the left to add your first website.<\/p>" + "text": "<h2>Welcome to the Apache Sling CMS!<\/h2><p>This is a full-featured Content Management System built using the Apache Sling Framework! To begin, select Manage >> Site on the left to add your first website.<\/p><br\/><br\/>" }, - "recent": { + "scrollcontainer": { "jcr:primaryType": "nt:unstructured", - "sling:resourceType": "sling-cms/components/cms/startcontent" + "sling:resourceType": "sling-cms/components/cms/scrollcontainer", + "recent": { + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "sling-cms/components/cms/startcontent" + } } }, "nav": { @@ -76,6 +80,17 @@ "title": "Tools", "links": { "jcr:primaryType": "nt:unstructured", + "analytics": { + "jcr:primaryType": "nt:unstructured", + "alternatives": [ + "/cms/analytics" + ], + "enabledGroups": [ + "administrators" + ], + "link": "/cms/analytics/list.html/etc/reports", + "text": "Analytics" + }, "bulkreplace": { "jcr:primaryType": "nt:unstructured", "link": "/cms/admin/bulkreplace.html",
