Author: konstantin.mishin
Date: 2010-09-22 09:22:14 -0400 (Wed, 22 Sep 2010)
New Revision: 19315
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js
trunk/ui/input/ui/src/main/templates/input.template.inc
trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml
Log:
RF-9302
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-09-22
12:14:30 UTC (rev 19314)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-09-22
13:22:14 UTC (rev 19315)
@@ -19,31 +19,31 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-.rf-ins, .rf-ins-ta {
+.rf-insl, .rf-insl-trc-cntr {
display: inline-block;
}
-.rf-ins {
+.rf-insl {
white-space: nowrap;
}
-.rf-ins-ta {
+.rf-insl-trc-cntr {
width: 200px; /*TODO remove it*/
vertical-align: top;
}
-.rf-ins-mn, .rf-ins-mx, input.rf-ins-i, .rf-ins-tt {
+.rf-insl-mn, .rf-insl-mx, input.rf-insl-inp, .rf-insl-tt {
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
color: '#{richSkin.generalTextColor}';
}
-.rf-ins-mn, .rf-ins-mx {
+.rf-insl-mn, .rf-insl-mx {
display: block;
margin-bottom: 3px;
}
-.rf-ins-mn {
+.rf-insl-mn {
border-left-width: 1px;
border-left-style: solid;
border-left-color: '#{richSkin.panelBorderColor}';
@@ -51,7 +51,7 @@
float: left;
}
-.rf-ins-mx {
+.rf-insl-mx {
border-right-width: 1px;
border-right-style: solid;
border-right-color: '#{richSkin.panelBorderColor}';
@@ -60,12 +60,12 @@
text-align: right;
}
-.rf-ins-ci {
+.rf-insl-inp-cntr {
margin: 0px;
vertical-align: bottom;
}
-input.rf-ins-i {
+input.rf-insl-inp {
background:
url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}")
top repeat-x;
background-color: '#{richSkin.controlBackgroundColor}';
border-width: 1px;
@@ -75,7 +75,7 @@
vertical-align: bottom;
}
-.rf-ins-tt {
+.rf-insl-tt {
position: absolute;
display: none;
/* TODO padding: 2px;
@@ -83,7 +83,7 @@
background-color: '#{richSkin.tipBackgroundColor}';*/
}
-.rf-ins-t {
+.rf-insl-trc {
background:
url("#{resource['org.richfaces.images:insldrTrackGrad.png']}") 1px 1px
repeat-x;
background-color: '#{richSkin.controlBackgroundColor}';
border-width: 1px;
@@ -97,53 +97,53 @@
font-size: 0px;
}
-.rf-ins-h, .rf-ins-h-d, .rf-ins-db, .rf-ins-ib, .rf-ins-db-d, .rf-ins-ib-d {
+.rf-insl-hnd, .rf-insl-hnd-dis, .rf-insl-dec, .rf-insl-inc, .rf-insl-dec-dis,
.rf-insl-inc-dis {
display: inline-block;
width: 7px;
height: 7px;
}
-.rf-ins-h, .rf-ins-h-d {
+.rf-insl-hnd, .rf-insl-hnd-dis {
vertical-align: top;
}
-.rf-ins-db, .rf-ins-ib, .rf-ins-db-d, .rf-ins-ib-d {
+.rf-insl-dec, .rf-insl-inc, .rf-insl-dec-dis, .rf-insl-inc-dis {
vertical-align: bottom;
}
-.rf-ins-h {
+.rf-insl-hnd {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderArrowBottom']}");
}
-.rf-ins-h-s {
+.rf-insl-hnd-sel {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowBottom']}");
}
-.rf-ins-h-d {
+.rf-insl-hnd-dis {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowBottom']}");
}
-.rf-ins-db {
+.rf-insl-dec {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderArrowLeft']}");
}
-.rf-ins-db-s {
+.rf-insl-dec-sel {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowLeft']}");
}
-.rf-ins-db-d {
+.rf-insl-dec-dis {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowLeft']}");
}
-.rf-ins-ib {
+.rf-insl-inc {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderArrowRight']}");
}
-.rf-ins-ib-s {
+.rf-insl-inc-sel {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderSelectedArrowRight']}");
}
-.rf-ins-ib-d {
+.rf-insl-inc-dis {
background-image:
url("#{resource['org.richfaces.renderkit.html.images.SliderDisabledArrowRight']}");
}
\ No newline at end of file
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-09-22
12:14:30 UTC (rev 19314)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-09-22
13:22:14 UTC (rev 19315)
@@ -32,25 +32,25 @@
step: 1,
tabIndex: 0,
- decreaseSelectedClass: "rf-ins-db-s",
- handleSelectedClass: "rf-ins-h-s",
- increaseSelectedClass: "rf-ins-ib-s",
+ decreaseSelectedClass: "rf-insl-dec-sel",
+ handleSelectedClass: "rf-insl-hnd-sel",
+ increaseSelectedClass: "rf-insl-inc-sel",
init: function (id, options, selectedClasses) {
jQuery.extend(this, options);
this.range = this.maxValue - this.minValue;
this.id = id;
this.element = jQuery(this.attachToDom());
- this.input =
this.element.children(".rf-ins-ci").children(".rf-ins-i");
- this.track =
this.element.children(".rf-ins-ta").children(".rf-ins-t");
- this.handle = this.track.children(".rf-ins-h, .rf-ins-h-d");
- this.tooltip = this.element.children(".rf-ins-tt");
+ this.input =
this.element.children(".rf-insl-inp-cntr").children(".rf-insl-inp");
+ this.track =
this.element.children(".rf-insl-trc-cntr").children(".rf-insl-trc");
+ this.handle = this.track.children(".rf-insl-hnd, .rf-insl-hnd-dis");
+ this.tooltip = this.element.children(".rf-insl-tt");
this.__inputHandler();
if (!this.disabled) {
- this.decreaseButton = this.element.children(".rf-ins-db");
- this.increaseButton = this.element.children(".rf-ins-ib");
+ this.decreaseButton = this.element.children(".rf-insl-dec");
+ this.increaseButton = this.element.children(".rf-insl-inc");
this.track[0].tabIndex = this.tabIndex;
Modified: trunk/ui/input/ui/src/main/templates/input.template.inc
===================================================================
--- trunk/ui/input/ui/src/main/templates/input.template.inc 2010-09-22 12:14:30 UTC (rev
19314)
+++ trunk/ui/input/ui/src/main/templates/input.template.inc 2010-09-22 13:22:14 UTC (rev
19315)
@@ -22,9 +22,9 @@
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site:
http://www.fsf.org.
-->
-<span class="rf-ins-ci">
+<span class="rf-insl-inp-cntr">
<input
xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
name="#{clientId}" type="text"
- class="rf-ins-i #{component.attributes['inputClass']}"
value="#{getInputValue(facesContext, component)}"
+ class="rf-insl-inp #{component.attributes['inputClass']}"
value="#{getInputValue(facesContext, component)}"
cdk:passThrough="accesskey disabled maxlength size:inputSize tabindex"
readonly="#{!component.attributes['enableManualInput']}"
style="#{component.attributes['showInput'] ? null : 'display:
none;'}" />
</span>
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-09-22
12:14:30 UTC (rev 19314)
+++ trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-09-22
13:22:14 UTC (rev 19315)
@@ -37,7 +37,7 @@
<cdk:resource-dependency library="org.richfaces"
name="inputNumberSlider.js" />
</cc:interface>
<cc:implementation>
- <span id="#{clientId}" class="rf-ins
#{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id
class">
+ <span id="#{clientId}" class="rf-insl
#{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id
class">
<c:if test="#{isInputPosition(component, 'left') ||
isInputPosition(component, 'top')}">
<xi:include xpointer="xpointer(/*)" href="input.template.inc"
/>
<c:if test="#{isInputPosition(component, 'top') and
component.attributes['showInput']}">
@@ -45,19 +45,19 @@
</c:if>
</c:if>
<c:if test="#{component.attributes['showArrows']}">
- <span class="rf-ins-db#{component.attributes['disabled'] ?
'-d' : ''} #{component.attributes['decreaseClass']}" />
+ <span class="rf-insl-dec#{component.attributes['disabled'] ?
'-dis' : ''} #{component.attributes['decreaseClass']}" />
</c:if>
- <span class="rf-ins-ta">
+ <span class="rf-insl-trc-cntr">
<c:if test="#{component.attributes['showBoundaryValues']}">
- <span
class="rf-ins-mn">#{component.attributes['minValue']}</span>
- <span
class="rf-ins-mx">#{component.attributes['maxValue']}</span>
+ <span
class="rf-insl-mn">#{component.attributes['minValue']}</span>
+ <span
class="rf-insl-mx">#{component.attributes['maxValue']}</span>
</c:if>
- <span class="rf-ins-t
#{component.attributes['trackClass']}">
- <span class="rf-ins-h#{component.attributes['disabled'] ?
'-d' : ''} #{component.attributes['handleClass']}" />
+ <span class="rf-insl-trc
#{component.attributes['trackClass']}">
+ <span class="rf-insl-hnd#{component.attributes['disabled'] ?
'-dis' : ''} #{component.attributes['handleClass']}" />
</span>
</span>
<c:if test="#{component.attributes['showArrows']}">
- <span class="rf-ins-ib#{component.attributes['disabled'] ?
'-d' : ''} #{component.attributes['increaseClass']}" />
+ <span class="rf-insl-inc#{component.attributes['disabled'] ?
'-dis' : ''} #{component.attributes['increaseClass']}" />
</c:if>
<c:if test="#{isInputPosition(component, 'right') ||
isInputPosition(component, 'bottom')}">
<c:if test="#{isInputPosition(component, 'bottom') and
component.attributes['showInput']}">
@@ -66,7 +66,7 @@
<xi:include xpointer="xpointer(/*)" href="input.template.inc"
/>
</c:if>
<c:if test="#{component.attributes['showToolTip']}">
- <span class="rf-ins-tt
#{component.attributes['toolTipClass']}">#{getInputValue(facesContext,
component)}</span>
+ <span class="rf-insl-tt
#{component.attributes['toolTipClass']}">#{getInputValue(facesContext,
component)}</span>
</c:if>
<script type="text/javascript">new
RichFaces.ui.InputNumberSlider('#{clientId}', {
delay: #{component.attributes['delay']},