Author: tkuprevich Date: 2009-03-27 06:29:36 -0400 (Fri, 27 Mar 2009) New Revision: 13243 Added: trunk/test-applications/jsp/src/main/webapp/ColorPicker/images/ trunk/test-applications/jsp/src/main/webapp/ColorPicker/images/colorPicker_ico.png Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp Log: Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp 2009-03-27 10:29:04 UTC (rev 13242) +++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp 2009-03-27 10:29:36 UTC (rev 13243) @@ -5,22 +5,49 @@ <f:subview id="colorPickerSubviewID"> <rich:colorPicker binding="#{colorPicker.component}" - colorMode="hex" converter="colorPickerConverter" + colorMode="#{colorPicker.colorMode}" converter="colorPickerConverter" converterMessage="#{colorPicker.converterMessage}" - flat="#{colorPicker.flat}" - id="colorPickerID" immediate="#{colorPicker.immediate}" - localValueSet="#{colorPicker.localValueSet}" - 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}" - rendered="#{colorPicker.rendered}" required="#{colorPicker.required}" + flat="#{colorPicker.flat}" id="colorPickerID" + immediate="#{colorPicker.immediate}" 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}" + rendered="#{colorPicker.rendered and !colorPicker.facets}" + required="#{colorPicker.required}" requiredMessage="#{colorPicker.requiredMessage}" - showEvent="onmouseover" valid="#{colorPicker.valid}" + showEvent="#{colorPicker.showEvent}" validator="#{colorPicker.validate}" validatorMessage="#{colorPicker.validatorMessage}" value="#{colorPicker.value}" valueChangeListener="#{colorPicker.changeValue}"> </rich:colorPicker> + + <rich:colorPicker colorMode="#{colorPicker.colorMode}" flat="#{colorPicker.flat}" + id="colorPickerIDFacets" 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}" + rendered="#{colorPicker.rendered and colorPicker.facets}" + required="#{colorPicker.required}" + requiredMessage="#{colorPicker.requiredMessage}" + showEvent="#{colorPicker.showEvent}" validator="#{colorPicker.validate}" + validatorMessage="#{colorPicker.validatorMessage}" + value="#{colorPicker.facetsValue}" + valueChangeListener="#{colorPicker.changeValue}"> + <f:facet name="icon"> + <h:graphicImage value="/ColorPicker/images/colorPicker_ico.png" + width="18px" height="18px"></h:graphicImage> + </f:facet> + <f:facet name="arrows"> + <h:graphicImage value="/ColorPicker/images/colorPicker_ico.png" + width="30px" height="5px"></h:graphicImage> + </f:facet> + </rich:colorPicker> + + + </f:subview> Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp 2009-03-27 10:29:04 UTC (rev 13242) +++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp 2009-03-27 10:29:36 UTC (rev 13243) @@ -1,4 +1,4 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> @@ -8,53 +8,60 @@ action="#{colorPicker.addColorPicker}"></h:commandButton> <h:panelGrid columns="2"> <h:outputText value="colorMode" /> - <h:selectOneRadio value="#{colorPicker.colorMode}" - onchange="submit"> + <h:selectOneRadio value="#{colorPicker.colorMode}"> <f:selectItem itemLabel="rgb" itemValue="rgb" /> <f:selectItem itemLabel="hex" itemValue="hex" /> </h:selectOneRadio> + <h:outputText value="showEvent: "></h:outputText> + <h:inputText value="#{colorPicker.showEvent}"> + </h:inputText> + <h:outputText value="converterMessage: "></h:outputText> - <h:inputText value="#{colorPicker.converterMessage}" - onchange="submit"></h:inputText> - + <h:inputText value="#{colorPicker.converterMessage}"> + </h:inputText> + <h:outputText value="flat" /> - <h:selectBooleanCheckbox value="#{colorPicker.flat}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.flat}"> + </h:selectBooleanCheckbox> <h:outputText value="immediate" /> - <h:selectBooleanCheckbox value="#{colorPicker.immediate}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.immediate}"> + </h:selectBooleanCheckbox> <h:outputText value="localValueSet" /> - <h:selectBooleanCheckbox value="#{colorPicker.localValueSet}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.localValueSet}"> + </h:selectBooleanCheckbox> <h:outputText value="rendered" /> - <h:selectBooleanCheckbox value="#{colorPicker.rendered}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.rendered}"> + </h:selectBooleanCheckbox> <h:outputText value="required" /> - <h:selectBooleanCheckbox value="#{colorPicker.required}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.required}"> + </h:selectBooleanCheckbox> + <h:outputText value="facets" /> + <h:selectBooleanCheckbox value="#{colorPicker.facets}"> + </h:selectBooleanCheckbox> + <h:outputText value="requiredMessage: "></h:outputText> - <h:inputText value="#{colorPicker.requiredMessage}" - onchange="submit"></h:inputText> + <h:inputText value="#{colorPicker.requiredMessage}"> + </h:inputText> <h:outputText value="valid" /> - <h:selectBooleanCheckbox value="#{colorPicker.valid}" - onclick="submit" /> + <h:selectBooleanCheckbox value="#{colorPicker.valid}"> + </h:selectBooleanCheckbox> <h:outputText value="validatorMessage: "></h:outputText> - <h:inputText value="#{colorPicker.validatorMessage}" - onchange="submit;"></h:inputText> + <h:inputText value="#{colorPicker.validatorMessage}"> + </h:inputText> <h:commandButton actionListener="#{colorPicker.checkBinding}" value="Binding"> <a4j:support event="onclick" reRender="bindLabelID"></a4j:support> </h:commandButton> <h:outputText value="#{colorPicker.bindLabel}" id="bindLabelID" /> - + </h:panelGrid> </f:subview> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/ColorPicker/images/colorPicker_ico.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/jsp/src/main/webapp/ColorPicker/images/colorPicker_ico.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream