[richfaces-svn-commits] JBoss Rich Faces SVN: r18541 - in sandbox/ui/inputs/inputnumberslider/src/main: templates and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2010-08-10 14:18:53 -0400 (Tue, 10 Aug 2010)
New Revision: 18541

Modified:
   sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss
   sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc
   sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml
Log:
Lex's changes in markup

Modified: sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss
===================================================================
--- sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss	2010-08-10 18:16:55 UTC (rev 18540)
+++ sandbox/ui/inputs/inputnumberslider/src/main/resources/META-INF/resources/inputNumberSlider.ecss	2010-08-10 18:18:53 UTC (rev 18541)
@@ -29,6 +29,7 @@
 
 .rf-ins-ta {
 	width: 200px; /*TODO remove it*/
+	vertical-align: top;
 }
 
 .rf-ins-mn, .rf-ins-mx, input.rf-ins-i, .rf-ins-tt {
@@ -55,10 +56,15 @@
 	text-align: right;
 }
 
+.rf-ins-ci {
+	margin: 0px; 
+	vertical-align: bottom;
+}
+
 input.rf-ins-i {
 	background: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}") top repeat-x #fff;
 	border: 1px inset #C0C0C0;
-	margin: 10px;
+	margin: 0px 10px 0px 10px;
 }
 
 .rf-ins-tt {
@@ -75,12 +81,14 @@
 	display: block;
 	height: 6px;
 	clear: both;
+	vertical-align: top;
 }
 
 .rf-ins-h, .rf-ins-db, .rf-ins-ib, .rf-ins-h-d, .rf-ins-db-d, .rf-ins-ib-d {
 	display: inline-block;
 	width: 7px;
 	height: 7px;
+	vertical-align: top;
 }
 
 .rf-ins-h {

Modified: sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc
===================================================================
--- sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc	2010-08-10 18:16:55 UTC (rev 18540)
+++ sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc	2010-08-10 18:18:53 UTC (rev 18541)
@@ -22,7 +22,9 @@
 Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
-<input xmlns:cdk="http://richfaces.org/cdk/core" name="#{clientId}" type="text"
-	class="rf-ins-i #{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 class="rf-ins-ci">
+	<input xmlns:cdk="http://richfaces.org/cdk/core" name="#{clientId}" type="text"
+		class="rf-ins-i #{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: sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml
===================================================================
--- sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml	2010-08-10 18:16:55 UTC (rev 18540)
+++ sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml	2010-08-10 18:18:53 UTC (rev 18541)
@@ -43,7 +43,7 @@
 		<span id="#{clientId}" class="rf-ins #{component.attributes['styleClass']}" cdk:passThroughWithExclusions="id class">
 			<c:if test="#{PositionType.valueOf('left') == component.attributes['inputPosition']
 				|| PositionType.valueOf('top') == component.attributes['inputPosition']}">
-				<xi:include xpointer="xpointer(//input)" href="input.template.inc" />
+				<xi:include xpointer="xpointer(/*)" href="input.template.inc" />
 				<c:if test="#{PositionType.valueOf('top') == component.attributes['inputPosition'] and component.attributes['showInput']}">
 					<br />
 				</c:if>
@@ -68,7 +68,7 @@
 				<c:if test="#{PositionType.valueOf('bottom') == component.attributes['inputPosition'] and component.attributes['showInput']}">
 					<br />
 				</c:if>
-				<xi:include xpointer="xpointer(//input)" href="input.template.inc" />
+				<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>