You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/05/31 16:47:28 UTC
[sling-whiteboard] branch master updated (d0ae950 -> 149840d)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from d0ae950 Adding a new model and restore operation to support the needs from Sling CMS
new 81e9cfc Adding license to the codeblock script
new 149840d Fixing issues with the tags script
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../components/general/codeblock/codeblock.jsp | 18 ++++++++++++++++++
.../apps/reference/components/general/tags/tags.jsp | 4 ++--
2 files changed, 20 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.
[sling-whiteboard] 02/02: Fixing issues with the tags script
Posted by 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
commit 149840dce01a9934ee0193049d58ef23fa207ea7
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu May 31 12:47:23 2018 -0400
Fixing issues with the tags script
---
.../jcr_root/apps/reference/components/general/tags/tags.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp b/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
index cd0ee3b..47b9dd8 100644
--- a/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
+++ b/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
@@ -20,8 +20,8 @@
<sling:adaptTo adaptable="${resource}" adaptTo="org.apache.sling.cms.core.models.PageManager" var="pageMgr" />
<c:set var="config" value="${pageMgr.page.template.componentConfigs['reference/components/general/tags']}" scope="request" />
<c:set var="contentResource" value="${sling:getRelativeResource(page.resource,'jcr:content')}" />
-<c:set var="listTag" value="${config.listTag}" default="div" />
-<c:set var="itemTag" value="${config.itemTag}" default="span" />
+<c:set var="listTag" value="${empty config.listTag ? 'div' : config.listTag}" />
+<c:set var="itemTag" value="${empty config.listTag ? 'span' : config.itemTag}" />
<${listTag} class="${config.listClass}">
<c:forEach var="tagPath" items="${contentResource.valueMap['keywords']}">
<c:set var="tag" value="${sling:getResource(resourceResolver,tagPath)}" />
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.
[sling-whiteboard] 01/02: Adding license to the codeblock script
Posted by 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
commit 81e9cfca63d99194b983e07e4952e3042ae76ffe
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu May 31 12:47:07 2018 -0400
Adding license to the codeblock script
---
.../components/general/codeblock/codeblock.jsp | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/codeblock/codeblock.jsp b/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/codeblock/codeblock.jsp
index fa9ee15..0383669 100644
--- a/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/codeblock/codeblock.jsp
+++ b/cms/reference/src/main/resources/jcr_root/apps/reference/components/general/codeblock/codeblock.jsp
@@ -1,2 +1,20 @@
+<%-- /*
+ * 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" %>
<pre>${properties.code} </pre>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.