Author: adubovsky Date: 2009-04-08 05:53:10 -0400 (Wed, 08 Apr 2009) New Revision: 13422 Modified: trunk/test-applications/facelets/src/main/resources/util/data/cars.xml trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml Log: Modified: trunk/test-applications/facelets/src/main/resources/util/data/cars.xml =================================================================== --- trunk/test-applications/facelets/src/main/resources/util/data/cars.xml 2009-04-08 09:52:53 UTC (rev 13421) +++ trunk/test-applications/facelets/src/main/resources/util/data/cars.xml 2009-04-08 09:53:10 UTC (rev 13422) @@ -3,7 +3,7 @@ <car> <make>Audi</make> <model>A6</model> - <price>20000</price> + <price>40000</price> </car> <car> <make>Audi</make> @@ -11,11 +11,31 @@ <price>48500</price> </car> <car> + <make>Audi</make> + <model>Q5</model> + <price>36500</price> + </car> + <car> + <make>Audi</make> + <model>Q8</model> + <price>102500</price> + </car> + <car> <make>BMW</make> <model>760Li</model> <price>115400</price> </car> <car> + <make>BMW</make> + <model>330i</model> + <price>38400</price> + </car> + <car> + <make>BMW</make> + <model>X6</model> + <price>55900</price> + </car> + <car> <make>Bentley</make> <model>Arnage</model> <price>240000</price> @@ -36,21 +56,66 @@ <price>854200</price> </car> <car> + <make>Mercedes-Benz</make> + <model>E63AMG</model> + <price>120200</price> + </car> + <car> + <make>Mercedes-Benz</make> + <model>R350</model> + <price>61200</price> + </car> + <car> + <make>Mercedes-Benz</make> + <model>E300D</model> + <price>9800</price> + </car> + <car> <make>Mazda</make> + <model>3</model> + <price>17300</price> + </car> + <car> + <make>Mazda</make> <model>6</model> <price>21300</price> </car> <car> + <make>Mazda</make> + <model>CX7</model> + <price>24300</price> + </car> + <car> <make>Fiat</make> <model>Punto</model> <price>8200</price> </car> <car> + <make>Fiat</make> + <model>Multipla</model> + <price>9100</price> + </car> + <car> <make>Ford</make> <model>GT-40</model> <price>325100</price> </car> <car> + <make>Ford</make> + <model>Mondeo</model> + <price>23100</price> + </car> + <car> + <make>Ford</make> + <model>Fiesta</model> + <price>5100</price> + </car> + <car> + <make>Ford</make> + <model>Scorpio</model> + <price>4800</price> + </car> + <car> <make>Ferrari</make> <model>Enzo</model> <price>950000</price> Modified: trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml 2009-04-08 09:52:53 UTC (rev 13421) +++ trunk/test-applications/facelets/src/main/webapp/Skinning/Skinning.xhtml 2009-04-08 09:53:10 UTC (rev 13422) @@ -1,15 +1,28 @@ -<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="skinningSubviewID"> +<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="skinningSubviewID"> <rich:dataTable columns="4" value=""> <f:facet name="caption"> - <h:outputText value="Standard controls skinning feature provides styling for standard HTML elements so that they become highly compliant with RichFaces look and feel. Skinning can be applied to all page controls based on element name and type attribute (where applicable). Also this feature provides a set of CSS styles so that skinning can be applied by assigning rich-.. classes to particular elements or to container element that nests controls." /> - </f:facet> + <h:outputText + value="Standard controls skinning feature provides styling for standard HTML elements so that they become highly compliant with RichFaces look and feel. Skinning can be applied to all page controls based on element name and type attribute (where applicable). Also this feature provides a set of CSS styles so that skinning can be applied by assigning rich-.. classes to particular elements or to container element that nests controls." /> + </f:facet> <f:facet name="header"> <rich:columnGroup> - <rich:column><h:outputText value="Name of Component" /></rich:column> - <rich:column><h:outputText value="styleClass of Component" /></rich:column> - <rich:column><h:outputText value="Component is enabled" /></rich:column> - <rich:column><h:outputText value="Component is disabled" /></rich:column> - </rich:columnGroup> + <rich:column> + <h:outputText value="Name of Component" /> + </rich:column> + <rich:column> + <h:outputText value="styleClass of Component" /> + </rich:column> + <rich:column> + <h:outputText value="Component is enabled" /> + </rich:column> + <rich:column> + <h:outputText value="Component is disabled" /> + </rich:column> + </rich:columnGroup> </f:facet> <f:facet name="footer"> <h:outputText value="" /> @@ -22,10 +35,12 @@ <h:outputText value="#{skinning.inputTextStyleClass}" /> </rich:column> <rich:column> - <h:inputText styleClass="#{skinning.inputTextStyleClass}" value="#{skinning.inputText}" /> + <h:inputText styleClass="#{skinning.inputTextStyleClass}" + value="#{skinning.inputText}" /> </rich:column> <rich:column> - <h:inputText styleClass="#{skinning.inputTextStyleClass}" value="#{skinning.inputText}" disabled="true"/> + <h:inputText styleClass="#{skinning.inputTextStyleClass}" + value="#{skinning.inputText}" disabled="true" /> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -36,10 +51,12 @@ <h:outputText value="#{skinning.inputSecretStyleClass}" /> </rich:column> <rich:column> - <h:inputSecret styleClass="#{skinning.inputSecretStyleClass}" value="#{skinning.inputSecret}" redisplay="true"/> + <h:inputSecret styleClass="#{skinning.inputSecretStyleClass}" + value="#{skinning.inputSecret}" redisplay="true" /> </rich:column> <rich:column> - <h:inputSecret styleClass="#{skinning.inputSecretStyleClass}" value="#{skinning.inputSecret}" disabled="true" redisplay="true"/> + <h:inputSecret styleClass="#{skinning.inputSecretStyleClass}" + value="#{skinning.inputSecret}" disabled="true" redisplay="true" /> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -50,10 +67,10 @@ <h:outputText value="rich-input" /> </rich:column> <rich:column> - <input class="rich-input" value="input" ></input> + <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> @@ -64,10 +81,12 @@ <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> @@ -78,12 +97,20 @@ <h:outputText value="#{skinning.selectBooleanCheckboxStyleClass}" /> </rich:column> <rich:column> - <h:selectBooleanCheckbox styleClass="#{skinning.selectBooleanCheckboxStyleClass}" value="#{skinning.selectBooleanCheckbox1}" /> - <h:selectBooleanCheckbox styleClass="#{skinning.selectBooleanCheckboxStyleClass}" value="#{skinning.selectBooleanCheckbox2}" /> + <h:selectBooleanCheckbox + styleClass="#{skinning.selectBooleanCheckboxStyleClass}" + value="#{skinning.selectBooleanCheckbox1}" /> + <h:selectBooleanCheckbox + styleClass="#{skinning.selectBooleanCheckboxStyleClass}" + value="#{skinning.selectBooleanCheckbox2}" /> </rich:column> <rich:column> - <h:selectBooleanCheckbox styleClass="#{skinning.selectBooleanCheckboxStyleClass}" value="#{skinning.selectBooleanCheckbox1}" disabled="true"/> - <h:selectBooleanCheckbox styleClass="#{skinning.selectBooleanCheckboxStyleClass}" value="#{skinning.selectBooleanCheckbox2}" disabled="true" /> + <h:selectBooleanCheckbox + styleClass="#{skinning.selectBooleanCheckboxStyleClass}" + value="#{skinning.selectBooleanCheckbox1}" disabled="true" /> + <h:selectBooleanCheckbox + styleClass="#{skinning.selectBooleanCheckboxStyleClass}" + value="#{skinning.selectBooleanCheckbox2}" disabled="true" /> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -94,13 +121,14 @@ <h:outputText value="#{skinning.selectManyCheckbox}" /> </rich:column> <rich:column> - <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}" > - <f:selectItems value="#{skinning.list}"/> + <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyCheckbox> </rich:column> <rich:column> - <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectManyCheckbox styleClass="#{skinning.selectManyCheckbox}" + disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyCheckbox> </rich:column> </rich:columnGroup> @@ -112,13 +140,15 @@ <h:outputText value="#{skinning.selectManyListbox}" /> </rich:column> <rich:column> - <h:selectManyListbox styleClass="#{skinning.selectManyListbox}" style="height: 55px;" > - <f:selectItems value="#{skinning.list}"/> + <h:selectManyListbox styleClass="#{skinning.selectManyListbox}" + style="height: 55px;"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyListbox> </rich:column> <rich:column> - <h:selectManyListbox styleClass="#{skinning.selectManyListbox}" style="height: 55px;" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectManyListbox styleClass="#{skinning.selectManyListbox}" + style="height: 55px;" disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyListbox> </rich:column> </rich:columnGroup> @@ -130,13 +160,15 @@ <h:outputText value="#{skinning.selectManyMenu}" /> </rich:column> <rich:column> - <h:selectManyMenu styleClass="#{skinning.selectManyMenu}" style="height: 55px;" > - <f:selectItems value="#{skinning.list}"/> + <h:selectManyMenu styleClass="#{skinning.selectManyMenu}" + style="height: 55px;"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyMenu> </rich:column> <rich:column> - <h:selectManyMenu styleClass="#{skinning.selectManyMenu}" style="height: 55px;" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectManyMenu styleClass="#{skinning.selectManyMenu}" + style="height: 55px;" disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectManyMenu> </rich:column> </rich:columnGroup> @@ -148,13 +180,15 @@ <h:outputText value="#{skinning.selectOneListbox}" /> </rich:column> <rich:column> - <h:selectOneListbox styleClass="#{skinning.selectOneListbox}" style="height: 55px;" > - <f:selectItems value="#{skinning.list}"/> + <h:selectOneListbox styleClass="#{skinning.selectOneListbox}" + style="height: 55px;"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneListbox> </rich:column> <rich:column> - <h:selectOneListbox styleClass="#{skinning.selectOneListbox}" style="height: 55px;" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectOneListbox styleClass="#{skinning.selectOneListbox}" + style="height: 55px;" disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneListbox> </rich:column> </rich:columnGroup> @@ -166,13 +200,14 @@ <h:outputText value="#{skinning.selectOneMenu}" /> </rich:column> <rich:column> - <h:selectOneMenu styleClass="#{skinning.selectOneMenu}" > - <f:selectItems value="#{skinning.list}"/> + <h:selectOneMenu styleClass="#{skinning.selectOneMenu}"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneMenu> </rich:column> <rich:column> - <h:selectOneMenu styleClass="#{skinning.selectOneMenu}" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectOneMenu styleClass="#{skinning.selectOneMenu}" + disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneMenu> </rich:column> </rich:columnGroup> @@ -184,13 +219,14 @@ <h:outputText value="#{skinning.selectOneRadio}" /> </rich:column> <rich:column> - <h:selectOneRadio styleClass="#{skinning.selectOneRadio}" > - <f:selectItems value="#{skinning.list}"/> + <h:selectOneRadio styleClass="#{skinning.selectOneRadio}"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneRadio> </rich:column> <rich:column> - <h:selectOneRadio styleClass="#{skinning.selectOneRadio}" disabled="true"> - <f:selectItems value="#{skinning.list}"/> + <h:selectOneRadio styleClass="#{skinning.selectOneRadio}" + disabled="true"> + <f:selectItems value="#{skinning.list}" /> </h:selectOneRadio> </rich:column> </rich:columnGroup> @@ -202,10 +238,12 @@ <h:outputText value="#{skinning.commandButton}" /> </rich:column> <rich:column> - <h:commandButton styleClass="#{skinning.commandButton}" value="commandButton" /> + <h:commandButton styleClass="#{skinning.commandButton}" + value="commandButton" /> </rich:column> <rich:column> - <h:commandButton styleClass="#{skinning.commandButton}" value="commandButton" disabled="true" /> + <h:commandButton styleClass="#{skinning.commandButton}" + value="commandButton" disabled="true" /> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -216,10 +254,10 @@ <h:outputText value="rich-button" /> </rich:column> <rich:column> - <button class="rich-button" >button</button> + <button class="rich-button">button</button> </rich:column> <rich:column> - <button class="rich-button" disabled="true" >button</button> + <button class="rich-button" disabled="true">button</button> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -230,10 +268,12 @@ <h:outputText value="#{skinning.commandLink}" /> </rich:column> <rich:column> - <h:commandLink styleClass="#{skinning.commandLink}" value="commandLink" /> + <h:commandLink styleClass="#{skinning.commandLink}" + value="commandLink" /> </rich:column> <rich:column> - <h:commandLink styleClass="#{skinning.commandLink}" value="commandLink" disabled="true" /> + <h:commandLink styleClass="#{skinning.commandLink}" + value="commandLink" disabled="true" /> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -244,10 +284,14 @@ <h:outputText value="#{skinning.outputLink}" /> </rich:column> <rich:column> - <h:outputLink styleClass="#{skinning.outputLink}"><h:outputText value="outputLink" /></h:outputLink> + <h:outputLink styleClass="#{skinning.outputLink}"> + <h:outputText value="outputLink" /> + </h:outputLink> </rich:column> <rich:column> - <h:outputLink styleClass="#{skinning.outputLink}" disabled="true"><h:outputText value="outputLink" /></h:outputLink> + <h:outputLink styleClass="#{skinning.outputLink}" disabled="true"> + <h:outputText value="outputLink" /> + </h:outputLink> </rich:column> </rich:columnGroup> <rich:columnGroup> @@ -258,7 +302,8 @@ <h:outputText value="rich-link" /> </rich:column> <rich:column> - <a href="http://localhost:8081/jsp/pages/Rich/Rich.jsf" class="rich-link" >link</a> + <a href="http://localhost:8081/jsp/pages/Rich/Rich.jsf" + class="rich-link">link</a> </rich:column> <rich:column> <h:outputText value="component has not disabled state" /> @@ -274,6 +319,9 @@ <rich:column> <fieldset class="rich-fieldset"> <legend class="rich-legend">Student</legend> + <input type="checkbox"> The first </input> <br /> + <input type="checkbox"> The second </input> <br /> + <input type="checkbox"> The third </input> </fieldset> </rich:column> <rich:column> @@ -294,6 +342,7 @@ <h:outputText value="components have not disabled state" /> </rich:column> </rich:columnGroup> + <!-- <rich:columnGroup> <rich:column> <h:outputText value="isindex" /> @@ -322,5 +371,6 @@ <keygen disabled="true" class="rich-keygen" /> </rich:column> </rich:columnGroup> +--> </rich:dataTable> </f:subview> \ No newline at end of file