Author: adubovsky Date: 2008-07-16 08:15:47 -0400 (Wed, 16 Jul 2008) New Revision: 9632 Modified: trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java trunk/test-applications/facelets/src/main/java/util/style/Style.java trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml Log: 1. Minor changes in comboBox and modalPanel 2. Fixed bug in Safari (deleted DOCTYPE from page) Modified: trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java =================================================================== --- trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/java/modalPanel/ModalPanel.java 2008-07-16 12:15:47 UTC (rev 9632) @@ -1,11 +1,13 @@ package modalPanel; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; + import org.richfaces.component.html.HtmlModalPanel; import util.componentInfo.ComponentInfo; public class ModalPanel { - private String id; private boolean autosized; private boolean keepVisualState; private String left; @@ -23,23 +25,19 @@ private boolean resizeable; private String inputTextTest; private String selectOneListboxTest; - private HtmlModalPanel htmlModalPanel = null; + private String visualOptions; + private String bindLabel; + private HtmlModalPanel htmlModalPanel; - public HtmlModalPanel getHtmlModalPanel() { - return htmlModalPanel; + public String getVisualOptions() { + return visualOptions; } - public void setHtmlModalPanel(HtmlModalPanel htmlModalPanel) { - this.htmlModalPanel = htmlModalPanel; + public void setVisualOptions(String visualOptions) { + this.visualOptions = visualOptions; } - - public String add(){ - ComponentInfo info = ComponentInfo.getInstance(); - info.addField(htmlModalPanel); - return null; - } - + public String getInputTextTest() { return inputTextTest; } @@ -57,6 +55,7 @@ } public ModalPanel() { + this.visualOptions = ""; this.inputTextTest = "text"; this.selectOneListboxTest = "1"; this.minHeight = 100; @@ -67,15 +66,22 @@ this.resizeable=true; this.autosized = false; this.keepVisualState = false; - this.left = "100"; - this.top = "100"; + this.left = "auto"; + this.top = "auto"; this.rendered = true; this.shadowDepth = "3"; this.shadowOpacity = "3"; this.zindex = 3; this.showWhenRendered = false; + this.bindLabel = "not ready"; + this.htmlModalPanel = null; } - + + public void checkBinding(ActionEvent actionEvent){ + FacesContext context = FacesContext.getCurrentInstance(); + bindLabel = htmlModalPanel.getClientId(context); + } + public int getHeight() { return height; } @@ -242,11 +248,24 @@ this.zindex = zindex; } - public String getId() { - return id; + public String getBindLabel() { + return bindLabel; } - public void setId(String id) { - this.id = id; + public void setBindLabel(String bindLabel) { + this.bindLabel = bindLabel; } + + public HtmlModalPanel getHtmlModalPanel() { + return htmlModalPanel; + } + + public void setHtmlModalPanel(HtmlModalPanel myModalPanel) { + this.htmlModalPanel = myModalPanel; + } + + public void addHtmlModalPanel(){ + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(htmlModalPanel); + } } Modified: trunk/test-applications/facelets/src/main/java/util/style/Style.java =================================================================== --- trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-16 12:15:47 UTC (rev 9632) @@ -76,6 +76,7 @@ private String columnClassesA; private String footerClassA; private String headerClassA; + private String controlsClass; public Style() { style = "style"; @@ -150,6 +151,7 @@ columnClassesA = "columnClassesA"; footerClassA = "footerClassA"; headerClassA = "headerClassA"; + controlsClass = "controlsClass"; } public String getStyle() { @@ -735,4 +737,12 @@ public void setContentStyle(String contentStyle) { this.contentStyle = contentStyle; } + + public String getControlsClass() { + return controlsClass; + } + + public void setControlsClass(String controlsClass) { + this.controlsClass = controlsClass; + } } Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/Combobox/ComboboxProperty.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -1,21 +1,16 @@ - - - - - <f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="comboboxPropertySubviewID"> + <h:commandButton action="#{combobox.add}" value="add test" /> <h:panelGrid columns="2"> <h:outputText value="defaultLabel"></h:outputText> <h:inputText value="#{combobox.defaultLabel}" onchange="submit();"></h:inputText> <h:outputText value="filterNewValues"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.filterNewValues}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.filterNewValues}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="tabindex"></h:outputText> <h:inputText value="#{combobox.tabindex}" onchange="submit();"></h:inputText> @@ -30,59 +25,43 @@ <h:inputText value="#{combobox.listWidth}" onchange="submit();"></h:inputText> <h:outputText value="enableManualInput"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.enableManualInput}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.enableManualInput}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="selectFirstOnUpdate"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.selectFirstOnUpdate}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.selectFirstOnUpdate}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="directInputSuggestions"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.directInputSuggestions}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.directInputSuggestions}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="disabled"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.disabled}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.disabled}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.rendered}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.rendered}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="immediate"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.immediate}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.immediate}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="required"></h:outputText> - <h:selectBooleanCheckbox value="#{combobox.required}" - onchange="submit();"></h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{combobox.required}" onchange="submit();"></h:selectBooleanCheckbox> <h:outputText value="requiredMessage"></h:outputText> <h:inputText value="#{combobox.requiredMessage}" onchange="submit();"></h:inputText> - <h:commandButton actionListener="#{combobox.checkBinding}" - value="Binding"></h:commandButton> + <h:commandButton actionListener="#{combobox.checkBinding}" value="Binding"></h:commandButton> <h:outputText value="#{combobox.bindLabel}"></h:outputText> <h:outputText value="align"></h:outputText> <h:inputText value="#{combobox.align}" onchange="submit();"></h:inputText> </h:panelGrid> - <a4j:commandLink - onclick="$('formID:comboboxSubviewID:comboboxID').component.showList()" - value="showList"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:comboboxSubviewID:comboboxID').component.showList()" value="showList"></a4j:commandLink> <br /> - <a4j:commandLink - onclick="$('formID:comboboxSubviewID:comboboxID').component.hideList()" - value="hideList"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:comboboxSubviewID:comboboxID').component.hideList()" value="hideList"></a4j:commandLink> <br /> - <a4j:commandLink - onclick="$('formID:comboboxSubviewID:comboboxID').component.enable()" - value="enable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:comboboxSubviewID:comboboxID').component.enable()" value="enable"></a4j:commandLink> <br /> - <a4j:commandLink - onclick="$('formID:comboboxSubviewID:comboboxID').component.disable()" - value="disable"></a4j:commandLink> + <a4j:commandLink onclick="$('formID:comboboxSubviewID:comboboxID').component.disable()" value="disable"></a4j:commandLink> <br /> <br /> <div style="FONT-WEIGHT: bold;">rich:findComponent</div> @@ -91,8 +70,7 @@ <a4j:commandLink value="getValue" reRender="findID"></a4j:commandLink> </rich:column> <rich:column id="findID"> - <h:outputText - value="#{rich:findComponent('comboboxID').value}" /> + <!--<h:outputText value="#{rich:findComponent('comboboxID').value}" />--> </rich:column> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -83,7 +83,7 @@ <a4j:commandLink value="getRendererType" reRender="findID"></a4j:commandLink> </rich:column> <rich:column id="findID"> - <h:outputText value="#{rich:findComponent('hotKeyID').rendererType}" /> + <!--<h:outputText value="#{rich:findComponent('hotKeyID').rendererType}" />--> </rich:column> </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -5,21 +5,21 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID"> + <script type="text/javascript"> function multiply(height,width){ - var tbody = document.getElementById('tbodyID'); - var trs = tbody.getElementsByTagName('TR'); - var y = parseInt(height); - var x = parseInt(width); - trs[1].innerHTML = 'modalPanel\'s size: ' + x*y + ' px*px'; - return false; - } -</script> - <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}" /> - </h:selectOneMenu> + var tbody = document.getElementById('tbodyID'); + var trs = tbody.getElementsByTagName('TR'); + var y = parseInt(height); + var x = parseInt(width); + trs[1].innerHTML = 'modalPanel\'s size: ' + x + 'x' +y + ' px*px'; + return false; + } + </script> - <rich:modalPanel id="modalPanelID" left="#{modalPanel.left}" + <rich:modalPanel id="modalPanelID" + binding="#{modalPanel.htmlModalPanel}" + visualOptions="#{modalPanel.visualOptions}" left="#{modalPanel.left}" top="#{modalPanel.top}" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" @@ -30,6 +30,7 @@ shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}" showWhenRendered="#{modalPanel.showWhenRendered}" + controlsClass="#{style.controlsClass}" headerClass="#{style.headerClass}" styleClass="#{style.styleClass}" onhide="#{event.onhide}" onmaskclick="#{event.onmaskclick}" onmaskcontextmenu="#{event.onmaskcontextmenu}" @@ -39,27 +40,29 @@ onmaskmouseout="#{event.onmaskmouseout}" onmaskmouseover="#{event.onmaskmouseover}" onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" - onresize="#{event.onresize}" onshow="#{event.onshow}" binding="#{modalPanel.htmlModalPanel}"> + onresize="#{event.onresize}" onshow="#{event.onshow}" + onbeforehide="#{event.onbeforehide}" + onbeforeshow="#{event.onbeforeshow}" > <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" - onclick="Richfaces.hideModalPanel('modalPanelID');return false;" /> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('modalPanelID'); return false;" /> </f:facet> - <br /> - <br /> + <div style="FONT-WEIGHT: bold;">rich:findComponent</div> <h:panelGrid columns="2" id="findComponentID"> - <tbody id="tbodyID"> - <tr> - <td><a4j:commandLink value="getSize" reRender="findID" - onclick="javascript:multiply(#{rich:findComponent('modalPanelID').height},#{rich:findComponent('modalPanelID').width});"></a4j:commandLink> - </td> - </tr> - <tr> - <td><h:outputText /></td> - </tr> + <tbody id="tbodyID"> + <tr> + <td> + <a4j:commandLink value="getSize" reRender="findID" onclick="javascript:multiply(#('formID:modalPanelSubviewID:modalPanelID').component.height},#('formID:modalPanelSubviewID:modalPanelID').component.width});"></a4j:commandLink> + </td> + </tr> + <tr> + <td> + <h:outputText/> + </td> + </tr> </tbody> </h:panelGrid> <br /> @@ -67,12 +70,7 @@ <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> <f:selectItems value="#{richBean.listContainer}" /> </h:selectOneMenu> - - <applet code="ArcTest.class" width="400" height="400" - codebase="http://java.sun.com/applets/jdk/1.4/demo/applets/ArcTest/&... - alt="Your browser understands the &lt;APPLET&gt; tag but isn't running the applet, for some reason."> - - Your browser is completely ignoring the &lt;APPLET&gt; tag! </applet> + <h:inputText value="#{modalPanel.inputTextTest}" /> <h:selectOneListbox value="#{modalPanel.selectOneListboxTest}"> <f:selectItem itemLabel="1" itemValue="1" /> @@ -80,104 +78,62 @@ <f:selectItem itemLabel="3" itemValue="3" /> </h:selectOneListbox> - <f:verbatim> - <br /> - <br /> - </f:verbatim> + <f:verbatim><br /><br /></f:verbatim> <rich:spacer width="20" height="20"></rich:spacer> + <a4j:commandButton value="submit" onclick="submit"></a4j:commandButton> - <h:outputLink value="http://www.jboss.com/"> - <f:verbatim>Link</f:verbatim> - </h:outputLink> + <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:v... + <f:verbatim><br /><br /></f:verbatim> + <a4j:commandLink onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" value="show ModalPanel 2"></a4j:commandLink> + <f:verbatim><br /><br /></f:verbatim> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" ><f:verbatim>Close</f:verbatim></h:outputLink> + </rich:modalPanel> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - - <a4j:commandLink - onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" - value="show ModalPanel 2"> - </a4j:commandLink> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - <h:outputLink - onclick="Richfaces.hideModalPanel('modalPanelID');return false;" - value="Close"> - <f:verbatim>Close</f:verbatim> - </h:outputLink> - + <rich:modalPanel id="modalPanel2ID" + visualOptions="#{modalPanel.visualOptions}" + left="#{modalPanel.left}" top="#{modalPanel.top}" + minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" + moveable="true" resizeable="false" + keepVisualState="#{modalPanel.keepVisualState}" + rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}" + autosized="true" + shadowDepth="#{modalPanel.shadowDepth}" + shadowOpacity="#{modalPanel.shadowOpacity}" + showWhenRendered="#{modalPanel.showWhenRendered}" > + <br /> + <h:inputText value="input"></h:inputText> + <br /> + <h:outputLink onclick="Richfaces.hideModalPanel('modalPanel2ID');return false;" ><f:verbatim>Close</f:verbatim></h:outputLink> + <rich:pickList id="pickListID" > + <f:selectItem itemValue="selectItem 0" itemLabel="selectItem 0" /> + <f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" /> + <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" /> + + </rich:pickList> + <br /> + <a4j:commandButton reRender="pickListTargetID" value="refresh target"></a4j:commandButton> </rich:modalPanel> - <rich:modalPanel id="modalPanelID2"> + <rich:modalPanel id="modalPanel3ID" minHeight="100" minWidth="200" moveable="true"> + <f:facet name="header"> + <h:outputText value="Events..." /> + </f:facet> <f:facet name="controls"> - <h:graphicImage value="/pics/error.gif" - onclick="Richfaces.hideModalPanel('modalPanelID2');return false;" /> - - <a4j:commandLink action="#" - oncomplete="Richfaces.hideModalPanel('modalPanelID2')" - value="close" /> - + <h:commandLink value="Close" onclick="Richfaces.hideModalPanel('modalPanel3ID');" /> </f:facet> - <h:inputText value="#{sb.property}" id="text" /> - <rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue" - ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}" - rendered="#{sb.rendered}" requestDelay="#{sb.requestDelay}" - selfRendered="#{sb.selfRendered}" value="#{sb.value}" for="text" - var="result" fetchValue="#{result.text}" - suggestionAction="#{sb.autocomplete}" width="#{sb.width}" - height="#{sb.height}" border="#{sb.border}" zindex="#{sb.zindex}" - rules="#{sb.rules}" cellpadding="#{sb.cellpadding}" - cellspacing="#{sb.cellspacing}" first="#{sb.first}" - minChars="#{sb.minchars}" tokens="#{sb.tokens}" - bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" - summary="summary" shadowOpacity="#{sb.shadowOpacity}" - shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" - frequency="#{sb.frequency}" nothingLabel="nothingLabel work! " - entryClass="#{style.entryClass}" popupClass="#{style.popupClass}" - popupStyle="#{style.popupStyle}" style="#{style.style}" - styleClass="#{style.styleClass}" - selectedClass="#{style.selectedClass}" - rowClasses="#{style.rowClasses}" oncomplete="#{event.oncomplete}" - onselect="#{event.onselect}" - onbeforedomupdate="#{event.onbeforedomupdate}" - onsubmit="#{event.onsubmit}"> - <h:column> - <h:outputText value="#{result.city}" /> - </h:column> - <h:column> - <h:outputText value="#{result.contry}" /> - </h:column> - <h:column> - <h:outputText value="#{result.flag}" /> - </h:column> - <h:column> - <h:outputLink value="http://www.jboss.com/"> - <f:verbatim>Link</f:verbatim> - </h:outputLink> - </h:column> - </rich:suggestionbox> + + <h:outputText value="Eventsaaaaaaaaaaaaaaaa ..." /> + <rich:calendar popup="true" /> </rich:modalPanel> - <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show - MP</a> + <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">show ModalPanel 1</a> <br /> - <a onclick="Richfaces.showModalPanel('modalPanelID2');" href="#">Show - MP2</a> - - <f:verbatim> - <br /> - <br /> - </f:verbatim> - - <h:graphicImage value="/pics/info.gif" - onclick="Richfaces.showModalPanel('modalPanelID');" /> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - <div - style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> - + <a4j:commandLink onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" value="show ModalPanel 2"></a4j:commandLink> + <f:verbatim><br /></f:verbatim> + <h:outputText value="click on image for open Modal Panel 3" /> + <h:graphicImage value="/pics/info.gif"> + <rich:componentControl event="onclick" for="modalPanel3ID" operation="show"></rich:componentControl> + </h:graphicImage> + <f:verbatim><br /><br /></f:verbatim> + <div id="idDiv1" style="position: relative; font-size: 50px; z-index: 2; color: navy" >z-index1</div> + <div id="idDiv2" style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index2</div> </f:subview> Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -1,82 +1,86 @@ <f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="ModalPanelPropertySubviewID"> -<h:commandButton action="#{modalPanel.add}" value="add test" /> - <h:panelGrid columns="2"> - <h:outputText value="shadowDepth" /> - <h:inputText value="#{modalPanel.shadowDepth}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> - - <h:outputText value="shadowOpacity" /> - <h:inputText value="#{modalPanel.shadowOpacity}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> +<h:commandButton value="add test" action="#{modalPanel.addHtmlModalPanel}"></h:commandButton> + <h:panelGrid columns="2"> + <h:outputText value="visualOptions"></h:outputText> + <h:inputText value="#{modalPanel.visualOptions}" onchange="submit();"></h:inputText> - <h:outputText value="keepVisualState" /> - <h:selectBooleanCheckbox value="#{modalPanel.keepVisualState}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:selectBooleanCheckbox> + <h:outputText value="shadowDepth" /> + <h:inputText value="#{modalPanel.shadowDepth}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> - <h:outputText value="left" /> - <h:inputText value="#{modalPanel.left}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> - - <h:outputText value="top" /> - <h:inputText value="#{modalPanel.top}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> - - <h:outputText value="rendered" /> - <h:selectBooleanCheckbox value="#{modalPanel.rendered}" onchange="submit();"> - </h:selectBooleanCheckbox> - - <h:outputText value="showWhenRendered" /> - <h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}" > - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="zindex" /> - <h:selectOneRadio value="#{modalPanel.zindex}"> - <f:selectItem itemLabel="1" itemValue="1" /> - <f:selectItem itemLabel="3" itemValue="3" /> - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Width:" /> - <h:inputText value="#{modalPanel.width}"> - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> + <h:outputText value="shadowOpacity" /> + <h:inputText value="#{modalPanel.shadowOpacity}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> - <h:outputText value="Height:" /> - <h:inputText value="#{modalPanel.height}"> - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> + <h:outputText value="keepVisualState" /> + <h:selectBooleanCheckbox value="#{modalPanel.keepVisualState}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:selectBooleanCheckbox> - <h:outputText value="minWidth:" /> - <h:inputText value="#{modalPanel.minWidth}"> - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> + <h:outputText value="left" /> + <h:inputText value="#{modalPanel.left}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> - <h:outputText value="minHeight:" /> - <h:inputText value="#{modalPanel.minHeight}"> - <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> - </h:inputText> - - <h:outputText value="autosized:" /> - <h:selectBooleanCheckbox value="#{modalPanel.autosized}" onchange="submit();"> - </h:selectBooleanCheckbox> + <h:outputText value="top" /> + <h:inputText value="#{modalPanel.top}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> - <h:outputText value="resizeable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.resizeable}" onchange="submit();"> - </h:selectBooleanCheckbox> + <h:outputText value="rendered" /> + <h:selectBooleanCheckbox value="#{modalPanel.rendered}" + onchange="submit();"> - <h:outputText value="Moveable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> - <a4j:support event="onclick" reRender="modalPanelID"></a4j:support> - </h:selectBooleanCheckbox> - - <a4j:commandLink onclick="$('formID:ModalPanelPropertySubviewID:modalPanelID').component.show(event)" value="show"></a4j:commandLink> - <a4j:commandLink onclick="$('formID:ModalPanelPropertySubviewID:modalPanelID').component.hide(event)" value="hide"></a4j:commandLink> - </h:panelGrid> + </h:selectBooleanCheckbox> + + <h:outputText value="showWhenRendered" /> + <h:selectBooleanCheckbox value="#{modalPanel.showWhenRendered}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="zindex" /> + <h:selectOneRadio value="#{modalPanel.zindex}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="3" /> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Width:" /> + <h:inputText value="#{modalPanel.width}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> + + <h:outputText value="Height:" /> + <h:inputText value="#{modalPanel.height}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> + + <h:outputText value="minWidth:" /> + <h:inputText value="#{modalPanel.minWidth}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> + + <h:outputText value="minHeight:" /> + <h:inputText value="#{modalPanel.minHeight}"> + <a4j:support event="onchange" reRender="modalPanelID"></a4j:support> + </h:inputText> + + <h:outputText value="autosized:" /> + <h:selectBooleanCheckbox value="#{modalPanel.autosized}" + onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="resizeable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.resizeable}" + onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="Moveable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> + <a4j:support event="onclick" reRender="modalPanelID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> </f:subview> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -1,4 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" Modified: trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-07-16 12:14:35 UTC (rev 9631) +++ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2008-07-16 12:15:47 UTC (rev 9632) @@ -28,8 +28,29 @@ </head> <body> <h:form id="formID"> - <div id="divOpthID" align="right" style="z-index: 200"><ui:include - src="/pages/RichMenu/RichMenu.xhtml" /></div> + <div id="divOpthID" align="right" style="z-index: 200"><ui:include src="/pages/RichMenu/RichMenu.xhtml" /></div> + + <rich:messages id="richMessagesID" ajaxRendered="true" showSummary="true"> + <f:facet name="errorMarker"> + <h:graphicImage url="/pics/error.gif" /> + </f:facet> + + <f:facet name="fatalMarker"> + <h:graphicImage url="/pics/fatal.gif" /> + </f:facet> + + <f:facet name="infoMarker"> + <h:graphicImage url="/pics/info.gif" /> + </f:facet> + + <f:facet name="warnMarker"> + <h:graphicImage url="/pics/warn.gif" /> + </f:facet> + + <f:facet name="passedMarker"> + <h:graphicImage url="/pics/passed.gif" /> + </f:facet> + </rich:messages> <h:messages showDetail="true" showSummary="true"></h:messages> <h:panelGrid id="richGridID" columns="1" width="100%">