Author: Alex.Kolonitsky Date: 2010-12-09 04:38:14 -0500 (Thu, 09 Dec 2010) New Revision: 20470 Modified: trunk/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSlider/samples/sliders-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tooltip/tooltip.xhtml trunk/ui/input/ui/src/main/config/faces-config.xml trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml Log: RF-9865 - Tooltip: unify component name and other component's attributes Modified: trunk/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java =================================================================== --- trunk/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/examples/input-demo/src/main/java/org/richfaces/demo/InputNumberSliderBean.java 2010-12-09 09:38:14 UTC (rev 20470) @@ -44,7 +44,7 @@ private boolean showArrows = false; private boolean showBoundaryValues = true; private boolean showInput = true; - private boolean showToolTip = true; + private boolean showTooltip = true; private double step = 1; public void setValue(double value) { @@ -131,12 +131,12 @@ this.showInput = showInput; } - public boolean isShowToolTip() { - return showToolTip; + public boolean isShowTooltip() { + return showTooltip; } - public void setShowToolTip(boolean showToolTip) { - this.showToolTip = showToolTip; + public void setShowTooltip(boolean showTooltip) { + this.showTooltip = showTooltip; } public double getStep() { Modified: trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml 2010-12-09 09:38:14 UTC (rev 20470) @@ -46,7 +46,7 @@ disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" inputPosition="#{inputNumberSliderBean.inputPosition}" inputSize="#{inputNumberSliderBean.inputSize}" showArrows="#{inputNumberSliderBean.showArrows}" showBoundaryValues="#{inputNumberSliderBean.showBoundaryValues}" showInput="#{inputNumberSliderBean.showInput}" - showToolTip="#{inputNumberSliderBean.showToolTip}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" + showTooltip="#{inputNumberSliderBean.showTooltip}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" step="#{inputNumberSliderBean.step}" > <f:ajax render="date" /> </ins:inputNumberSlider> @@ -107,8 +107,8 @@ <f:ajax render="ins"/> </h:selectBooleanCheckbox> <br /> - <h:outputText value="ShowToolTip: "/> - <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showToolTip}"> + <h:outputText value="ShowTooltip: "/> + <h:selectBooleanCheckbox value="#{inputNumberSliderBean.showTooltip}"> <f:ajax render="ins"/> </h:selectBooleanCheckbox> <br /> Modified: trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-12-09 09:38:14 UTC (rev 20470) @@ -50,7 +50,7 @@ Tooltip apeared under green rectangle. <pn:tooltip id="tooltip" target="myRectangle" mode="ajax" showDelay="500"> - New ToolTip Yo!!! + New Tooltip Yo!!! </pn:tooltip> </div> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSlider/samples/sliders-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSlider/samples/sliders-sample.xhtml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSlider/samples/sliders-sample.xhtml 2010-12-09 09:38:14 UTC (rev 20470) @@ -14,16 +14,16 @@ <rich:inputNumberSlider value="50" showInput="false" enableManualInput="false" showBoundaryValues="false" - showToolTip="false" /> + showTooltip="false" /> <p>Another variation of input:</p> <rich:inputNumberSlider value="500" width="500" maxValue="1000" - step="50" showArrows="true" showToolTip="false" /> + step="50" showArrows="true" showTooltip="false" /> <p>The same variant but the control disabled:</p> <rich:inputNumberSlider value="500" width="500" maxValue="1000" - step="50" showArrows="true" showToolTip="false" disabled="true" /> + step="50" showArrows="true" showTooltip="false" disabled="true" /> </ui:composition> \ No newline at end of file Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tooltip/tooltip.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tooltip/tooltip.xhtml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tooltip/tooltip.xhtml 2010-12-09 09:38:14 UTC (rev 20470) @@ -5,10 +5,10 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>ToolTip is a small non-modal pop-up that could be used to + <p>Tooltip is a small non-modal pop-up that could be used to display additional information, that is usually hidden.<br /> </p> - <p>Major toolTip features:</p> + <p>Major tooltip features:</p> <ul> <li>Tool-tip content may be <b>pre-rendered</b> on a page (client mode) or <b>loaded on separate Ajax request</b> (ajax mode)</li> Modified: trunk/ui/input/ui/src/main/config/faces-config.xml =================================================================== --- trunk/ui/input/ui/src/main/config/faces-config.xml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/ui/input/ui/src/main/config/faces-config.xml 2010-12-09 09:38:14 UTC (rev 20470) @@ -183,7 +183,7 @@ </property-extension> </property> <property> - <property-name>showToolTip</property-name> + <property-name>showTooltip</property-name> <property-class>boolean</property-class> <default-value>true</default-value> <property-extension> @@ -221,7 +221,7 @@ </property-extension> </property> <property> - <property-name>toolTipClass</property-name> + <property-name>tooltipClass</property-name> <property-class>java.lang.String</property-class> <property-extension> <cdk:generate>true</cdk:generate> Modified: trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-12-09 09:31:55 UTC (rev 20469) +++ trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-12-09 09:38:14 UTC (rev 20470) @@ -65,8 +65,8 @@ </c:if> <xi:include xpointer="xpointer(/*)" href="input.template.inc" /> </c:if> - <c:if test="#{component.attributes['showToolTip']}"> - <span class="rf-insl-tt #{component.attributes['toolTipClass']}">#{getInputValue(facesContext, component)}</span> + <c:if test="#{component.attributes['showTooltip']}"> + <span class="rf-insl-tt #{component.attributes['tooltipClass']}">#{getInputValue(facesContext, component)}</span> </c:if> <!-- TODO Rewrite the next line when the CDK will support normal way to take event handlers from attributes and behaviors. --> <cdk:object name="onchange" type="String" value="#{convertToString(RenderKitUtils.getAttributeAndBehaviorsValue(facesContext, component, RenderKitUtils.attributes().generic('onchange', 'onchange', 'change').first()))}" />