This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-editor.git
commit 5f78b3c4d99e94bb7681ddfad282e6bc4a814800 Author: Sandro Boehme <[email protected]> AuthorDate: Sun Dec 25 19:31:57 2016 +0000 SLING-6248 Resource Editor :: Resource Type Editor :: restructuring folders to distinguish between scripts and initial JSON content git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1776028 13f79535-47bb-0310-9956-ffa450edef68 --- frontend/Gruntfile.js | 2 +- frontend/karma.conf.ci.js | 2 +- pom.xml | 27 +++++----- .../apache/sling/reseditor/ResourceTypeList.java | 3 +- .../resource/ResEditorResourceProvider.java | 2 +- .../{ => content}/content-nodes.json | 0 .../sling/resource-editor/{ => scripts}/500.jsp | 0 .../resource-editor/{ => scripts}/Throwable.jsp | 0 .../sling/resource-editor/{ => scripts}/html.jsp | 56 ++++++++++----------- .../resource-editor/{ => scripts}/node-content.jsp | 6 +-- .../{ => scripts}/nodes.json.incl.jsp | 1 + .../resource-editor/{ => scripts}/nodes.json.jsp | 0 .../{ => scripts}/property-editor.jsp | 0 .../{ => scripts}/rootnodes.json.jsp | 0 .../static}/3rd_party/font/Michroma.eot | Bin .../static}/3rd_party/font/Michroma.woff | Bin .../static}/css/bootbox.reseditor.css | 0 .../static}/css/browser_ie.css | 0 .../static}/css/font.css | 0 .../static}/css/font_ie.css | 0 .../static}/css/ie.css | 0 .../static}/css/jstree.reseditor.css | 0 .../static}/css/select2.reseditor.css | 0 .../static}/img/add.png | Bin .../static}/img/alu.gif | Bin .../static}/img/folder_lightgray.png | Bin .../static}/img/info_black.png | Bin .../static}/img/info_darkgray.png | Bin .../static}/img/info_lightgray.png | Bin .../static}/img/remove.png | Bin .../static}/img/right_arrow_lightgray.png | Bin .../static}/js/LoginController.js | 0 .../static}/js/MainController.js | 0 .../static}/js/properties/PropertyController.js | 0 .../js/scriptpathchooser/scriptfilechooser.js | 0 .../static}/js/tree/AddNodeController.js | 12 ++--- .../static}/js/tree/JSTreeAdapter.js | 0 .../static}/js/tree/TreeController.js | 0 38 files changed, 55 insertions(+), 56 deletions(-) diff --git a/frontend/Gruntfile.js b/frontend/Gruntfile.js index 079e745..3d4abe6 100644 --- a/frontend/Gruntfile.js +++ b/frontend/Gruntfile.js @@ -1,6 +1,6 @@ module.exports = function(grunt) { - var staticContentFolder = '../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content'; + var staticContentFolder = '../src/main/resources/SLING-INF/libs/sling/resource-editor/static'; var jspFolder = '../src/main/resources/SLING-INF/libs/sling/resource-editor'; var e2eTestSpecFolder = '../src/test/javascript/e2e/spec/**/*spec.js'; var server = 'localhost'; diff --git a/frontend/karma.conf.ci.js b/frontend/karma.conf.ci.js index 781abc4..6a0b5b6 100644 --- a/frontend/karma.conf.ci.js +++ b/frontend/karma.conf.ci.js @@ -1,4 +1,4 @@ -var staticContentFolder = '../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content'; +var staticContentFolder = '../src/main/resources/SLING-INF/libs/sling/resource-editor/static'; module.exports = function(config) { config.set({ runnerPort: 9999, diff --git a/pom.xml b/pom.xml index 5853a56..285168f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,28 +40,25 @@ </resource> </resources> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - <executions> - <execution> - <id>generate-scr-descriptor</id> - <goals> - <goal>scr</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> <configuration> <instructions> +<!-- <Sling-Initial-Content> --> +<!-- META-INF/tags;overwrite:=true;path:=/libs/sling/resource-editor-tags/property-editor, --> +<!-- SLING-INF/libs/sling;overwrite:=true;path:=/libs/sling --> +<!-- </Sling-Initial-Content> --> <Sling-Initial-Content> META-INF/tags;overwrite:=true;path:=/libs/sling/resource-editor-tags/property-editor, - SLING-INF/libs/sling/resource-editor-static-content;overwrite:=true;path:=/libs/sling/resource-editor-static-content, - SLING-INF/libs/sling/resource-editor;overwrite:=true;path:=/libs/sling/resource-editor + SLING-INF/libs/sling/resource-editor/static;overwrite:=true;path:=/libs/sling/resource-editor/static, + SLING-INF/libs/sling/resource-editor/scripts;overwrite:=true;path:=/libs/sling/resource-editor/scripts, + SLING-INF/libs/sling/resource-editor/content;overwrite:=true;path:=/libs/sling/resource-editor/content </Sling-Initial-Content> <Import-Package>!org.slf4j.impl,*, org.apache.sling.jcr.js.nodetypes.javascript, @@ -142,7 +139,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>maven-sling-plugin</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.9-SNAPSHOT</version> </plugin> </plugins> <extensions> diff --git a/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java b/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java index 8ef2a86..dac3b78 100644 --- a/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java +++ b/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java @@ -67,7 +67,8 @@ public class ResourceTypeList extends SlingSafeMethodsServlet { @Override protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, - IOException { + IOException { + response.setContentType("application/json"); PrintWriter responseWriter = null; Set<String> resourceTypes = new HashSet<String>(); try { diff --git a/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java b/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java index edc4b42..ba126ef 100644 --- a/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java +++ b/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java @@ -44,7 +44,7 @@ public class ResEditorResourceProvider implements ResourceProvider{ public static final String ROOT_PATHELEMENT_NAME = "reseditor"; public static final String ABS_ROOT = "/" + ROOT_PATHELEMENT_NAME; public static final String RESOURCE_EDITOR_PROVIDER_RESOURCE = "resource-editor.RESOURCE_EDITOR_PROVIDER_RESOURCE"; - public static final String RESEDITOR_RESOURCE_TYPE = "sling/resource-editor"; + public static final String RESEDITOR_RESOURCE_TYPE = "sling/resource-editor/scripts"; /** ResourceProvider interface */ diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/content-nodes.json b/src/main/resources/SLING-INF/libs/sling/resource-editor/content/content-nodes.json similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/content-nodes.json rename to src/main/resources/SLING-INF/libs/sling/resource-editor/content/content-nodes.json diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/500.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/500.jsp similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/500.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/500.jsp diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/Throwable.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/Throwable.jsp similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/Throwable.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/Throwable.jsp diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp similarity index 84% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp index 67ff501..2e4a3db 100644 --- a/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp +++ b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp @@ -34,13 +34,13 @@ <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/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/css/font_ie.css' rel='stylesheet' type='text/css'> <![endif]--> <!--[if IE]> -<link href='<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/ie.css' rel='stylesheet' type='text/css'> +<link href='<%= request.getContextPath() %>/libs/sling/resource-editor/static/css/ie.css' rel='stylesheet' type='text/css'> <![endif]--> <!-- @@ -50,38 +50,38 @@ original <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/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/generated/3rd_party/js/bootstrap-notify.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/jquery.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/bootstrap.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/bootbox.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/jstree.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/select2.min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/bootstrap-notify.min.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/properties/PropertyController.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/js/tree/JSTreeAdapter.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/tree/TreeController.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/tree/AddNodeController.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/properties/PropertyController.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/LoginController.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/MainController.js"></script> -<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/js/scriptpathchooser/scriptfilechooser.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/js/scriptpathchooser/scriptfilechooser.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> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/jquery.scrollTo-min.js"></script> +<script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/js/urlEncode.js"></script> --> -<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"> -<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"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/css/style.min.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/css/jstree.reseditor.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/css/bootstrap.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/css/bootbox.reseditor.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/css/animate.min.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/generated/3rd_party/css/select2.css"> +<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/css/select2.reseditor.css"> <!--[if IE]> - <link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor-static-content/css/browser_ie.css"/> + <link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/libs/sling/resource-editor/static/css/browser_ie.css"/> <![endif]--> <% @@ -279,8 +279,8 @@ new org.apache.sling.reseditor.PropertyController({}, mainController); <input name="jcr:primaryType" type="hidden" id="nodeType"> </div> <div class="form-group resource-type"> - <label for="resourceType">Sling Resource Type</label> - <input name="sling:resourceType" type="hidden" id="resourceType"> + <label for="newResourceType">Sling Resource Type</label> + <input name="sling:resourceType" type="hidden" id="newResourceType"> <span class="resource-type-not-allowed help-block" style="display:none;">The selected node type does not allow the resulting node to have a Sling resource type property.</span> </div> </div> diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp similarity index 99% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp index 5b53126..915c57d 100644 --- a/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp +++ b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp @@ -17,15 +17,15 @@ When should it be displayed as active? --%> <c:set var="isWebPage" value="<%=hasScriptResource ? scriptResourceReqAttr.isResourceType("sling/web-page") : false %>"/> - <c:if test="${isWebPage}"> + <c:if test="${isWebPage || true}"> <ul id="content-tabs" class="nav nav-pills" role="tablist"> - <li role="presentation" class="active"><a href="#page-editor" aria-controls="page-editor" role="tab" data-toggle="pill">Web Page Editor</a></li> + <li role="presentation" class="active"><a href="#page-editor" aria-controls="page-editor" role="tab" data-toggle="pill">Web Page Editor xxx</a></li> <li role="presentation"><a href="#page-preview" aria-controls="page-preview" role="tab" data-toggle="pill">Page Preview</a></li> <li role="presentation"><a href="#resource-type-editor" aria-controls="resource-type-editor" role="tab" data-toggle="pill">Resource Type Editor</a></li> <li role="presentation"><a href="#properties" aria-controls="properties" role="tab" data-toggle="pill">Properties</a></li> </ul> </c:if> - <c:if test="${!isWebPage}"> + <c:if test="${!isWebPage && false}"> <ul id="content-tabs" class="nav nav-pills" role="tablist"> <li role="presentation" class="active"><a href="#properties" aria-controls="properties" role="tab" data-toggle="pill">Properties</a></li> <li role="presentation"><a href="#resource-type-editor" aria-controls="resource-type-editor" role="tab" data-toggle="pill">Resource Type Editor</a></li> diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp similarity index 98% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp index ceef02a..4bb5ce5 100644 --- a/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp +++ b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp @@ -18,6 +18,7 @@ --%> [ <c:forEach var="theResource" items="${sling:listChildren(resource)}" varStatus="status"> + <c:set var="resourceIsNode" scope="request" value="${sling:adaptTo(resource,'javax.jcr.Node') != null}"/> <%--Hiding the resource provider root. --%> <c:if test="${theResource.path != '/reseditor'}"> diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.jsp similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.jsp diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/property-editor.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/property-editor.jsp similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/property-editor.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/property-editor.jsp diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor/rootnodes.json.jsp b/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/rootnodes.json.jsp similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor/rootnodes.json.jsp rename to src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/rootnodes.json.jsp diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.eot b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/3rd_party/font/Michroma.eot similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.eot rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/3rd_party/font/Michroma.eot diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.woff b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/3rd_party/font/Michroma.woff similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/font/Michroma.woff rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/3rd_party/font/Michroma.woff diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/bootbox.reseditor.css b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/bootbox.reseditor.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/bootbox.reseditor.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/bootbox.reseditor.css diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/browser_ie.css b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/browser_ie.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/browser_ie.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/browser_ie.css 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/css/font.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/font.css 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/css/font_ie.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/font_ie.css diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/ie.css b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/ie.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/ie.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/ie.css diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/jstree.reseditor.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/jstree.reseditor.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/jstree.reseditor.css diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/select2.reseditor.css b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/select2.reseditor.css similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/select2.reseditor.css rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/select2.reseditor.css diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/add.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/add.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/add.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/add.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/alu.gif b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/alu.gif similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/alu.gif rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/alu.gif diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/folder_lightgray.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/folder_lightgray.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/folder_lightgray.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/folder_lightgray.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_black.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_black.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_black.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_black.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_darkgray.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_darkgray.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_darkgray.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_darkgray.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_lightgray.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_lightgray.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/info_lightgray.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/info_lightgray.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/remove.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/remove.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/remove.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/remove.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/right_arrow_lightgray.png b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/right_arrow_lightgray.png similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/right_arrow_lightgray.png rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/right_arrow_lightgray.png diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/LoginController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/LoginController.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/LoginController.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/LoginController.js diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/MainController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/MainController.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/MainController.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/MainController.js diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/properties/PropertyController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/properties/PropertyController.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/properties/PropertyController.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/properties/PropertyController.js diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/scriptpathchooser/scriptfilechooser.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/scriptpathchooser/scriptfilechooser.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/scriptpathchooser/scriptfilechooser.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/scriptpathchooser/scriptfilechooser.js diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js similarity index 96% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js index ef3976a..0a1ba58 100644 --- a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/AddNodeController.js +++ b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js @@ -80,7 +80,7 @@ org.apache.sling.reseditor.AddNodeController = (function() { if (dialogSubmitable) { var nodeName = $("#nodeName").select2("val"); var nodeType = $("#nodeType").select2("val"); - var resourceType = $("#resourceType").select2("val"); + var resourceType = $("#newResourceType").select2("val"); var data = {"_charset_": "utf-8"}; @@ -259,16 +259,16 @@ org.apache.sling.reseditor.AddNodeController = (function() { this.lastAddNodeURL = contextPath+resourcePath; - $('#resourceType').select2('data', null); + $('#newResourceType').select2('data', null); var contextPath = this.mainController.getContextPath(); contextPath = "/" === contextPath ? "" : contextPath; - var url = contextPath+"/libs/sling/resource-editor/content-nodes/resource-types.json"; + var url = contextPath+"/libs/sling/resource-editor/content/content-nodes/resource-types.json"; $.getJSON(url, function( origData ) { var data = jQuery.map( origData, function( n, i ) { return ( {id:n, text:n} ); }); data.unshift({id:"",text:""}); - var select2 = $("#resourceType").select2({ + var select2 = $("#newResourceType").select2({ placeholder: "Enter or select a resource type", allowClear: true, dropdownCssClass: "resource_type_dd_container", @@ -280,10 +280,10 @@ org.apache.sling.reseditor.AddNodeController = (function() { } }).data("select2"); - $("#resourceType").on("select2-open", function(e) { + $("#newResourceType").on("select2-open", function(e) { thatAddNodeController.resourceTypeSubmitable=false; }); - $("#resourceType").on("select2-close", function(e) { + $("#newResourceType").on("select2-close", function(e) { thatAddNodeController.resourceTypeSubmitable=true; }); diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/JSTreeAdapter.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/JSTreeAdapter.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/JSTreeAdapter.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/JSTreeAdapter.js diff --git a/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/TreeController.js b/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/TreeController.js similarity index 100% rename from src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/tree/TreeController.js rename to src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/TreeController.js -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
