You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/07/10 03:34:16 UTC
[sling-org-apache-sling-app-cms] branch master updated (56364dd ->
2510627)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 56364dd Minor - removing the search box when not applicable
new 1eba4cc Use the name rather than the localname for the html5 parser
new b2b9296 Minor - Updating dependencies
new dc4a214 Minor - updating node / npm version
new 2510627 Minor - UI Tweaks / cleanup
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cms/core/internal/rewriter/HTML5Serializer.java | 10 +++++-----
ui/package.json | 7 ++++---
ui/pom.xml | 5 +++--
ui/src/main/frontend/scss/cms.scss | 6 ++++++
.../scrollcontainer/scrollcontainer.jsp} | 6 +++---
.../components/cms/startcontent/startcontent.jsp | 2 +-
.../jcr_root/libs/sling-cms/content/start.json | 21 ++++++++++++++++++---
7 files changed, 40 insertions(+), 17 deletions(-)
copy ui/src/main/resources/jcr_root/libs/sling-cms/components/{editor/fields/richtext/toolbar/optionbutton/optionbutton.jsp => cms/scrollcontainer/scrollcontainer.jsp} (86%)
[sling-org-apache-sling-app-cms] 02/04: Minor - Updating
dependencies
Posted by dk...@apache.org.
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 b2b9296cb2f1fd8422b3862f4f94df20d27cdcd6
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jul 9 23:25:10 2020 -0400
Minor - Updating dependencies
---
ui/package.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index 4dbf680..797bb42 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -16,13 +16,14 @@
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-plugin-import": "^2.20.2",
- "gulp": "^4.0.1",
+ "gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
- "gulp-cli": "^2.2.0",
+ "gulp-cli": "^2.2.1",
"gulp-concat": "^2.6.1",
+ "gulp-file-post": "^1.2.3",
"gulp-header": "^2.0.7",
"gulp-rename": "^2.0.0",
- "gulp-sass": "^4.0.2",
+ "gulp-sass": "^4.1.0",
"gulp-terser": "^1.1.7",
"streamqueue": "^1.1.2"
},
[sling-org-apache-sling-app-cms] 03/04: Minor - updating node / npm
version
Posted by dk...@apache.org.
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 dc4a2149b19bf21212d2a52c5b52f92764585b1f
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jul 9 23:33:45 2020 -0400
Minor - updating node / npm version
---
ui/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui/pom.xml b/ui/pom.xml
index 8a8cf76..7528995 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -96,8 +96,8 @@ License. -->
<goal>install-node-and-npm</goal>
</goals>
<configuration>
- <nodeVersion>v11.14.0</nodeVersion>
- <npmVersion>6.9.0</npmVersion>
+ <nodeVersion>v14.2.0</nodeVersion>
+ <npmVersion>6.14.5</npmVersion>
</configuration>
</execution>
<execution>
@@ -143,6 +143,7 @@ License. -->
<goals>
<goal>install-node-and-npm</goal>
<goal>npm</goal>
+ <goal>npm rebuild node-sass</goal>
<goal>gulp</goal>
</goals>
</pluginExecutionFilter>
[sling-org-apache-sling-app-cms] 04/04: Minor - UI Tweaks / cleanup
Posted by dk...@apache.org.
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 <dk...@apache.org>
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",
[sling-org-apache-sling-app-cms] 01/04: Use the name rather than
the localname for the html5 parser
Posted by dk...@apache.org.
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 1eba4cce1b60e865281b7f68ff3c371d1c0818df
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jul 9 23:24:28 2020 -0400
Use the name rather than the localname for the html5 parser
---
.../sling/cms/core/internal/rewriter/HTML5Serializer.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java b/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
index 4b5627c..214d30e 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
@@ -78,10 +78,10 @@ public class HTML5Serializer implements Serializer {
}
@Override
- public void endElement(String uri, String localName, String name) throws SAXException {
+ public void endElement(String uri, String localName, String qName) throws SAXException {
if (!emptyTags.contains(localName)) {
writer.write("</");
- writer.write(localName);
+ writer.write(qName);
writer.write(CHAR_GT);
}
}
@@ -127,10 +127,10 @@ public class HTML5Serializer implements Serializer {
}
@Override
- public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException {
+ public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
boolean endSlash = false;
writer.write(CHAR_LT);
- writer.write(localName);
+ writer.write(qName);
for (int i = 0; i < atts.getLength(); i++) {
if ("endSlash".equals(atts.getQName(i))) {
@@ -141,7 +141,7 @@ public class HTML5Serializer implements Serializer {
continue;
}
writer.write(CHAR_SP);
- writer.write(atts.getLocalName(i));
+ writer.write(atts.getQName(i));
writer.write(CHAR_EQ);
writer.write('"');