[sling-whiteboard] branch master updated: Removing the site header since it is no longer required due to the ability to create nested site structures

[dk...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 4d980fc  Removing the site header since it is no longer required due to the ability to create nested site structures
4d980fc is described below

commit 4d980fc3933994e88e6d3edc33e918cdcdca7d58
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu May 3 16:04:17 2018 -0400

    Removing the site header since it is no longer required due to the
    ability to create nested site structures
---
 .../components/cms/siteheader/siteheader.jsp       | 32 ----------------------
 .../libs/sling-cms/content/site/content.json       |  4 ---
 .../libs/sling-cms/content/site/sites.json         |  4 ---
 3 files changed, 40 deletions(-)

diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
deleted file mode 100644
index 55c2b31..0000000
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%-- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<sling:getParent resource="${slingRequest.requestPathInfo.suffixResource}" var="site" level="2" />
-<div class="Pull-Right">
-	<a class="Fetch-Modal Button" data-title="Edit Site" data-path=".Main-Content form" href="/cms/site/edit.html${site.path}" title="Edit Site">&#x270f;</a>
-	<a class="Fetch-Modal Button" data-title="Move / Copy Site" data-path=".Main-Content form" href="/cms/shared/movecopy.html${site.path}" title="Delete Site">&#x21c6;</a>
-	<a class="Fetch-Modal Button" data-title="Delete Site" data-path=".Main-Content form" href="/cms/shared/delete.html${site.path}" title="Delete Site">&times;</a>
-</div>
-<h2>
-	<sling:encode value="${site.valueMap['jcr:title']}" mode="HTML" />
-</h2>
-<p>
-	<sling:encode value="${site.valueMap['jcr:description']}" mode="HTML" />
-</p>
-<hr/>
\ No newline at end of file
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
index 8916a11..51eb015 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/content.json
@@ -7,10 +7,6 @@
 		"container": {
 			"jcr:primaryType": "nt:unstructured",
 			"sling:resourceType": "sling-cms/components/general/container",
-			"siteheader": {
-				"jcr:primaryType": "nt:unstructured",
-				"sling:resourceType": "sling-cms/components/cms/siteheader"
-			},
 			"contentactions": {
 				"jcr:primaryType": "nt:unstructured",
 				"sling:resourceType": "sling-cms/components/cms/contentactions",
diff --git a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
index 61f0020..baf3871 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
@@ -7,10 +7,6 @@
 		"container": {
 			"jcr:primaryType": "nt:unstructured",
 			"sling:resourceType": "sling-cms/components/general/container",
-			"siteheader": {
-				"jcr:primaryType": "nt:unstructured",
-				"sling:resourceType": "sling-cms/components/cms/siteheader"
-			},
 			"contentactions": {
 				"jcr:primaryType": "nt:unstructured",
 				"sling:resourceType": "sling-cms/components/cms/contentactions",

-- 
To stop receiving notification emails like this one, please contact
dklco@apache.org.