Author: ishabalov Date: 2007-03-13 16:33:25 -0400 (Tue, 13 Mar 2007) New Revision: 58 Modified: trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java trunk/richfaces/panelbar/src/main/templates/panelBar.jspx trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx Log: Fixing problems with rendering children. Modified: trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-03-13 20:33:25 UTC (rev 58) @@ -59,4 +59,8 @@ public abstract int getZindex(); public abstract void setZindex(int zindex); + + public boolean getRendersChildren() { + return true; + } } Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 20:33:25 UTC (rev 58) @@ -97,7 +97,9 @@ </jsp:scriptlet> <tr> <td class="dr-mpnl-pnl-b rich-mpnl-pnl-b" valign="top"> - <vcp:body /> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> </td> </tr> </table> Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java =================================================================== --- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-13 20:33:25 UTC (rev 58) @@ -42,4 +42,8 @@ public abstract void setWidth(String width); + public boolean getRendersChildren() { + return true; + } + } Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java =================================================================== --- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-03-13 20:33:25 UTC (rev 58) @@ -36,5 +36,9 @@ //XXX by nick - andrew - panelBarItem is an immediate panelBar child, no need to traverse up a lot return (UIPanelBar) getParent(); } + + public boolean getRendersChildren() { + return true; + } } Modified: trunk/richfaces/panelbar/src/main/templates/panelBar.jspx =================================================================== --- trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-03-13 20:33:25 UTC (rev 58) @@ -14,7 +14,9 @@ <f:clientid var="clientId" /> <div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-b #{component.attributes['styleClass']}" style="padding: 0px; #{this:height(context, component)} #{this:width(context, component)} #{component.attributes['style']}"> - <vcp:body/> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> <f:clientid var="clientId" /> <input type="hidden" name="#{clientId}" id="#{clientId}_panelBarInput" value="#{this:expanded(context, component)}"/> Modified: trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx =================================================================== --- trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx 2007-03-13 20:33:25 UTC (rev 58) @@ -23,7 +23,9 @@ <div style="display: none; width: 100%;"> <table cellpadding="0" width="100%" style="height: 100%;"><tbody><tr><td class="dr-pnlbar-c rich-panelbar-content #{component.panel.attributes['contentClass']} #{component.attributes['contentClass']}" style="#{component.panel.attributes['contentStyle']};#{component.attributes['contentStyle']}"> - <vcp:body/> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> </td></tr></tbody></table> </div> </div> Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java =================================================================== --- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-03-13 20:33:25 UTC (rev 58) @@ -62,6 +62,9 @@ public abstract boolean isOpened(); + public boolean getRendersChildren() { + return true; + } public void broadcast(FacesEvent facesEvent) throws AbortProcessingException { FacesContext facesContext = FacesContext.getCurrentInstance(); Modified: trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-03-13 18:35:27 UTC (rev 57) +++ trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-03-13 20:33:25 UTC (rev 58) @@ -108,6 +108,7 @@ <tr> <td class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}"> <vcp:body> + <f:call name="renderChildren" /> </vcp:body> </td> </tr>