Author: akushunin Date: 2007-10-31 12:15:30 -0400 (Wed, 31 Oct 2007) New Revision: 3641 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: Calendar refactoring Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-31 16:09:13 UTC (rev 3640) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-31 16:15:30 UTC (rev 3641) @@ -223,7 +223,10 @@ } if(divStyle.length()!=0){ - writer.writeText("." + clientId + "DayCell{"+divStyle+"}", null); + writer.startElement("style", component); + getUtils().writeAttribute(writer, "type", "text/css"); + writer.writeText("." + clientId.replace(':', '_') + "DayCell{"+divStyle+"}", null); + writer.endElement("style"); } } @@ -239,7 +242,7 @@ && cellheight.intValue() > 0) { String clientId = component.getClientId(context); - writer.writeText(",\n dayCellClass: '" + clientId + "DayCell'", null); + writer.writeText(",\n dayCellClass: '" + clientId.replace(':', '_') + "DayCell'", null); } } Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-10-31 16:09:13 UTC (rev 3640) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-10-31 16:15:30 UTC (rev 3641) @@ -115,9 +115,7 @@ } ]]> </jsp:scriptlet> </span> - <style type="text/css"> <f:call name="dayCellClass" /> - </style> <script type="text/javascript"> new Calendar('#{clientId}', {