You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/08/26 20:17:26 UTC
[sling-org-apache-sling-app-cms] branch SLING-7858 updated (a33a8f3
-> de91b9e)
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a change to branch SLING-7858
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from a33a8f3 initial commit of bulma
add 4cc75f5 Adding support for path based suggestions and a search modal for the path field.
add 6abe53e Making the tag filters configurable
add fe5ed2d Updating to latest dependencies
new df2ccb8 initial commit of bulma
new de91b9e Merge branch 'SLING-7858' of https://github.com/apache/sling-org-apache-sling-app-cms.git into SLING-7858
The 2 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:
builder/src/main/provisioning/boot.txt | 2 +-
builder/src/main/provisioning/cms.txt | 28 +++++++++--
builder/src/main/provisioning/launchpad.txt | 7 ++-
builder/src/main/provisioning/repoinit.txt | 20 --------
builder/src/main/provisioning/scripting.txt | 2 +-
builder/src/main/provisioning/sling.txt | 10 ++--
builder/src/main/provisioning/standalone.txt | 2 +-
builder/src/main/provisioning/webapp.txt | 2 +-
.../internal/servlets/PathSuggestionServlet.java | 24 ++++++---
.../servlets/PathSuggestionServletConfig.java} | 20 ++++----
.../main/resources/OSGI-INF/l10n/bundle.properties | 13 ++++-
ui/src/main/frontend/src/js/scripts.js | 57 ++++++++++++++++------
ui/src/main/frontend/src/scss/styles.scss | 9 ++++
.../cms/contentbreadcrumb/contentbreadcrumb.jsp | 4 +-
.../components/cms/searchresults/searchresults.jsp | 4 +-
.../components/editor/fields/path/field.jsp | 18 ++++++-
.../editor/fields/references/references.jsp | 2 +-
.../components/editor/fields/richtext/field.jsp | 18 +------
.../components/editor/fields/taxonomy/field.jsp | 4 +-
.../libs/sling-cms/content/shared/search.json | 8 +--
.../libs/sling-cms/content/site/create.json | 3 +-
.../libs/sling-cms/content/site/creategroup.json | 3 +-
.../jcr_root/libs/sling-cms/content/site/edit.json | 3 +-
.../libs/sling-cms/content/site/editgroup.json | 3 +-
24 files changed, 162 insertions(+), 104 deletions(-)
copy core/src/main/java/org/apache/sling/cms/core/{usergenerated/impl/UserGeneratedContentConfig.java => internal/servlets/PathSuggestionServletConfig.java} (57%)
[sling-org-apache-sling-app-cms] 01/02: initial commit of bulma
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch SLING-7858
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit df2ccb8ded41fe337fead12e5e41990236cb8f3f
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Sun Aug 26 16:09:55 2018 -0400
initial commit of bulma
---
ui/src/main/frontend/package.json | 4 +++-
ui/src/main/frontend/src/scss/bulma.scss | 18 ++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/ui/src/main/frontend/package.json b/ui/src/main/frontend/package.json
index 60dcb45..db2f09d 100644
--- a/ui/src/main/frontend/package.json
+++ b/ui/src/main/frontend/package.json
@@ -23,7 +23,9 @@
"gulp-sass": "^3.1.0",
"gulp-sourcemaps": "^2.6.4",
"streamqueue": "^1.1.2",
- "uglify-save-license": "^0.4.1"
+ "uglify-save-license": "^0.4.1",
+ "bulma": "^0.7.1",
+ "node-sass": "^4.9.2"
},
"license": "Apache-2.0"
}
\ No newline at end of file
diff --git a/ui/src/main/frontend/src/scss/bulma.scss b/ui/src/main/frontend/src/scss/bulma.scss
new file mode 100644
index 0000000..d3dde18
--- /dev/null
+++ b/ui/src/main/frontend/src/scss/bulma.scss
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+@charset "utf-8";
+@import "../../node_modules/bulma/bulma.sass";
[sling-org-apache-sling-app-cms] 02/02: Merge branch 'SLING-7858'
of https://github.com/apache/sling-org-apache-sling-app-cms.git into
SLING-7858
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch SLING-7858
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit de91b9ea7a0e2dda58d97c8e8b375cdf6a9874d5
Merge: df2ccb8 a33a8f3
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Sun Aug 26 16:16:38 2018 -0400
Merge branch 'SLING-7858' of https://github.com/apache/sling-org-apache-sling-app-cms.git into SLING-7858