Author: adubovsky Date: 2008-07-16 08:14:35 -0400 (Wed, 16 Jul 2008) New Revision: 9631 Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp Log: minor changes in modalPanel and comboBox Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-07-16 11:43:39 UTC (rev 9630) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-07-16 12:14:35 UTC (rev 9631) @@ -44,10 +44,12 @@ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - onselect="#{event.onselect}" + onselect="#{event.onselect}" binding="#{combobox.htmlComboBox}" - align="#{combobox.align}"> - <f:selectItem itemValue="GoshaGoshaGoshaGoshaGosha"/> + align="#{combobox.align}" > + <f:selectItem itemValue="Gosha"/> + <f:selectItem itemValue="DubSer_1"/> + <f:selectItem itemValue="DubSer_2"/> </rich:comboBox> <a4j:commandButton value="reRender" reRender="comboboxID"></a4j:commandButton> Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-07-16 11:43:39 UTC (rev 9630) +++ trunk/test-applications/jsp/src/main/webapp/Combobox/ComboboxProperty.jsp 2008-07-16 12:14:35 UTC (rev 9631) @@ -71,7 +71,7 @@ <br /> <a href="#" id="disableID">disable</a> </f:verbatim> - <rich:componentControl attachTo="showListID" event="onclick" for="comboboxID" operation="showList" params="label:label"></rich:componentControl> + <rich:componentControl attachTo="showListID" event="onclick" for="comboboxID" operation="showList"></rich:componentControl> <rich:componentControl attachTo="hideListID" event="onclick" for="comboboxID" operation="hideList"></rich:componentControl> <rich:componentControl attachTo="enableID" event="onclick" for="comboboxID" operation="enable"></rich:componentControl> <rich:componentControl attachTo="disableID" event="onclick" for="comboboxID" operation="disable"></rich:componentControl> Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-07-16 11:43:39 UTC (rev 9630) +++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-07-16 12:14:35 UTC (rev 9631) @@ -8,13 +8,12 @@ var trs = tbody.getElementsByTagName('TR'); var y = parseInt(height); var x = parseInt(width); - trs[1].innerHTML = 'modalPanel\'s size: ' + x*y + ' px*px'; + trs[1].innerHTML = 'modalPanel\'s size: ' + x + 'x' +y + ' px*px'; return false; } </script> <style> .rich-mpnl-mask-div { - background-color: #fae6b0; } </style> @@ -22,10 +21,6 @@ <f:subview id="modalPanelSubviewID"> - <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();"> - <f:selectItems value="#{richBean.listContainer}" /> - </h:selectOneMenu> - <rich:modalPanel id="modalPanelID" binding="#{modalPanel.htmlModalPanel}" visualOptions="#{modalPanel.visualOptions}" left="#{modalPanel.left}" @@ -48,17 +43,18 @@ onmaskmousemove="#{event.onmaskmousemove}" onmaskmouseout="#{event.onmaskmouseout}" onmaskmouseover="#{event.onmaskmouseover}" - onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" - onresize="#{event.onresize}" onshow="#{event.onshow}"> + onmaskmouseup="#{event.onmaskmouseup}" + onmove="#{event.onmove}" + 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"> @@ -79,11 +75,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" /> @@ -91,151 +83,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> - - <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> + <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> <rich:modalPanel id="modalPanel2ID" - visualOptions="#{modalPanel.visualOptions}" left="#{modalPanel.left}" - top="#{modalPanel.top}" minHeight="#{modalPanel.minHeight}" - minWidth="#{modalPanel.minWidth}" height="550" width="850" - moveable="false" resizeable="false" + 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="#{modalPanel.autosized}" + autosized="true" shadowDepth="#{modalPanel.shadowDepth}" shadowOpacity="#{modalPanel.shadowOpacity}" - showWhenRendered="#{modalPanel.showWhenRendered}" - controlsClass="#{style.controlsClass}" - styleClass="#{style.styleClass}" onhide="#{event.onhide}" - onmaskclick="#{event.onmaskclick}" - onmaskcontextmenu="#{event.onmaskcontextmenu}" - onmaskdblclick="#{event.onmaskdblclick}" - onmaskmousedown="#{event.onmaskmousedown}" - onmaskmousemove="#{event.onmaskmousemove}" - onmaskmouseout="#{event.onmaskmouseout}" - onmaskmouseover="#{event.onmaskmouseover}" - onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" - onresize="#{event.onresize}" onshow="#{event.onshow}"> + showWhenRendered="#{modalPanel.showWhenRendered}" > <br /> <h:inputText value="input"></h:inputText> <br /> - <h:outputLink - onclick="Richfaces.hideModalPanel('modalPanel2ID');return false;" - value="Close"> - <f:verbatim>Close</f:verbatim> - </h:outputLink> - <rich:pickList id="pickListID" value="#{pickList.value}" - showButtonsLabel="#{pickList.showButtonLabels}" - valueChangeListener="#{pickList.valueChangeListener}" - controlClass="#{style.controlClass}" listClass="#{style.listClass}" - style="#{style.style}" styleClass="#{style.styleClass}" - copyAllControlLabel="#{pickList.copyAllControlLabel}" - copyControlLabel="#{pickList.copyControlLabel}" - disabled="#{pickList.copyControlLabel}" - immediate="#{pickList.immediate}" - listsHeight="#{pickList.listsHeight}" - moveControlsVerticalAlign="#{pickList.moveControlsVerticalAlign}" - removeAllControlLabel="#{pickList.removeAllControlLabel}" - removeControlLabel="#{pickList.removeControlLabel}" - rendered="#{pickList.rendered}" - sourceListWidth="#{pickList.sourceListWidth}" - title="#{pickList.title}" switchByClick="#{pickList.switchByClick}" - targetListWidth="#{pickList.targetListWidth}" - required="#{pickList.required}" - requiredMessage="#{pickList.requiredMessage}" - onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" - onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" - onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" - onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" - onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" - binding="#{pickList.myPickList}"> - <f:selectItem itemValue="selectItem" itemLabel="selectItem" /> + <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" /> - <f:selectItems value="#{pickList.data}" /> + </rich:pickList> <br /> <a4j:commandButton reRender="pickListTargetID" value="refresh target"></a4j:commandButton> - <h:dataTable id="pickListTargetID" value="#{pickList.value}" - var="list" border="1"> - <h:column> - <h:outputText value="#{list}"></h:outputText> - </h:column> - </h:dataTable> </rich:modalPanel> - <rich:modalPanel id="_panel" minHeight="100" minWidth="200" - moveable="true"> + <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('_panel');" /> + <h:commandLink value="Close" onclick="Richfaces.hideModalPanel('modalPanel3ID');" /> </f:facet> <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 /> - <a4j:commandLink - onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" - value="show ModalPanel 2"> - </a4j:commandLink> - - <f:verbatim> - <br /> - <br /> - </f:verbatim> - + <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="_panel" operation="show"></rich:componentControl> + <rich:componentControl event="onclick" for="modalPanel3ID" operation="show"></rich:componentControl> </h:graphicImage> - <br /> - <br /> - <h:graphicImage value="/pics/warn.gif"> - </h:graphicImage> - <f:verbatim> - <br /> - <br /> - </f:verbatim> - <div id="idDiv1" - style="position: relative; font-size: 50px; z-index: 2; color: navy"> - z-index1 <rich:componentControl attachTo="idDiv1" event="onclick" - for="modalPanelID" operation="show"></rich:componentControl></div> - <br /> - <div id="idDiv2" - style="position: relative; font-size: 50px; z-index: 2; color: navy"> - z-index2 <rich:componentControl attachTo="idDiv2" event="onclick" - for="modalPanelID" operation="hide"></rich:componentControl></div> + <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/jsp/src/main/webapp/Skinning/Skinning.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-07-16 11:43:39 UTC (rev 9630) +++ trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-07-16 12:14:35 UTC (rev 9631) @@ -58,7 +58,7 @@ <input class="rich-input" value="input" ></input> </rich:column> <rich:column> - <input class="rich-input" value="input" disabled="true" /></input> + <input class="rich-input" value="input" disabled="true" ></input> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -69,10 +69,10 @@ <h:outputText value="#{skinning.inputTextareaStyleClass}" /> </rich:column> <rich:column> - <h:inputTextarea styleClass="#{skinning.inputTextareaStyleClass}" value="#{skinning.inputTextarea}" /> + <%--<h:inputTextarea styleClass="#{skinning.inputTextareaStyleClass}" value="#{skinning.inputTextarea}" />--%> </rich:column> <rich:column> - <h:inputTextarea styleClass="#{skinning.inputTextareaStyleClass}" value="#{skinning.inputTextarea}" disabled="true" /> + <%--<h:inputTextarea styleClass="#{skinning.inputTextareaStyleClass}" value="#{skinning.inputTextarea}" disabled="true" />--%> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -307,7 +307,7 @@ <h:outputText value="rich-isindex" /> </rich:column> <rich:column> - <isindex class="rich-isindex" /> + <isindex class="rich-isindex" prompt="Enter"/> </rich:column> <rich:column> <h:outputText value="components have not disabled state" />