3:06 a.m.
Author: pyaschenko
Date: 2007-08-23 04:06:30 -0400 (Thu, 23 Aug 2007)
New Revision: 2424
Modified:
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-660 fixed
RF-651 partial fixed
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-23 00:30:10
UTC (rev 2423)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-23 08:06:30
UTC (rev 2424)
@@ -5,6 +5,7 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar"
prefix="calendar" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
<html>
<head>
<title></title>
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-23 00:30:10 UTC (rev
2423)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-23 08:06:30 UTC (rev
2424)
@@ -177,6 +177,25 @@
<description>False value for this attribute makes text a field
invisible</description>
<defaultvalue>true</defaultvalue>
</property>
+ <property>
+ <name>style</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property> <property>
+ <name>styleClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>inputStyle</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>inputClass</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
</component>
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-23
00:30:10 UTC (rev 2423)
+++
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-23
08:06:30 UTC (rev 2424)
@@ -203,6 +203,10 @@
<u:selector name=".calendar_hover">
<u:style name="background-color" value="#f3f3f3"/> /*unknown
parameter - need to add*/
</u:selector>
+
+ <u:selector name=".calendar_current.calendar_hover">
+ <u:style name="color" value="#ff7800"/> /*unknown parameter -
need to add*/
+ </u:selector>
<u:selector name=".calendar_toolfooter">
<u:style name="background"
skin="additionalBackgroundColor"/>
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
---
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-23
00:30:10 UTC (rev 2423)
+++
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-23
08:06:30 UTC (rev 2424)
@@ -1078,11 +1078,17 @@
}
var e = $(this.todayCellId);
e.style['backgroundColor'] = '';
- this.highlightEffect = new Effect.Highlight(e, {startcolor: this.todayCellColor,
duration:0.3, transition: Effect.Transitions.sinoidal});
+ this.highlightEffect = new Effect.Highlight(e, {startcolor: this.todayCellColor,
duration:0.3, transition: Effect.Transitions.sinoidal,
+ afterFinish: this.onHighlightFinish});
}
}
},
+ onHighlightFinish: function (object)
+ {
+ object.element.style['backgroundColor'] = '';
+ },
+
selectDate: function(date, noUpdate) {
var oldSelectedDate = this.selectedDate;
if (date)
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-23
00:30:10 UTC (rev 2423)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-23
08:06:30 UTC (rev 2424)
@@ -10,6 +10,7 @@
component="org.richfaces.component.UICalendar">
<f:clientid var="clientId" />
<h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),new
org.ajax4jsf.javascript.AjaxScript(),/org/richfaces/renderkit/html/scripts/events.js,/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js,/org/richfaces/renderkit/html/scripts/scriptaculous/effects.js,/org/richfaces/renderkit/html/scripts/calendar.js</h:scripts>
+
<h:styles>/org/richfaces/renderkit/html/css/calendar.xcss</h:styles>
<div id="#{clientId}"
@@ -125,7 +126,8 @@
onfocus="#{component.attributes['onfocus']}"
onblur="#{component.attributes['onblur']}"
size="#{component.attributes['inputSize']}"
- style="vertical-align: middle; #{component.attributes['style']}"
+ style="vertical-align: middle;
#{component.attributes['inputStyle']}"
+ class="rich-calendar-input #{component.attributes['inputClass']}"
tabindex="#{component.attributes['tabindex']}"
onclick="#{onclick}">
</input>
@@ -135,7 +137,7 @@
accesskey="#{component.attributes['accesskey']}"
name="#{clientId}"
onclick="$('#{clientId}').component.doExpand();return false;"
- style="vertical-align: middle; #{component.attributes['style']}"
+ style="vertical-align: middle"
tabindex="#{component.attributes['tabindex']}">
</img>
</span>