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-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 847f48f Fixing issues in the on page editor and adding favicons
847f48f is described below
commit 847f48f65f3df122bb84e05efc52b1bded8e922a
Author: Dan Klco <daniel.k...@gmail.com>
AuthorDate: Fri Feb 2 10:31:49 2018 -0500
Fixing issues in the on page editor and adding favicons
---
cms/ui/pom.xml | 1 +
cms/ui/src/main/frontend/gulpfile.js | 6 ++++--
.../libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp | 2 +-
.../jcr_root/libs/sling-cms/components/pages/base/head.jsp | 10 ++++++++++
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/cms/ui/pom.xml b/cms/ui/pom.xml
index 702737b..e38f24e 100644
--- a/cms/ui/pom.xml
+++ b/cms/ui/pom.xml
@@ -95,6 +95,7 @@
<Sling-Initial-Content>
jcr_root,
jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,
+
jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,
jcr_root/etc/fileeditors;overwrite:=false;uninstall:=true;path:=/etc/fileeditors,
jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,
jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,
diff --git a/cms/ui/src/main/frontend/gulpfile.js
b/cms/ui/src/main/frontend/gulpfile.js
index 3cccc19..053d648 100755
--- a/cms/ui/src/main/frontend/gulpfile.js
+++ b/cms/ui/src/main/frontend/gulpfile.js
@@ -67,7 +67,7 @@ gulp.task('styles', function() {
var vendorJSStream = gulp.src([
'./node_modules/jquery/dist/jquery.min.js',
'./node_modules/handlebars/dist/handlebars.min.js',
- './node_modules/summernote/dist/summernote.min.js']);
+ './node_modules/summernote/dist/summernote-lite.js']);
var jsStream = gulp.src([
'./src/js/scripts.js'
@@ -88,9 +88,11 @@ gulp.task('js', function() {
});
gulp.task('assets', function() {
- gulp.src(['./src/{fonts,img}/**/*'])
+ gulp.src('./src/{fonts,img}/**/*')
.pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms'))
.pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/launchpad'));
+ gulp.src('./node_modules/summernote/dist/font/*')
+
.pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms/css/font'));
});
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp
index ce0b5a1..aa5498a 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp
@@ -17,7 +17,7 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<link rel="stylesheet" href="/etc/clientlibs/sling-cms/css/editor.css" />
+<link rel="stylesheet" href="/etc/clientlibs/sling-cms-editor/editor.css" />
<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
<div class="Sling-CMS__edit-bar">
<a href="/cms/start.html" target="_blank"
class="Sling-CMS__component-title" target="Sling CMS">
diff --git
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp
index bbfc4d1..009c9f2 100644
---
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp
+++
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/head.jsp
@@ -23,4 +23,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Apache Sling :: ${properties['jcr:title']}</title>
<link href="/etc/clientlibs/sling-cms/css/styles.min.css"
rel="stylesheet" />
+ <link rel="apple-touch-icon" sizes="180x180"
href="/etc/clientlibs/sling-cms/img/apple-touch-icon.png">
+ <link rel="icon" type="image/png" sizes="32x32"
href="/etc/clientlibs/sling-cms/img/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="16x16"
href="/etc/clientlibs/sling-cms/img/favicon-16x16.png">
+ <link rel="mask-icon"
href="/etc/clientlibs/sling-cms/img/safari-pinned-tab.svg" color="#00678c">
+ <link rel="shortcut icon"
href="/etc/clientlibs/sling-cms/img/favicon.ico">
+ <meta name="apple-mobile-web-app-title" content="Apache Sling CMS">
+ <meta name="application-name" content="Apache Sling CMS">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-config"
content="/etc/clientlibs/sling-cms/img/browserconfig.xml">
+ <meta name="theme-color" content="#ffffff">
</head>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dk...@apache.org.
