Author: sboehme
Date: Sun Dec 25 19:31:57 2016
New Revision: 1776028
URL: http://svn.apache.org/viewvc?rev=1776028&view=rev
Log:
SLING-6248 Resource Editor :: Resource Type Editor :: restructuring folders to
distinguish between scripts and initial JSON content
Added:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/content/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/content/content-nodes.json
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/content-nodes.json
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/500.jsp
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/500.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/Throwable.jsp
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/Throwable.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp
- copied, changed from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp
- copied, changed from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp
- copied, changed from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.jsp
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/property-editor.jsp
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/property-editor.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/rootnodes.json.jsp
- copied unchanged from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/rootnodes.json.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/
(with props)
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/3rd_party/
- copied from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/css/
- copied from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/img/
- copied from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/
- copied from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/
Removed:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/3rd_party/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/img/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/500.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/Throwable.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/content-nodes.json
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/property-editor.jsp
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/rootnodes.json.jsp
Modified:
sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.ci.js
sling/trunk/contrib/explorers/resourceeditor/pom.xml
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js
Modified: sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
(original)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js Sun Dec
25 19:31:57 2016
@@ -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';
Modified: sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.ci.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.ci.js?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.ci.js
(original)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.ci.js Sun
Dec 25 19:31:57 2016
@@ -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,
Modified: sling/trunk/contrib/explorers/resourceeditor/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/pom.xml?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/pom.xml (original)
+++ sling/trunk/contrib/explorers/resourceeditor/pom.xml Sun Dec 25 19:31:57
2016
@@ -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>
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/ResourceTypeList.java
Sun Dec 25 19:31:57 2016
@@ -67,7 +67,8 @@ public class ResourceTypeList extends Sl
@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 {
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/java/org/apache/sling/reseditor/resource/ResEditorResourceProvider.java
Sun Dec 25 19:31:57 2016
@@ -44,7 +44,7 @@ public class ResEditorResourceProvider i
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 */
Copied:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp
(from r1776027,
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/scripts/html.jsp?p2=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/html.jsp&p1=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp&r1=1776027&r2=1776028&rev=1776028&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/scripts/html.jsp
Sun Dec 25 19:31:57 2016
@@ -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-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/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/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.PropertyC
<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>
Copied:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp
(from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp?p2=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp&p1=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp&r1=1776027&r2=1776028&rev=1776028&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/node-content.jsp
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/node-content.jsp
Sun Dec 25 19:31:57 2016
@@ -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>
Copied:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp
(from r1776027,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp?p2=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp&p1=sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp&r1=1776027&r2=1776028&rev=1776028&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/nodes.json.incl.jsp
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/scripts/nodes.json.incl.jsp
Sun Dec 25 19:31:57 2016
@@ -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'}">
Propchange:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec 25 19:31:57 2016
@@ -0,0 +1 @@
+generated
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js?rev=1776028&r1=1776027&r2=1776028&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/static/js/tree/AddNodeController.js
Sun Dec 25 19:31:57 2016
@@ -80,7 +80,7 @@ org.apache.sling.reseditor.AddNodeContro
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.AddNodeContro
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.AddNodeContro
}
}).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;
});
