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 51fd955  Fixing an issue where the column control did not set the 
container class correctly
51fd955 is described below

commit 51fd955b3443e94ff855a14c613a4ea19121a5a2
Author: Dan Klco <[email protected]>
AuthorDate: Sun Feb 18 19:48:21 2018 -0500

    Fixing an issue where the column control did not set the container class 
correctly
---
 .../reference/components/general/columncontrol/columncontrol.jsp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/cms/ui/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
 
b/cms/ui/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
index bc1bb4b..bae2d5a 100644
--- 
a/cms/ui/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
+++ 
b/cms/ui/src/main/resources/jcr_root/apps/reference/components/general/columncontrol/columncontrol.jsp
@@ -18,13 +18,10 @@
  */ --%>
  <%@include file="/libs/sling-cms/global.jsp"%>
  <c:choose>
-       <c:when test="${properties.container}">
-               <sling:adaptTo var="pageMgr" 
adaptable="${slingRequest.requestPathInfo.suffixResource}" 
adaptTo="org.apache.sling.cms.core.models.PageManager" />
+       <c:when test="${properties.container == true}">
+               <sling:adaptTo var="pageMgr" adaptable="${resource}" 
adaptTo="org.apache.sling.cms.core.models.PageManager" />
                <c:set var="configRsrc" 
value="${pageMgr.page.template.componentConfigs['reference/components/general/columncontrol']}"
 />
-               ${configRsrc}
-               ${configRsrc.valueMap.containerclass}
-               <c:set var="containerClass" 
value="${configRsrc.valueMap.containerclass}" />
-               <div class="${containerClass}">
+               <div class="${configRsrc.valueMap.containerclass}">
                        <div class="row">
                                <c:forEach var="col" 
items="${fn:split(properties.layout,',')}" varStatus="status">
                                        <div 
class="${sling:encode(col,'HTML_ATTR')}">

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to