SLING-4205 Resource Editor: created a generated/3rd_party folder for libs that will be downloaded and copied via npm and Grunt and a /3rd_party folder for libs that have to be checked in. The 'generated' folder will be regenerated with Grunt.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1669928 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/frontend/Gruntfile.js b/frontend/Gruntfile.js
index c2e1aea..bfe3bb0 100644
--- a/frontend/Gruntfile.js
+++ b/frontend/Gruntfile.js
@@ -15,10 +15,10 @@
sourceMap: true,
outputSourceFiles: true,
sourceMapURL: 'bootstrap.css.map',
- sourceMapFilename: staticContentFolder+'/css/bootstrap.css.map'
+ sourceMapFilename: staticContentFolder+'/generated/css/bootstrap.css.map'
},
src: '../src/main/less/reseditor.less',
- dest: staticContentFolder+'/css/bootstrap.css'
+ dest: staticContentFolder+'/generated/css/bootstrap.css'
}
},
watch: {
@@ -41,7 +41,7 @@
'bootbox/bootbox.min.js',
'jstree/dist/jstree.min.js'
], // Actual pattern(s) to match.
- dest: staticContentFolder+'/js/3rd_party', // Destination path prefix.
+ dest: staticContentFolder+'/generated/3rd_party/js', // Destination path prefix.
flatten: true
},
],
@@ -56,7 +56,7 @@
'select2/select2.png',
'animate.css/animate.min.css',
], // Actual pattern(s) to match.
- dest: staticContentFolder+'/css/3rd_party', // Destination path prefix.
+ dest: staticContentFolder+'/generated/3rd_party/css', // Destination path prefix.
flatten: true
},
],
diff --git a/src/main/less/navs.less b/src/main/less/navs.less
index 2a3b6cd..78d2fe2 100644
--- a/src/main/less/navs.less
+++ b/src/main/less/navs.less
@@ -20,14 +20,14 @@
#login .nav-tabs > li {
float: right;
margin-right: 15px;
- background: transparent url(../img/alu.gif) repeat left top;
+ background: transparent url(../../img/alu.gif) repeat left top;
margin-top: 0px;
}
#login .nav-pills > li {
float: right;
margin: 5px 10px 0px 0px;
- background: transparent url(../img/alu.gif) repeat left top;
+ background: transparent url(../../img/alu.gif) repeat left top;
}
#login .tabs-below > .nav-tabs > .active > a, #login .tabs-below > .nav-pills > .active > a {
diff --git a/src/main/less/reseditor.less b/src/main/less/reseditor.less
index acded44..bf16646 100755
--- a/src/main/less/reseditor.less
+++ b/src/main/less/reseditor.less
@@ -49,7 +49,7 @@
body
{
- background: transparent url(../img/alu.gif) repeat left top;
+ background: transparent url(../../img/alu.gif) repeat left top;
}
/* ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: */
@@ -240,15 +240,15 @@
}
.jstree-default .jstree-icon.open-icon{
- background-image: url(../img/right_arrow_lightgray.png);
+ background-image: url(../../img/right_arrow_lightgray.png);
}
.jstree-default .jstree-icon.remove-icon{
- background-image: url(../img/remove.png);
+ background-image: url(../../img/remove.png);
}
.jstree-default .jstree-icon.add-icon{
- background-image: url(../img/add.png);
+ background-image: url(../../img/add.png);
margin-right: 3px;
}
@@ -261,12 +261,12 @@
.jstree-default ins.jstree-icon{
- background-image: url(../img/folder_lightgray.png);
+ background-image: url(../../img/folder_lightgray.png);
background-position-y: 5px;
}
.jstree-default .jstree-icon.jstree-themeicon {
- background-image: url(../img/folder_lightgray.png);
+ background-image: url(../../img/folder_lightgray.png);
background-position: 0 6px;
}
@@ -332,17 +332,17 @@
display: inline-block;
}
.info-icon-dark {
- background-image: url(../img/info_darkgray.png);
+ background-image: url(../../img/info_darkgray.png);
}
.info-icon-dark:hover {
- background-image: url(../img/info_black.png);
+ background-image: url(../../img/info_black.png);
}
.info-icon-lightgray {
- background-image: url(../img/info_lightgray.png);
+ background-image: url(../../img/info_lightgray.png);
}
.info-icon-lightgray:hover {
- background-image: url(../img/info_black.png);
+ background-image: url(../../img/info_black.png);
}
.modal-body.vertical-form .form-group {
margin-bottom: 10px;
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.eot b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.eot
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.eot
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.eot
Binary files differ
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.woff b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.woff
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.woff
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.woff
Binary files differ
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
index fc535d3..058b272 100644
--- a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
+++ b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
@@ -2,5 +2,5 @@
font-family: 'Michroma';
font-style: normal;
font-weight: 400;
- src: local('Michroma'), url(../font/3rd_party/Michroma.woff) format('woff');
+ src: local('Michroma'), url(../3rd_party/font/Michroma.woff) format('woff');
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
index 1d3fb8a..8cdccb0 100644
--- a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
+++ b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
@@ -2,6 +2,6 @@
font-family: 'Michroma';
font-style: normal;
font-weight: 400;
- src: url(../font/3rd_party/Michroma.eot);
- src: local('Michroma'), url(../font/3rd_party/Michroma.eot) format('embedded-opentype'), url(../font/3rd_party/Michroma.woff) format('woff');
+ src: url(../3rd_party/font/Michroma.eot);
+ src: local('Michroma'), url(../3rd_party/font/Michroma.eot) format('embedded-opentype'), url(../3rd_party/font/Michroma.woff) format('woff');
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/LoginController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/LoginController.js
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/LoginController.js
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/LoginController.js
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/MainController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/MainController.js
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/MainController.js
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/MainController.js
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/AddNodeController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/AddNodeController.js
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/JSTreeAdapter.js b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/JSTreeAdapter.js
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/JSTreeAdapter.js
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/JSTreeAdapter.js
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/TreeController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/TreeController.js
similarity index 100%
rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/reseditor/tree/TreeController.js
rename to src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/TreeController.js
diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
index b426599..1122845 100644
--- a/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
+++ b/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
@@ -14,9 +14,9 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/font.css' rel='stylesheet' type='text/css'>
+<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/3rd_party/css/font.css' rel='stylesheet' type='text/css'>
<!--[if lt IE 9]>
-<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/font_ie.css' rel='stylesheet' type='text/css'>
+<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/3rd_party/css/font_ie.css' rel='stylesheet' type='text/css'>
<![endif]-->
<!--
@@ -26,28 +26,28 @@
<script type="text/javascript" src="<%= request.getContextPath() %>/libs/jsnodetypes/js/jsnodetypes.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/3rd_party/jquery.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/3rd_party/bootstrap.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/3rd_party/bootbox.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/3rd_party/jstree.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/3rd_party/select2.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/jquery.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/bootbox.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/jstree.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/select2.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/reseditor/tree/JSTreeAdapter.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/reseditor/tree/TreeController.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/reseditor/tree/AddNodeController.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/reseditor/LoginController.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/reseditor/MainController.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/tree/JSTreeAdapter.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/tree/TreeController.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/LoginController.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/MainController.js"></script>
<!--
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/jquery.scrollTo-min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/urlEncode.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/jquery.scrollTo-min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/js/urlEncode.js"></script>
-->
<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/style.css">
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/bootstrap.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/css/bootstrap.css">
<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/bootbox.reseditor.css">
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/3rd_party/animate.min.css">
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/3rd_party/select2.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/css/animate.min.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/generated/3rd_party/css/select2.css">
<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/select2.reseditor.css">
<!--[if IE]>
