Author: pyaschenko Date: 2007-08-01 12:06:23 -0400 (Wed, 01 Aug 2007) New Revision: 1983 Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: fixes Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-01 15:33:18 UTC (rev 1982) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-01 16:06:23 UTC (rev 1983) @@ -130,11 +130,11 @@ } String selectedDateString = (String) requestParameterMap.get(clientId - + "InputSelectedDate"); - if (selectedDateString != null) { + + "InputDate"); + if ( selectedDateString != null) { ((UICalendar) component).setSubmittedValue(selectedDateString); } - } + } public void encodeChildren(FacesContext context, UIComponent calendar) throws IOException { Modified: trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-01 15:33:18 UTC (rev 1982) +++ trunk/sandbox/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-01 16:06:23 UTC (rev 1983) @@ -1039,10 +1039,11 @@ CalendarView = {}; CalendarView.getControl = function(text, functionName) { var attr = { - onclick: (functionName ? "Richfaces.invokeOnComponent('richfaces:calendar',this,'"+functionName+"');" : "")+"return false;" + onclick: (functionName ? "Richfaces.invokeOnComponent('richfaces:calendar',this,'"+functionName+"');" : "")+"return false;", + className: "calendar_btn" }; - return new E('span',attr,[new T(text)]); + return new E('div',attr,[new T(text)]); }; CalendarView.nextYearControl = CalendarView.getControl(">>", "nextYear"); @@ -1061,11 +1062,11 @@ [ new E('tr',{}, [ - new E('td',{'class': 'calendar_tool calendar_btn'}, + new E('td',{'class': 'calendar_tool'}, [ new ET(function (context) { return Richfaces.evalMacro("previousYearControl", context)}) ]), - new E('td',{'class': 'calendar_tool calendar_btn'}, + new E('td',{'class': 'calendar_tool'}, [ new ET(function (context) { return Richfaces.evalMacro("previousMonthControl", context)}) ]), @@ -1073,11 +1074,11 @@ [ new ET(function (context) { return Richfaces.evalMacro("currentMonthControl", context)}) ]), - new E('td',{'class': 'calendar_tool calendar_btn'}, + new E('td',{'class': 'calendar_tool'}, [ new ET(function (context) { return Richfaces.evalMacro("nextMonthControl", context)}) ]), - new E('td',{'class': 'calendar_tool calendar_btn'}, + new E('td',{'class': 'calendar_tool'}, [ new ET(function (context) { return Richfaces.evalMacro("nextYearControl", context)}) ]) @@ -1093,15 +1094,15 @@ [ new E('tr',{}, [ - new E('td',{'class': 'calendar_toolfooter calendar_btn', 'style': 'white-space:nowrap'}, + new E('td',{'class': 'calendar_toolfooter', 'style': 'white-space:nowrap'}, [ new ET(function (context) { return Richfaces.evalMacro("selectedDateControl", context)}) ]), - new E('td',{'class': 'calendar_toolfooter calendar_btn', 'width': '100%'}, + new E('td',{'class': 'calendar_toolfooter', 'width': '100%'}, [ new ET(function (context) { return Richfaces.evalMacro("helpControl", context)}) ]), - new E('td',{'class': 'calendar_toolfooter calendar_btn', 'align': 'right'}, + new E('td',{'class': 'calendar_toolfooter', 'align': 'right'}, [ new ET(function (context) { return Richfaces.evalMacro("todayControl", context)}) ]) Modified: trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-01 15:33:18 UTC (rev 1982) +++ trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-01 16:06:23 UTC (rev 1983) @@ -68,6 +68,7 @@ x:passThruWithExclusions="name" id="#{clientId}InputDate" + name="#{clientId}InputDate" value="#{this:getInputValue(context,component)}" type="text" readonly="#{component.attributes['readonly']}"