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

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

Author: konstantin.mishin
Date: 2010-08-03 13:01:07 -0400 (Tue, 03 Aug 2010)
New Revision: 18397

Added:
   root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc
Modified:
   root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml
   root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml
Log:
RF-8983

Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml
===================================================================
--- root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml	2010-08-03 16:18:22 UTC (rev 18396)
+++ root/sandbox/ui/inputs/inputnumberslider/src/main/config/faces-config.xml	2010-08-03 17:01:07 UTC (rev 18397)
@@ -104,6 +104,13 @@
 			</property-extension>
 		</property>
 		<property>
+			<property-name>inputClass</property-name>
+			<property-class>java.lang.String</property-class>
+			<property-extension>
+				<cdk:generate>true</cdk:generate>
+			</property-extension>
+		</property>
+		<property>
 			<property-name>inputPosition</property-name>
 			<property-class>org.richfaces.renderkit.html.PositionType</property-class>
 			<default-value>PositionType.right</default-value>

Added: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc
===================================================================
--- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc	                        (rev 0)
+++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/input.template.inc	2010-08-03 17:01:07 UTC (rev 18397)
@@ -0,0 +1,28 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright ${year}, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<input name="#{clientId}" type="text" class="rf-ins-i #{component.attributes['inputClass']}" size="3" value="#{getInputValue(facesContext, component)}"
+	accesskey="#{component.attributes['accesskey']}" disabled="#{component.attributes['disabled']}"
+	readonly="#{!component.attributes['enableManualInput']}"
+	style="#{component.attributes['showInput'] ? null : 'display: none;'}" />

Modified: root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml
===================================================================
--- root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml	2010-08-03 16:18:22 UTC (rev 18396)
+++ root/sandbox/ui/inputs/inputnumberslider/src/main/templates/inputnumberslider.template.xml	2010-08-03 17:01:07 UTC (rev 18397)
@@ -24,7 +24,8 @@
 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 <cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
-	xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:c="http://richfaces.org/cdk/jstl/core">
+	xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:c="http://richfaces.org/cdk/jstl/core"
+	xmlns:xi="http://www.w3.org/2001/XInclude">
 	<cc:interface>
 		<cdk:class>org.richfaces.renderkit.html.InputNumberSliderRenderer</cdk:class>
 		<cdk:superclass>org.richfaces.renderkit.InputRendererBase</cdk:superclass>
@@ -42,10 +43,7 @@
 		<span id="#{clientId}" class="rf-ins">
 			<c:if test="#{PositionType.valueOf('left') == component.attributes['inputPosition']
 				|| PositionType.valueOf('top') == component.attributes['inputPosition']}">
-				<input name="#{clientId}" type="text" class="rf-ins-i" size="3"
-					value="#{getInputValue(facesContext, component)}" accesskey="#{component.attributes['accesskey']}"
-					disabled="#{component.attributes['disabled']}" readonly="#{!component.attributes['enableManualInput']}"
-					style="#{component.attributes['showInput'] ? null : 'display: none;'}" />
+				<xi:include xpointer="xpointer(//input)" href="input.template.inc" />
 				<c:if test="#{PositionType.valueOf('top') == component.attributes['inputPosition'] and component.attributes['showInput']}">
 					<br />
 				</c:if>
@@ -70,10 +68,7 @@
 				<c:if test="#{PositionType.valueOf('bottom') == component.attributes['inputPosition'] and component.attributes['showInput']}">
 					<br />
 				</c:if>
-				<input name="#{clientId}" type="text" class="rf-ins-i" size="3"
-					value="#{getInputValue(facesContext, component)}" accesskey="#{component.attributes['accesskey']}"
-					disabled="#{component.attributes['disabled']}" readonly="#{!component.attributes['enableManualInput']}"
-					style="#{component.attributes['showInput'] ? null : 'display: none;'}" />
+				<xi:include xpointer="xpointer(//input)" href="input.template.inc" />
 			</c:if>
 			<c:if test="#{component.attributes['showToolTip']}">
 				<span class="rf-ins-tt #{component.attributes['toolTipClass']}">#{getInputValue(facesContext, component)}</span>