Author: ilya_shaikovsky Date: 2008-03-28 08:10:35 -0400 (Fri, 28 Mar 2008) New Revision: 7359 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/examples/assignTo.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/selectItems.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/examples/sliderUsage.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml Log: after review changes Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/examples/assignTo.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/examples/assignTo.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/examples/assignTo.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -6,7 +6,7 @@ <h:form> <rich:panel> - <a4j:commandButton value="Set Name to Alex" reRender="rep" > + <a4j:commandButton value="Set" reRender="rep" > <a4j:actionparam name="username" value="Alex" assignTo="#{userBean.name}"/> </a4j:commandButton> <rich:spacer width="20" /> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam/usage.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -8,12 +8,6 @@ <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> - <style> - input[type="button"] { - background-color:#{a4jSkin.trimColor}; - } - </style> - <p>a4j:actionparam is a component that combines together the functionality of f:param and ActionListener. Additionally to the f:param, this component allows to assign the value to the property of the manager bean directly using the assignTo attribute. Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -24,10 +24,6 @@ padding:2px; } - .navPanel input[type="button"] { - background-color: #{richSkin.additionalBackgroundColor}; - } - </style> <br/> <h:panelGrid width="100%" columns="2" columnClasses="col1,col2"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/selectItems.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/selectItems.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/selectItems.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -21,7 +21,7 @@ <h:panelGroup style="width:200px;" layout="block"> <rich:inplaceSelect value="#{inplaceComponentsBean.inputValue}" - defaultLabel="Click here to edit" openOnEdit="true" + defaultLabel="Double Click to edit" openOnEdit="true" showControls="true" editEvent="ondblclick" layout="block" viewClass="inplace" changedClass="inplace" changedHoverClass="hover" viewHoverClass="hover"> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/examples/sliderUsage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/examples/sliderUsage.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inputNumberSlider/examples/sliderUsage.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -1,22 +1,23 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> - <a4j:form ajaxSubmit="true"> - <p> - Here is an example of default inputNumberSlider: - </p> - <rich:inputNumberSlider value="50"/> - <p> - Here is "minimalistic" input: - </p> - <rich:inputNumberSlider value="50" showInput="false" enableManualInput="false" showBoundaryValues="false" showToolTip="false"/> - <p> - Another variation of input: - </p> - <rich:inputNumberSlider value="500" width="500" maxValue="1000" step="50" showToolTip="false" /> - </a4j:form> + <p>Here is an example of default inputNumberSlider:</p> + + <rich:inputNumberSlider value="50" /> + + <p>Here is "minimalistic" input:</p> + + <rich:inputNumberSlider value="50" showInput="false" + enableManualInput="false" showBoundaryValues="false" + showToolTip="false" /> + + <p>Another variation of input:</p> + + <rich:inputNumberSlider value="500" width="500" maxValue="1000" + step="50" showToolTip="false" /> + </ui:composition> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2008-03-28 12:04:26 UTC (rev 7358) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2008-03-28 12:10:35 UTC (rev 7359) @@ -1,95 +1,110 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> <style> - .tooltip { - background-color:#{a4jSkin.generalBackgroundColor}; - border-width:1px; - padding:10px; - } - .tooltipData { - font-weight: bold; - } - </style> - +.tooltip { + background-color: #{ + a4jSkin + . + + + + generalBackgroundColor +} + +; +border-width + + + + +:1 +px + + +; +padding + + + + +:10 +px + + +; +} +.tooltipData { + font-weight: bold; +} +</style> + <h:form> - <h:outputText value="This tooltip rendered on server in separate request" id="tt3"> - <rich:toolTip direction="top-right" mode="ajax" verticalOffset="5" zorder="200" styleClass="tooltip" layout="block"> - <f:facet name="defaultContent"> - <strong>Wait...</strong> - </f:facet> - <span>This tooltip content was <strong>rendered</strong> on server </span> - <h:panelGrid columns="2"> - <h:outputText value="tooltips requested:" /> - <h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" /> - <h:outputText value="last request:" /> - <h:outputText value="#{toolTipData.tooltipDate}" styleClass="tooltipData" > - <f:convertDateTime pattern="mm:ss.SSS"/> - </h:outputText> - </h:panelGrid> - </rich:toolTip> - </h:outputText> - <rich:dataTable value="#{toolTipData.vehicles}" width="400" var="vehicle" rowKeyVar="row"> - <rich:column> - <f:facet name="header"> - <h:outputText value="##"/> - </f:facet> - <h:outputText value="#{row+1}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Make"/> - </f:facet> - <h:outputText id="make" value="#{vehicle.make}" > - <rich:toolTip direction="top-right" mode="ajax" showDelay="300" styleClass="tooltip" immediate="true" layout="block"> - <a4j:actionparam name="key" value="#{row}" assignTo="#{toolTipData.currentVehicleIndex}" /> + <rich:dataTable value="#{toolTipData.vehicles}" width="400" + var="vehicle" rowKeyVar="row"> + <rich:column> + <f:facet name="header"> + <h:outputText value="##" /> + </f:facet> + <h:outputText value="#{row+1}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Make" /> + </f:facet> + <a4j:outputPanel layout="block"> + <rich:toolTip direction="top-right" mode="ajax" showDelay="300" + styleClass="tooltip" immediate="true" layout="block"> + <a4j:actionparam name="key" value="#{row}" + assignTo="#{toolTipData.currentVehicleIndex}" /> - <h:panelGrid columns="4"> + <h:panelGrid columns="4"> + <f:facet name="header"> + <h:outputText value="Vehicle details:" /> + </f:facet> + <h:outputText value="make:" /> + <h:outputText value="#{vehicle.make}" styleClass="tooltipData" /> + <h:outputText value="model:" /> + <h:outputText value="#{vehicle.model}" styleClass="tooltipData" /> + <h:outputText value="year:" /> + <h:outputText value="#{vehicle.year}" styleClass="tooltipData" /> + <h:outputText value="milage:" /> + <h:outputText value="#{vehicle.milage}" styleClass="tooltipData" /> + <h:outputText value="zip:" /> + <h:outputText value="#{vehicle.zip}" styleClass="tooltipData" /> + <h:outputText value="listed:" /> + <h:outputText value="#{vehicle.listed}" styleClass="tooltipData"> + <f:convertDateTime dateStyle="short" /> + </h:outputText> + <f:facet name="footer"> + <h:panelGroup> + <h:outputText value="vin: " /> + <h:outputText value="#{vehicle.vin}" styleClass="tooltipData" /> + </h:panelGroup> + </f:facet> + + </h:panelGrid> + </rich:toolTip> + <h:outputText id="make" value="#{vehicle.make}"/> + </a4j:outputPanel> + </rich:column> + <rich:column> <f:facet name="header"> - <h:outputText value="Vehicle details:" /> + <h:outputText value="Model" /> </f:facet> - <h:outputText value="make:" /> - <h:outputText value="#{vehicle.make}" styleClass="tooltipData" /> - <h:outputText value="model:" /> - <h:outputText value="#{vehicle.model}" styleClass="tooltipData" /> - <h:outputText value="year:" /> - <h:outputText value="#{vehicle.year}" styleClass="tooltipData" /> - <h:outputText value="milage:" /> - <h:outputText value="#{vehicle.milage}" styleClass="tooltipData" /> - <h:outputText value="zip:" /> - <h:outputText value="#{vehicle.zip}" styleClass="tooltipData" /> - <h:outputText value="listed:" /> - <h:outputText value="#{vehicle.listed}" styleClass="tooltipData" > - <f:convertDateTime dateStyle="short"/> - </h:outputText> - <f:facet name="footer"> - <h:panelGroup> - <h:outputText value="vin: " /> - <h:outputText value="#{vehicle.vin}" styleClass="tooltipData" /> - </h:panelGroup> + <h:outputText value="#{vehicle.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Year" /> </f:facet> - - </h:panelGrid> - </rich:toolTip> - </h:outputText> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model"/> - </f:facet> - <h:outputText value="#{vehicle.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Year"/> - </f:facet> - <h:outputText value="#{vehicle.year}" /> - </rich:column> - </rich:dataTable> + <h:outputText value="#{vehicle.year}" /> + </rich:column> + </rich:dataTable> </h:form>