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 2018/05/10 05:48:39 UTC
[sling-whiteboard] 04/04: Using the new /static directory and
cleaning up references to /etc
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
commit 1c5a27523b4e39ef00792614ff60b72914010828
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed May 9 23:48:21 2018 -0600
Using the new /static directory and cleaning up references to /etc
---
cms/ui/pom.xml | 3 ++-
cms/ui/src/main/frontend/gulpfile.js | 8 ++++----
cms/ui/src/main/frontend/src/img/browserconfig.xml | 2 +-
.../sling-cms/components/cms/pageeditbar/pageeditbar.jsp | 4 ++--
.../libs/sling-cms/components/editor/scripts/finalize.jsp | 2 +-
.../libs/sling-cms/components/editor/scripts/init.jsp | 2 +-
.../jcr_root/libs/sling-cms/components/pages/base/head.jsp | 14 +++++++-------
.../jcr_root/libs/sling-cms/components/pages/base/nav.jsp | 2 +-
.../libs/sling-cms/components/pages/base/scripts.jsp | 2 +-
9 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/cms/ui/pom.xml b/cms/ui/pom.xml
index 156977d..a502b93 100644
--- a/cms/ui/pom.xml
+++ b/cms/ui/pom.xml
@@ -94,12 +94,13 @@
<Sling-Nodetypes>SLING-INF/nodetypes/nodetypes.cnd</Sling-Nodetypes>
<Sling-Initial-Content>
jcr_root,
+ jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,
jcr_root/conf/global;overwrite:=false;uninstall:=true;path:=/conf/global,
jcr_root/etc/clientlibs;overwrite=true;ignoreImportProviders:=xml;path:=/etc/clientlibs,
jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,
jcr_root/libs/sling/servlet/errorhandler;overwriteProperties:=true;overwrite:=true;uninstall:=true;path:=/libs/sling/servlet/errorhandler,
jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,
- jcr_root/etc/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/etc/clientlibs/sling-cms
+ jcr_root/static/clientlibs/sling-cms;overwrite:=true;uninstall:=true;path:=/static/clientlibs/sling-cms
</Sling-Initial-Content>
<Include-Resource>{maven-resources},${basedir}/target/frontend/dist</Include-Resource>
</instructions>
diff --git a/cms/ui/src/main/frontend/gulpfile.js b/cms/ui/src/main/frontend/gulpfile.js
index 1d91383..9131361 100755
--- a/cms/ui/src/main/frontend/gulpfile.js
+++ b/cms/ui/src/main/frontend/gulpfile.js
@@ -58,7 +58,7 @@ var cssStream = gulp.src('./node_modules/summernote/dist/summernote-lite.css');
gulp.task('styles', function() {
var mergedStream = merge(cssStream, scssStream)
.pipe(concat('styles.min.css'))
- .pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms/css'))
+ .pipe(gulp.dest('./dist/jcr_root/static/clientlibs/sling-cms/css'))
.pipe(rename('bundle.css'))
.pipe(gulp.dest('./dist/jcr_root/content/starter/css'));
return mergedStream;
@@ -84,18 +84,18 @@ gulp.task('js', function() {
'src/js/*.js',
]))
.pipe(concat('scripts.min.js'))
- .pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms/js'));
+ .pipe(gulp.dest('./dist/jcr_root/static/clientlibs/sling-cms/js'));
});
gulp.task('assets', function() {
gulp.src('./src/{fonts,img}/**/*')
- .pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms'))
+ .pipe(gulp.dest('./dist/jcr_root/static/clientlibs/sling-cms'))
.pipe(gulp.dest('./dist/jcr_root/content/starter'));
gulp.src('./src/img/sling-logo.svg')
.pipe(gulp.dest('./dist/jcr_root/content/starter'))
.pipe(gulp.dest('./dist/jcr_root/content/starter'));
gulp.src('./node_modules/summernote/dist/font/*')
- .pipe(gulp.dest('./dist/jcr_root/etc/clientlibs/sling-cms/css/font'));
+ .pipe(gulp.dest('./dist/jcr_root/static/clientlibs/sling-cms/css/font'));
});
diff --git a/cms/ui/src/main/frontend/src/img/browserconfig.xml b/cms/ui/src/main/frontend/src/img/browserconfig.xml
index 44908da..5f597c9 100644
--- a/cms/ui/src/main/frontend/src/img/browserconfig.xml
+++ b/cms/ui/src/main/frontend/src/img/browserconfig.xml
@@ -20,7 +20,7 @@
<browserconfig>
<msapplication>
<tile>
- <square150x150logo src="/etc/clientlibs/sling-cms/img/mstile-150x150.png"/>
+ <square150x150logo src="/static/clientlibs/sling-cms/img/mstile-150x150.png"/>
<TileColor>#ffffff</TileColor>
</tile>
</msapplication>
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 5a3cbee..f004a75 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,11 +17,11 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<link rel="stylesheet" href="/etc/clientlibs/sling-cms-editor/editor.css" />
+<link rel="stylesheet" href="/static/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">
- <img src="/etc/clientlibs/sling-cms/img/sling-logo.svg" class="Sling-CMS__logo" />
+ <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" class="Sling-CMS__logo" />
</a>
<sling:include path="actions" resourceType="sling-cms/components/cms/pageeditbar/actions" />
</div>
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
index 8b97700..52cad1d 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<c:if test="${cmsEditEnabled == 'true'}">
- <script src="/etc/clientlibs/sling-cms-editor/editor.js"></script>
+ <script src="/static/clientlibs/sling-cms-editor/editor.js"></script>
<div class="Sling-CMS__modal-background">
<div class="Sling-CMS__modal-box">
<div class="Sling-CMS__modal-frame-header">
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp
index 60e51e3..1722b61 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<c:if test="${cmsEditEnabled == 'true'}">
- <link rel="stylesheet" href="/etc/clientlibs/sling-cms-editor/editor.css" />
+ <link rel="stylesheet" href="/static/clientlibs/sling-cms-editor/editor.css" />
<c:if test="${not empty properties.availableTypes}">
<c:set var="availableTypes" value="${properties.availableTypes}" scope="request" />
</c:if>
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 009c9f2..3c5b154 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
@@ -22,15 +22,15 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<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">
+ <link href="/static/clientlibs/sling-cms/css/styles.min.css" rel="stylesheet" />
+ <link rel="apple-touch-icon" sizes="180x180" href="/static/clientlibs/sling-cms/img/apple-touch-icon.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="/static/clientlibs/sling-cms/img/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="/static/clientlibs/sling-cms/img/favicon-16x16.png">
+ <link rel="mask-icon" href="/static/clientlibs/sling-cms/img/safari-pinned-tab.svg" color="#00678c">
+ <link rel="shortcut icon" href="/static/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="msapplication-config" content="/static/clientlibs/sling-cms/img/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
</head>
\ No newline at end of file
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
index 2b54b9f..80e4b53 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<a class="Cell-Pad" href="http://sling.apache.org" target="_blank" title="Visit the Apache Sling website">
- <img src="/etc/clientlibs/sling-cms/img/sling-logo.svg" alt="Apache Sling Logo"/>
+ <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" alt="Apache Sling Logo"/>
</a>
<h1>
<a href="/cms/start.html">
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/scripts.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/scripts.jsp
index e285ce1..93ec702 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/scripts.jsp
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/scripts.jsp
@@ -17,4 +17,4 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<script src="/etc/clientlibs/sling-cms/js/scripts.min.js"></script>
\ No newline at end of file
+<script src="/static/clientlibs/sling-cms/js/scripts.min.js"></script>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.