[richfaces-svn-commits] JBoss Rich Faces SVN: r2324 - in trunk/ui/calendar/src/main: templates/org/richfaces and 1 other directory.

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

Author: pyaschenko
Date: 2007-08-17 12:01:48 -0400 (Fri, 17 Aug 2007)
New Revision: 2324

Modified:
   trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
   trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-614

Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss	2007-08-17 15:01:51 UTC (rev 2323)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss	2007-08-17 16:01:48 UTC (rev 2324)
@@ -227,5 +227,11 @@
 		<u:style name="font-size" skin="generalSizeFont"/>
 		<u:style name="font-family" skin="generalFamilyFont"/>
 	</u:selector>
+	
+	<u:selector name=".calendar_popupicon">
+		<u:style name="cursor" value="pointer"/>
+		<u:style name="vertical-align" value="middle"/>
+	</u:selector>
+}
    
 </f:template>

Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-17 15:01:51 UTC (rev 2323)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-17 16:01:48 UTC (rev 2324)
@@ -108,9 +108,8 @@
 				
 		</jsp:scriptlet>
 		<f:resource	name="org.richfaces.renderkit.html.iconimages.CalendarIcon" var="icon" />
-			<span 
-			id="#{clientId}Popup"
-			> <input 
+			<span id="#{clientId}Popup" >
+			<input 
 				x:passThruWithExclusions="name"
 				id="#{clientId}InputDate"
 				name="#{clientId}InputDate"
@@ -125,21 +124,19 @@
 				onfocus="#{component.attributes['onfocus']}"
 				onblur="#{component.attributes['onblur']}"
 				size="#{component.attributes['inputSize']}"
-				style="#{component.attributes['style']}"
+				style="vertical-align: middle; #{component.attributes['style']}"
 				tabindex="#{component.attributes['tabindex']}"
 				onclick="#{onclick}">
-				 </input>
-		<input id="#{clientId}PopupButton"
+			</input>
+			<image id="#{clientId}PopupButton"
+				class="calendar_popupicon"
+				src="#{icon}"
 				accesskey="#{component.attributes['accesskey']}"
-	 			name="#{clientId}"
-	 			onclick="$('#{clientId}').component.doExpand();return false;"	 			
-				style="#{component.attributes['style']}"
-				tabindex="#{component.attributes['tabindex']}"
-				type="image"
-				disabled="#{component.attributes['disabled']}"
-				src="#{icon}">
-				
-		</input>
+		 		name="#{clientId}"
+		 		onclick="$('#{clientId}').component.doExpand();return false;"	 			
+				style="vertical-align: middle; #{component.attributes['style']}"
+				tabindex="#{component.attributes['tabindex']}">
+			</image>
 	</span>
 			<jsp:scriptlet>
 		<![CDATA[