You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by sb...@apache.org on 2015/03/30 14:46:24 UTC
svn commit: r1670082 - in /sling/trunk/contrib/explorers/resourceeditor: ./
frontend/
src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/
src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/generated/
src/main...
Author: sboehme
Date: Mon Mar 30 12:46:23 2015
New Revision: 1670082
URL: http://svn.apache.org/r1670082
Log:
SLING-4205 Resource Editor: moving the jsTree dependencies to 'generated/3rd_party'
Added:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css
Removed:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/style.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/32px.png
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/40px.png
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/file.png
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/root.png
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/throbber.gif
Modified:
sling/trunk/contrib/explorers/resourceeditor/README
sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/generated/ (props changed)
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
Modified: sling/trunk/contrib/explorers/resourceeditor/README
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/README?rev=1670082&r1=1670081&r2=1670082&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/README (original)
+++ sling/trunk/contrib/explorers/resourceeditor/README Mon Mar 30 12:46:23 2015
@@ -11,7 +11,7 @@ o After that you find the web applicatio
o Use `mvn install sling:install` to deploy changes of Java classes
o To have frontend changes automatically deployed call `mvn install -P autoInstallBundle -Dsling.mountByFS=true`
o To have the less sources automatically compiled on change call `./grunt watch:less` in the frontend directory. Press Ctrl-Z to stop watching.
-o To run the build on your local maschine call './grunt local_build' within the frontend directory. It includes end to end tests with firefox and chrome.
+o To run the build on your local machine call './grunt desktop_build' within the frontend directory. It includes end to end tests with firefox and chrome.
Modified: sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js?rev=1670082&r1=1670081&r2=1670082&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js (original)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js Mon Mar 30 12:46:23 2015
@@ -55,6 +55,10 @@ module.exports = function(grunt) {
'select2/select2.css',
'select2/select2.png',
'animate.css/animate.min.css',
+ 'jstree/dist/themes/default/style.min.css',
+ 'jstree/dist/themes/default/32px.png',
+ 'jstree/dist/themes/default/40px.png',
+ 'jstree/dist/themes/default/throbber.gif',
], // Actual pattern(s) to match.
dest: staticContentFolder+'/generated/3rd_party/css', // Destination path prefix.
flatten: true
@@ -70,7 +74,8 @@ module.exports = function(grunt) {
plugins : ['karma-jasmine', 'karma-phantomjs-launcher', 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-ie-launcher'],
frameworks: ['jasmine'],
files: ['../src/test/javascript/spec/*spec.js',
- staticContentFolder+'/js/3rd_party/jquery.min.js',
+ staticContentFolder+'/generated/3rd_party/js/jquery.min.js',
+ staticContentFolder+'/generated/3rd_party/js/**/*.js',
staticContentFolder+'/js/**/*.js'
]
},
Added: sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css?rev=1670082&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css (added)
+++ sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css Mon Mar 30 12:46:23 2015
@@ -0,0 +1,3 @@
+.jstree-default .jstree-icon:empty {
+ width: 16px;
+}
\ No newline at end of file
Propchange: sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/generated/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 30 12:46:23 2015
@@ -0,0 +1,2 @@
+3rd_party
+css
Modified: sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp?rev=1670082&r1=1670081&r2=1670082&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp (original)
+++ sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp Mon Mar 30 12:46:23 2015
@@ -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/3rd_party/css/font.css' rel='stylesheet' type='text/css'>
+<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/font.css' rel='stylesheet' type='text/css'>
<!--[if lt IE 9]>
-<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/3rd_party/css/font_ie.css' rel='stylesheet' type='text/css'>
+<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/font_ie.css' rel='stylesheet' type='text/css'>
<![endif]-->
<!--
@@ -43,7 +43,8 @@ original
<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/generated/3rd_party/css/style.min.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/jstree.reseditor.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/generated/3rd_party/css/animate.min.css">