Author: amarkhel
Date: 2010-12-29 11:31:41 -0500 (Wed, 29 Dec 2010)
New Revision: 20840
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
trunk/ui/input/ui/src/main/templates/calendar.template.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml
Log:
RF-9652 Calendar: apply outcome of M4 pre-promotion code review
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-12-29
15:03:28 UTC (rev 20839)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-12-29
16:31:41 UTC (rev 20840)
@@ -43,8 +43,6 @@
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;
import javax.faces.convert.DateTimeConverter;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
import org.richfaces.cdk.annotations.Attribute;
@@ -88,13 +86,15 @@
protected enum PropertyKeys {
locale
- };
+ }
public enum Modes {
- CLIENT,
- AJAX
- }
+ client,
+ ajax
+ }
+ private Object submittedCurrentDate = null;
+
@Attribute(defaultValue = "MMM d, yyyy")
public abstract String getDatePattern();
@@ -311,7 +311,6 @@
@Attribute(events = @EventName("clean"))
public abstract String getOnclean();
-
@Attribute
public Object getLocale() {
@@ -330,8 +329,49 @@
getStateHelper().put(PropertyKeys.locale, locale);
}
-
+ public Object getSubmittedCurrentDate() {
+ return submittedCurrentDate;
+ }
+ public void setSubmittedCurrentDate(Object submittedCurrentDate) {
+ this.submittedCurrentDate = submittedCurrentDate;
+ }
+
+ @Override
+ public void validate(FacesContext context) {
+ super.validate(context);
+
+ try {
+ // we should use datePattern attribute-based converter only for
+ // selectedDate
+ // current date string always has predefined format: m/y
+ String submittedCurrentDateString = (String) this.getSubmittedCurrentDate();
+ Date currentDate = CalendarHelper.getAsDate(context, this,
getCurrentDate());
+ Date submittedCurrentDate =
CalendarHelper.convertCurrentDate(submittedCurrentDateString);
+
+ if (!submittedCurrentDate.equals(currentDate)) {
+ updateCurrentDate(context, submittedCurrentDate);
+ }
+
+ CurrentDateChangeEvent currentDateChangeEvent = new
CurrentDateChangeEvent(this, submittedCurrentDateString);
+ currentDateChangeEvent.setCurrentDate(submittedCurrentDate);
+ currentDateChangeEvent.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ queueEvent(currentDateChangeEvent);
+
+ } catch (Exception e) {
+ if (log.isDebugEnabled()) {
+ log.debug(" currentDate convertion fails with following exception:
" + e.toString(), e);
+ }
+ setValid(false);
+ String messageString = e.toString();
+ FacesMessage message = new FacesMessage(messageString);
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(getClientId(context), message);
+ context.renderResponse();
+ }
+
+ }
+
public void updateCurrentDate(FacesContext facesContext, Object currentDate) {
if (facesContext == null) {
throw new NullPointerException();
@@ -435,48 +475,6 @@
}
}
}
-
- public void broadcast(FacesEvent event) throws AbortProcessingException {
- if (event instanceof CurrentDateChangeEvent) {
- FacesContext facesContext = getFacesContext();
- CurrentDateChangeEvent currentDateChangeEvent = (CurrentDateChangeEvent)
event;
- String currentDateString = currentDateChangeEvent.getCurrentDateString();
-
- try {
- // we should use datePattern attribute-based converter only for
- // selectedDate
- // current date string always has predefined format: m/y
- Date currentDate = CalendarHelper.getAsDate(facesContext, this,
getCurrentDate());
- Date submittedCurrentDate =
CalendarHelper.convertCurrentDate(currentDateString);
- currentDateChangeEvent.setCurrentDate(submittedCurrentDate);
-
- if (!submittedCurrentDate.equals(currentDate)) {
- updateCurrentDate(facesContext, submittedCurrentDate);
- }
-
- } catch (Exception e) {
- if (log.isDebugEnabled()) {
- log.debug(" currentDate convertion fails with following
exception: " + e.toString(), e);
- }
- setValid(false);
- String messageString = e.toString();
- FacesMessage message = new FacesMessage(messageString);
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
- facesContext.addMessage(getClientId(facesContext), message);
- facesContext.renderResponse();
- }
- }
-
- super.broadcast(event);
- }
-
- @Override
- public void queueEvent(FacesEvent event) {
- super.queueEvent(event);
- if (event instanceof CurrentDateChangeEvent) {
- event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
- }
- }
public String resolveClientId(FacesContext facesContext, UIComponent
contextComponent, String metaComponentId) {
if (DAYSDATA_META_COMPONENT_ID.equals(metaComponentId)) {
@@ -591,7 +589,7 @@
Date dateRangeBegin = null;
Date dateRangeEnd = null;
- if (Modes.AJAX.toString().equalsIgnoreCase(getMode())) {
+ if (Modes.ajax.toString().equalsIgnoreCase(getMode())) {
dateRangeBegin = CalendarHelper.getAsDate(facesContext, this,
getDefaultPreloadBegin((Date) getCurrentDateOrDefault()));
dateRangeEnd = CalendarHelper.getAsDate(facesContext, this,
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-12-29
15:03:28 UTC (rev 20839)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-12-29
16:31:41 UTC (rev 20840)
@@ -53,7 +53,6 @@
import org.richfaces.component.util.MessageUtil;
import org.richfaces.component.util.SelectUtils;
import org.richfaces.context.ExtendedPartialViewContext;
-import org.richfaces.event.CurrentDateChangeEvent;
import org.richfaces.utils.CalendarHelper;
/**
@@ -164,9 +163,7 @@
String clientId = calendar.getClientId(context);
String currentDateString = (String) requestParameterMap.get(clientId +
CURRENT_DATE_INPUT);
- if (currentDateString != null) {
- calendar.queueEvent(new CurrentDateChangeEvent(calendar,
currentDateString));
- }
+ calendar.setSubmittedCurrentDate(currentDateString);
String selectedDateString = (String) requestParameterMap.get(clientId +
"InputDate");
if (selectedDateString != null) {
@@ -178,8 +175,6 @@
pvc.getRenderIds().add(
component.getClientId(context) +
MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR
+ AbstractCalendar.DAYSDATA_META_COMPONENT_ID);
-
- context.renderResponse();
}
}
@@ -568,5 +563,5 @@
public void decodeMetaComponent(FacesContext context, UIComponent component, String
metaComponentId) {
throw new UnsupportedOperationException();
- }
+ }
}
\ No newline at end of file
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-12-29
15:03:28 UTC (rev 20839)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-12-29
16:31:41 UTC (rev 20840)
@@ -1,11 +1,11 @@
-.rf-ca-extr{
+.rf-cal-extr{
border : 1px solid;
border-color: '#{richSkin.panelBorderColor}';
}
-.rf-ca-btn{
+.rf-cal-btn{
cursor : pointer;
}
-.rf-ca-hdr-optnl{
+.rf-cal-hdr-optnl{
border-bottom : 1px solid;
border-bottom-color : '#{richSkin.panelBorderColor}';
background-color : '#{richSkin.additionalBackgroundColor}';
@@ -16,7 +16,7 @@
font-weight: bold;
}
-.rf-ca-hdr{
+.rf-cal-hdr{
border-right : 0px solid;
border-bottom : 1px solid;
border-bottom-color : '#{richSkin.panelBorderColor}';
@@ -25,16 +25,16 @@
font-family : '#{richSkin.generalFamilyFont}';
}
-.rf-ca-c-size{
+.rf-cal-c-cnt-overflow{
width : 25px;
height : 22px;
}
-.rf-ca-c-div{
+.rf-cal-c-cnt{
overflow: hidden;
}
-.rf-ca-c{
+.rf-cal-c{
border-bottom : 1px solid;
border-right : 1px solid;
padding : 0px;
@@ -47,7 +47,7 @@
font-family : '#{richSkin.generalFamilyFont}';
}
-.rf-ca-month{
+.rf-cal-hdr-month{
vertical-align : middle;
text-align : center;
height : 22px;
@@ -59,7 +59,7 @@
color : '#{richSkin.headerTextColor}';
}
-.rf-ca-tl{
+.rf-cal-tl{
vertical-align : middle;
text-align : center;
width: 20px;
@@ -71,7 +71,7 @@
color : '#{richSkin.headerTextColor}';
}
-.rf-ca-days{
+.rf-cal-day-lbl{
border-bottom : 1px solid;
border-right : 0px solid;
vertical-align : middle;
@@ -84,7 +84,7 @@
font-family : '#{richSkin.generalFamilyFont}';
}
-.rf-ca-week{
+.rf-cal-week{
border-bottom : 1px solid;
border-right : 1px solid;
vertical-align : middle;
@@ -98,7 +98,7 @@
font-family : '#{richSkin.generalFamilyFont}';
}
-.rf-rgh-c{
+.rf-cal-right-c{
border-right : 0px;
}
@@ -106,7 +106,7 @@
border-bottom : 0px;
}
-.rf-ca-tl-ftr{
+.rf-cal-tl-ftr{
height : 22px;
padding : 1px 2px 1px 1px;
background: '#{richSkin.additionalBackgroundColor}';
@@ -117,7 +117,7 @@
background-position: right center;
}
-.rf-ca-ftr-optnl{
+.rf-cal-ftr-optnl{
border-top : 1px solid;
border-right : 0px solid;
padding : 7px;
@@ -130,7 +130,7 @@
font-family: '#{richSkin.generalFamilyFont}';
}
-.rf-ca-ftr{
+.rf-cal-ftr{
border-top: 1px solid;
border-right: 0px solid;
font-size: '#{richSkin.generalSizeFont}';
@@ -140,7 +140,7 @@
border-right-color: '#{richSkin.panelBorderColor}';
}
-.rf-ca-sp-inp {
+.rf-cal-sp-inp {
border: 0px;
padding: 0px 0px 0px 3px;
background: none transparent scroll repeat 0% 0%;
@@ -149,7 +149,7 @@
width: 18px;
}
-.rf-ca-sp-inp-cntr {
+.rf-cal-sp-inp-cntr {
background-position: left top;
background-repeat: repeat-x;
border: 1px solid;
@@ -160,7 +160,7 @@
border-right-color: '#{richSkin.subBorderColor}';
}
-.rf-ca-sp-btn {
+.rf-cal-sp-btn {
border-width: 1px;
border-style: solid;
background-position: left top;
@@ -172,59 +172,49 @@
}
-.rf-ca-spec {
+.rf-cal-spec {
background-color: '#{richSkin.calendarSpecBackgroundColor}';
}
-.calendarSpecBackgroundColo {
- color: red;
-}
-
-.rf-ca-holly {
+.rf-cal-holiday {
background-color: '#{richSkin.calendarHolidaysBackgroundColor}';
color: '#{richSkin.calendarHolidaysTextColor}';
}
-.rf-ca-boundary-dates {
+.rf-cal-boundary-day {
color: #A0A0A0;
}
-.rf-ca-today {
+.rf-cal-today {
background-color: '#{richSkin.calendarCurrentBackgroundColor}';
color: '#{richSkin.calendarCurrentTextColor}';
font-weight: bold;
}
-.rf-ca-today {
- background-color: '#{richSkin.calendarCurrentBackgroundColor}';
- color: '#{richSkin.calendarCurrentTextColor}';
- font-weight: bold;
-}
-
-.rf-ca-sel {
+.rf-cal-sel {
background-color: '#{richSkin.headerBackgroundColor}';
color: '#{richSkin.headerTextColor}';
font-weight: '#{richSkin.headerWeightFont}';
}
-.rf-ca-hov {
+.rf-cal-hov {
background-color: '#{richSkin.calendarSpecBackgroundColor}';
background-color: '#{richSkin.calendarSpecTextColor}';
}
-.rf-ca-tl-btn {
+.rf-cal-tl-btn {
cursor: pointer;
padding: 2px 3px 2px 3px;
white-space: nowrap;
}
-.rf-ca-tl-btn-dis {
+.rf-cal-tl-btn-dis {
cursor: pointer;
padding: 2px 3px 2px 3px;
}
-.rf-ca-tl-btn-hov {
+.rf-cal-tl-btn-hov {
background-color: '#{richSkin.calendarWeekBackgroundColor}';
color: '#{richSkin.generalTextColor}';
border: 1px solid;
@@ -234,86 +224,86 @@
padding: 1px 2px 1px 2px;
}
-.rf-ca-tl-btn-press {
+.rf-cal-btn-press {
border-color: '#{richSkin.panelBorderColor}';
border-right-color: '#{richSkin.tableBackgroundColor}';
border-bottom-color: '#{richSkin.tableBackgroundColor}';
}
-.rf-ca-tl-close {
+.rf-cal-btn-close {
padding: 2px 2px 2px 4px;
background-image:
"url(#{resource['org.richfaces.images:calendarSeparator.png']})";
background-repeat: no-repeat;
background-position: left center;
}
-.rf-ca-btn {
+.rf-cal-btn {
cursor: pointer;
vertical-align: middle;
}
-.rf-ca-edtr-shdw {
+.rf-cal-edtr-shdw {
background: '#{richSkin.tableBackgroundColor}';
opacity: 0.5;
filter: 'alpha(opacity=50)';
}
-.rf-ca-time-layout {
+.rf-cal-timepicker-cnt {
background: '#{richSkin.additionalBackgroundColor}';
border: 1px solid;
border-color: '#{richSkin.panelBorderColor}';
position: relative;
}
-.rf-ca-date-layout {
+.rf-cal-monthpicker-cnt {
background: '#{richSkin.tableBackgroundColor}';
border: 1px solid;
border-color: '#{richSkin.panelBorderColor}';
position: relative;
}
-.rf-ca-edtr-cntr {
+.rf-cal-edtr-cntr {
}
-.rf-ca-time-layout, .rf-ca-date-layout, .rf-ca-time-layout input {
+.rf-cal-timepicker-cnt, .rf-cal-monthpicker-cnt, .rf-cal-timepicker-cnt input {
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
}
-.rf-ca-time-layout-fld {
+.rf-cal-timepicker-inp {
padding: 7px 7px 5px 7px;
white-space: nowrap;
}
-.rf-ca-time-layout-cancel {
+.rf-cal-timepicker-cancel {
padding: 0px 7px 7px 1px;
}
-.rf-ca-time-layout-ok {
+.rf-cal-timepicker-ok {
padding: 0px 1px 7px 7px;
}
-.rf-ca-date-layout-cancel {
+.rf-cal-monthpicker-cancel {
background: '#{richSkin.additionalBackgroundColor}';
border-top: 1px solid;
border-top-color: '#{richSkin.panelBorderColor}';
padding: 5px 5px 5px 1px;
}
-.rf-ca-date-layout-ok {
+.rf-cal-monthpicker-ok {
background: '#{richSkin.additionalBackgroundColor}';
border-top: 1px solid;
border-top-color: '#{richSkin.panelBorderColor}';
padding: 5px 1px 5px 5px;
}
-.rf-ca-date-layout-split {
+.rf-cal-monthpicker-split {
border-right: 1px solid;
border-right-color: '#{richSkin.panelBorderColor}';
}
-.rf-ca-time-btn {
+.rf-cal-time-btn {
width: 45px;
border: 1px solid;
border-color: '#{richSkin.tableBackgroundColor}';
@@ -327,7 +317,7 @@
cursor: pointer;
}
-.rf-ca-time-btn-press {
+.rf-cal-time-btn-press {
border: 1px solid;
border-color: '#{richSkin.panelBorderColor}';
border-right-color: '#{richSkin.tableBackgroundColor}';
@@ -335,12 +325,12 @@
background-color: '#{richSkin.calendarWeekBackgroundColor}';
}
-.rf-ca-time-inp {
+.rf-cal-time-inp {
width: 22px;
margin: 0px 2px;
}
-.rf-ca-sp-up, .rf-ca-sp-down {
+.rf-cal-sp-up, .rf-cal-sp-down {
background-repeat: no-repeat;
background-position: 50% 40%;
height: 7px;
@@ -348,32 +338,32 @@
margin: 0px 1px 1px 0px;
}
-.rf-ca-sp-up {
+.rf-cal-sp-up {
background-image:
"url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowTop']})";
}
-.rf-ca-sp-down {
+.rf-cal-sp-down {
background-image:
"url(#{resource['org.richfaces.renderkit.html.images.SpinnerArrowBottom']})";
}
-.rf-ca-sp-press {
+.rf-cal-sp-press {
margin: 1px 0px 0px 1px;
}
-.rf-ca-sp-btn {
+.rf-cal-sp-btn {
background-color: '#{richSkin.headerBackgroundColor}';
border-color: '#{richSkin.headerBackgroundColor}';
background-image:
"url(#{resource['org.richfaces.renderkit.html.images.ButtonBackgroundImage']})";
}
-.rf-ca-edtr-layout-shdw {
+.rf-cal-edtr-layout-shdw {
background-color: '#{richSkin.shadowBackgroundColor}';
position: absolute;
opacity: 0.3;
filter: 'alpha(opacity=30)';
}
-.rf-ca-edtr-btn {
+.rf-cal-edtr-btn {
width: 36px;
padding: 2px;
margin: 2px;
@@ -381,14 +371,14 @@
cursor: pointer;
}
-.rf-ca-edtr-btn-over {
+.rf-cal-edtr-btn-over {
padding: 1px;
border: 1px solid;
border-color: '#{richSkin.panelBorderColor}';
background: '#{richSkin.calendarSpecBackgroundColor}';
}
-.rf-ca-edtr-btn-sel {
+.rf-cal-edtr-btn-sel {
background-color: '#{richSkin.calendarCurrentBackgroundColor}';
padding: 2px;
border: 0px;
@@ -397,7 +387,7 @@
cursor: default;
}
-.rf-ca-edtr-tl-over {
+.rf-cal-edtr-tl-over {
padding: 1px;
border: 1px solid;
background: '#{richSkin.additionalBackgroundColor}';
@@ -406,7 +396,7 @@
border-bottom-color: '#{richSkin.panelBorderColor}';
}
-.rf-ca-edtr-tl-press {
+.rf-cal-edtr-tl-press {
padding: 1px;
border: 1px solid;
background: '#{richSkin.additionalBackgroundColor}';
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-12-29
15:03:28 UTC (rev 20839)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-12-29
16:31:41 UTC (rev 20840)
@@ -24,8 +24,8 @@
var text = rf.calendarUtils.formatDate(calendar.selectedDate,(calendar.timeType ?
calendar.datePattern : calendar.options.datePattern), calendar.options.monthLabels,
calendar.options.monthLabelsShort);
var onclick = "RichFaces.$$('Calendar',this).showSelectedDate(); return
true;"
var markup = ( calendar.options.disabled ?
- new E('div', {'class': 'rf-ca-tl-btn-dis'}, [new
ET(text)]) :
- new E('div', {'class': 'rf-ca-tl-btn', 'onclick':
onclick}, [new ET(text)]) );
+ new E('div', {'class': 'rf-cal-tl-btn-dis'}, [new
ET(text)]) :
+ new E('div', {'class': 'rf-cal-tl-btn', 'onclick':
onclick}, [new ET(text)]) );
return markup;
},
@@ -36,19 +36,19 @@
var text = rf.calendarUtils.formatDate(calendar.selectedDate, calendar.timePattern,
calendar.options.monthLabels, calendar.options.monthLabelsShort);
- var onmouseover =
"jQuery(this).removeClass('rf-ca-tl-btn-press');";
- var onmouseout = "jQuery(this).addClass('rf-ca-tl-btn-press');";
+ var onmouseover = "jQuery(this).removeClass('rf-cal-btn-press');";
+ var onmouseout = "jQuery(this).addClass('rf-cal-btn-press');";
var onclick = "RichFaces.$$('Calendar',this).showTimeEditor();return
true;";
var markup = calendar.options.disabled || calendar.options.readonly ?
- new E('div', {'class': 'rf-ca-tl-btn-btn-dis'}, [new
ET(text)]) :
- new E('div', {'class': 'rf-ca-tl-btn rf-ca-tl-btn-hov
rf-ca-tl-btn-press', 'onclick': onclick,
+ new E('div', {'class': 'rf-cal-tl-btn-btn-dis'}, [new
ET(text)]) :
+ new E('div', {'class': 'rf-cal-tl-btn rf-cal-tl-btn-hov
rf-cal-btn-press', 'onclick': onclick,
'onmouseover': + onmouseover ,
'onmouseout' : + onmouseout}, [new ET(text)]);
return markup;
},
- toolButtonAttributes: {className: "rf-ca-tl-btn",
onmouseover:"this.className='rf-ca-tl-btn rf-ca-tl-btn-hov'",
onmouseout:"this.className='rf-ca-tl-btn'",
onmousedown:"this.className='rf-ca-tl-btn rf-ca-tl-btn-hov
rf-ca-tl-btn-btn-press'", onmouseup:"this.className='rf-ca-tl-btn
rf-ca-tl-btn-hov'"},
+ toolButtonAttributes: {className: "rf-cal-tl-btn",
onmouseover:"this.className='rf-cal-tl-btn rf-cal-tl-btn-hov'",
onmouseout:"this.className='rf-cal-tl-btn'",
onmousedown:"this.className='rf-cal-tl-btn rf-cal-tl-btn-hov
rf-cal-tl-btn-btn-press'", onmouseup:"this.className='rf-cal-tl-btn
rf-cal-tl-btn-hov'"},
nextYearControl: function (context) {
return (!context.calendar.options.disabled ?
CalendarView.getControl(">>", CalendarView.toolButtonAttributes,
"nextYear") : "");
},
@@ -64,7 +64,7 @@
currentMonthControl: function (context) {
var text = rf.calendarUtils.formatDate(context.calendar.getCurrentDate(), "MMMM,
yyyy", context.monthLabels, context.monthLabelsShort);
var markup = context.calendar.options.disabled ?
- new E('div',{className: "rf-ca-tl-btn-dis"},[new T(text)]) :
+ new E('div',{className: "rf-cal-tl-btn-dis"},[new T(text)]) :
CalendarView.getControl(text, CalendarView.toolButtonAttributes,
"showDateEditor");
return markup;
},
@@ -92,27 +92,27 @@
[
new E('tr',{},
[
- new E('td',{'class': 'rf-ca-tl'},
+ new E('td',{'class': 'rf-cal-tl'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("previousYearControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl'},
+ new E('td',{'class': 'rf-cal-tl'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("previousMonthControl", context)})
]),
- new E('td',{'class': 'rf-ca-month'},
+ new E('td',{'class': 'rf-cal-hdr-month'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("currentMonthControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl'},
+ new E('td',{'class': 'rf-cal-tl'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("nextMonthControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl'},
+ new E('td',{'class': 'rf-cal-tl'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("nextYearControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl rf-ca-tl-close',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
+ new E('td',{'class': 'rf-cal-tl rf-cal-btn-close',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("closeControl", context)})
])
@@ -128,24 +128,24 @@
[
new E('tr',{},
[
- new E('td',{'class': 'rf-ca-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
+ new E('td',{'class': 'rf-cal-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("selectedDateControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
+ new E('td',{'class': 'rf-cal-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("cleanControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
+ new E('td',{'class': 'rf-cal-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'');}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("timeControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl-ftr', 'style':
'background-image:none;', 'width': '100%'}, []),
- new E('td',{'class': 'rf-ca-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'')+(context.calendar.options.disabled || context.calendar.options.readonly ||
!context.calendar.options.showApplyButton ? 'background-image:none;' :
'');}},
+ new E('td',{'class': 'rf-cal-tl-ftr', 'style':
'background-image:none;', 'width': '100%'}, []),
+ new E('td',{'class': 'rf-cal-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'')+(context.calendar.options.disabled || context.calendar.options.readonly ||
!context.calendar.options.showApplyButton ? 'background-image:none;' :
'');}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("todayControl", context)})
]),
- new E('td',{'class': 'rf-ca-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'')+'background-image:none;';}},
+ new E('td',{'class': 'rf-cal-tl-ftr',
'style':function(context){return (this.isEmpty ? 'display:none;' :
'')+'background-image:none;';}},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("applyControl", context)})
])
@@ -156,22 +156,22 @@
timeEditorLayout: [
- new E('table',{'id': function(context){return
context.calendar.TIME_EDITOR_LAYOUT_ID}, 'border': '0',
'cellpadding': '0', 'cellspacing': '0', 'class':
'rf-ca-time-layout'},
+ new E('table',{'id': function(context){return
context.calendar.TIME_EDITOR_LAYOUT_ID}, 'border': '0',
'cellpadding': '0', 'cellspacing': '0', 'class':
'rf-cal-timepicker-cnt'},
[
new E('tbody',{},
[
new E('tr',{},
[
- new E('td',{'class': 'rf-ca-time-layout-fld',
'colspan': '2', 'align': 'center'},
+ new E('td',{'class': 'rf-cal-timepicker-inp',
'colspan': '2', 'align': 'center'},
[
new ET(function (context) { return
rf.calendarTemplates.evalMacro("timeEditorFields", context)})
])
]),
new E('tr',{},
[
- new E('td',{'class': 'rf-ca-time-layout-ok'},
+ new E('td',{'class': 'rf-cal-timepicker-ok'},
[
- new E('div',{'id': function(context){return
context.calendar.TIME_EDITOR_BUTTON_OK}, 'class': 'rf-ca-time-btn',
'style': 'float:right;', 'onmousedown':
"jQuery(this).addClass('rf-ca-time-btn-press');", 'onmouseout':
"jQuery(this).removeClass('rf-ca-time-btn-press');",
'onmouseup':
"jQuery(this).removeClass('rf-ca-time-btn-press');", 'onclick':
function(context){return
"RichFaces.$('"+context.calendar.id+"').hideTimeEditor(true)";}},
+ new E('div',{'id': function(context){return
context.calendar.TIME_EDITOR_BUTTON_OK}, 'class': 'rf-cal-time-btn',
'style': 'float:right;', 'onmousedown':
"jQuery(this).addClass('rf-cal-time-btn-press');", 'onmouseout':
"jQuery(this).removeClass('rf-cal-time-btn-press');",
'onmouseup':
"jQuery(this).removeClass('rf-cal-time-btn-press');", 'onclick':
function(context){return
"RichFaces.$('"+context.calendar.id+"').hideTimeEditor(true)";}},
[
new E('span',{},
[
@@ -180,9 +180,9 @@
])
])
,
- new E('td',{'class': 'rf-ca-time-layout-cancel'},
+ new E('td',{'class': 'rf-cal-timepicker-cancel'},
[
- new E('div',{'id': function(context){return
context.calendar.TIME_EDITOR_BUTTON_CANCEL}, 'class': 'rf-ca-time-btn',
'style': 'float:left;', 'onmousedown':
"jQuery(this).addClass('rf-ca-time-btn-press');", 'onmouseout':
"jQuery(this).removeClass('rf-ca-time-btn-press');",
'onmouseup':
"jQuery(this).removeClass('rf-ca-time-btn-press');", 'onclick':
function(context){return
"RichFaces.$('"+context.calendar.id+"').hideTimeEditor(false)";}},
+ new E('div',{'id': function(context){return
context.calendar.TIME_EDITOR_BUTTON_CANCEL}, 'class': 'rf-cal-time-btn',
'style': 'float:left;', 'onmousedown':
"jQuery(this).addClass('rf-cal-time-btn-press');", 'onmouseout':
"jQuery(this).removeClass('rf-cal-time-btn-press');",
'onmouseup':
"jQuery(this).removeClass('rf-cal-time-btn-press');", 'onclick':
function(context){return
"RichFaces.$('"+context.calendar.id+"').hideTimeEditor(false)";}},
[
new E('span',{},
[
@@ -318,7 +318,7 @@
// isDayEnabled - end-developer JS function
// dayStyleClass - end-developer JS function that provide style class for day's
cells.
- // dayCellClass - add div to day cell with class 'rf-ca-c-div' and add this
class to TD if defined
+ // dayCellClass - add div to day cell with class 'rf-cal-c-cnt' and add this
class to TD if defined
// style - table style
// styleClass - table class
@@ -411,12 +411,12 @@
var tempStr = "RichFaces.$('"+this.id+"').";
- var htmlTextHeader = '<table id="'+this.CALENDAR_CONTENT+'"
border="0" cellpadding="0" cellspacing="0"
class="rf-ca-extr rf-ca-popup '+this.options.styleClass+'"
style="'+popupStyles+this.options.style+'"
onclick="'+tempStr+'skipEventOnCollapse=true;"><tbody>';
+ var htmlTextHeader = '<table id="'+this.CALENDAR_CONTENT+'"
border="0" cellpadding="0" cellspacing="0"
class="rf-cal-extr rf-cal-popup '+this.options.styleClass+'"
style="'+popupStyles+this.options.style+'"
onclick="'+tempStr+'skipEventOnCollapse=true;"><tbody>';
var colspan = (this.options.showWeeksBar ? "8" : "7");
- var htmlHeaderOptional = (this.options.optionalHeaderMarkup) ? '<tr><td
class="rf-ca-hdr-optnl" colspan="'+colspan+'"
id="'+this.id+'HeaderOptional"></td></tr>' :
'';
- var htmlFooterOptional = (this.options.optionalFooterMarkup) ? '<tr><td
class="rf-ca-ftr-optl" colspan="'+colspan+'"
id="'+this.id+'FooterOptional"></td></tr>' :
'';
- var htmlControlsHeader = (this.options.showHeader ? '<tr><td
class="rf-ca-hdr" colspan="'+colspan+'"
id="'+this.id+'Header"></td></tr>' : '');
- var htmlControlsFooter = (this.options.showFooter ? '<tr><td
class="rf-ca-ftr" colspan="'+colspan+'"
id="'+this.id+'Footer"></td></tr>' : '');
+ var htmlHeaderOptional = (this.options.optionalHeaderMarkup) ? '<tr><td
class="rf-cal-hdr-optnl" colspan="'+colspan+'"
id="'+this.id+'HeaderOptional"></td></tr>' :
'';
+ var htmlFooterOptional = (this.options.optionalFooterMarkup) ? '<tr><td
class="rf-cal-ftr-optl" colspan="'+colspan+'"
id="'+this.id+'FooterOptional"></td></tr>' :
'';
+ var htmlControlsHeader = (this.options.showHeader ? '<tr><td
class="rf-cal-hdr" colspan="'+colspan+'"
id="'+this.id+'Header"></td></tr>' : '');
+ var htmlControlsFooter = (this.options.showFooter ? '<tr><td
class="rf-cal-ftr" colspan="'+colspan+'"
id="'+this.id+'Footer"></td></tr>' : '');
var htmlTextFooter = '</tbody></table>'
// days bar creation
@@ -429,7 +429,7 @@
if (this.options.showWeekDaysBar)
{
htmlTextWeekDayBar.push('<tr
id="'+this.WEEKDAY_BAR_ID+'">');
- if (this.options.showWeeksBar) htmlTextWeekDayBar.push('<td
class="rf-ca-days"><br/></td>');
+ if (this.options.showWeeksBar) htmlTextWeekDayBar.push('<td
class="rf-cal-day-lbl"><br/></td>');
var weekDayCounter = this.options.firstWeekDay;
for (var i=0;i<7;i++)
{
@@ -437,12 +437,12 @@
var weekDayHtml = this.evaluateMarkup(this.options.weekDayMarkup, context );
if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
- styleClass = "rf-ca-days";
+ styleClass = "rf-cal-day-lbl";
if (context.isWeekend)
{
- styleClass += " rf-ca-weekends";
+ styleClass += " rf-cal-holliday-lbl";
}
- if (i==6) styleClass += " rf-rgh-cell";
+ if (i==6) styleClass += " rf-cal-right-c";
htmlTextWeekDayBar.push('<td class="'+styleClass+'"
id="'+context.elementId+'">'+weekDayHtml+'</td>');
}
htmlTextWeekDayBar.push('</tr>\n');
@@ -461,20 +461,20 @@
{
context = {weekNumber: k, elementId:this.WEEKNUMBER_ELEMENT_ID+k, component:this};
var weekNumberHtml = this.evaluateMarkup(this.options.weekNumberMarkup, context );
- htmlTextWeek.push('<td class="rf-ca-week
'+bottomStyleClass+'"
id="'+context.elementId+'">'+weekNumberHtml+'</td>');
+ htmlTextWeek.push('<td class="rf-cal-week
'+bottomStyleClass+'"
id="'+context.elementId+'">'+weekNumberHtml+'</td>');
}
// day cells creation
for (var i=0;i<7;i++)
{
- styleClass = bottomStyleClass+(!this.options.dayCellClass ? "rf-ca-c-size"
: (!this.customDayListMarkup ? this.options.dayCellClass : ""))+"
rf-ca-c";
- if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber)
styleClass+=" rf-ca-holly";
- if (i==6) styleClass+=" rf-rgh-c";
+ styleClass = bottomStyleClass+(!this.options.dayCellClass ?
"rf-cal-c-cnt-overflow" : (!this.customDayListMarkup ? this.options.dayCellClass
: ""))+" rf-cal-c";
+ if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber)
styleClass+=" rf-cal-holiday";
+ if (i==6) styleClass+=" rf-cal-right-c";
this.dayCellClassName.push(styleClass);
htmlTextWeek.push('<td class="'+styleClass+'"
id="'+this.DATE_ELEMENT_ID+p+'" '+
eventsStr+
- '>'+(this.customDayListMarkup ? '<div
class="rf-ca-c-div'+(this.options.dayCellClass ? '
'+this.options.dayCellClass : '')+'"></div>' :
'')+'</td>');
+ '>'+(this.customDayListMarkup ? '<div
class="rf-cal-c-cnt'+(this.options.dayCellClass ? '
'+this.options.dayCellClass : '')+'"></div>' :
'')+'</td>');
p++;
}
htmlTextWeek.push('</tr>');
@@ -549,19 +549,19 @@
{
if (this.dateEditorYearID)
{
- $(rf.getDomElement(this.dateEditorYearID)).removeClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorYearID)).removeClass('rf-cal-edtr-btn-sel');
}
this.dateEditorYear = this.dateEditorStartYear + value;
this.dateEditorYearID = this.DATE_EDITOR_LAYOUT_ID+'Y'+value;
- $(rf.getDomElement(this.dateEditorYearID)).addClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorYearID)).addClass('rf-cal-edtr-btn-sel');
},
dateEditorSelectMonth: function(value)
{
this.dateEditorMonth = value;
- $(rf.getDomElement(this.dateEditorMonthID)).removeClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorMonthID)).removeClass('rf-cal-edtr-btn-sel');
this.dateEditorMonthID = this.DATE_EDITOR_LAYOUT_ID+'M'+value;
- $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-cal-edtr-btn-sel');
},
scrollEditorYear: function(value)
@@ -570,7 +570,7 @@
if (this.dateEditorYearID)
{
- $(rf.getDomElement(this.dateEditorYearID)).removeClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorYearID)).removeClass('rf-cal-edtr-btn-sel');
this.dateEditorYearID='';
}
@@ -580,9 +580,9 @@
if (this.dateEditorMonth != this.getCurrentMonth())
{
this.dateEditorMonth = this.getCurrentMonth();
- $(rf.getDomElement(this.dateEditorMonthID)).removeClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorMonthID)).removeClass('rf-cal-edtr-btn-sel');
this.dateEditorMonthID =
this.DATE_EDITOR_LAYOUT_ID+'M'+this.dateEditorMonth;
- $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-cal-edtr-btn-sel');
}
}
@@ -597,14 +597,14 @@
div.firstChild.innerHTML=year;
if (year == this.dateEditorYear)
{
- $(div.firstChild).addClass('rf-ca-edtr-btn-sel');
+ $(div.firstChild).addClass('rf-cal-edtr-btn-sel');
this.dateEditorYearID = div.firstChild.id;
}
div = div.nextSibling;
div.firstChild.innerHTML=year+5;
if (year+5 == this.dateEditorYear)
{
- $(div.firstChild).addClass('rf-ca-edtr-btn-sel');
+ $(div.firstChild).addClass('rf-cal-edtr-btn-sel');
this.dateEditorYearID = div.firstChild.id;
}
year++;
@@ -648,8 +648,8 @@
{
var element = $(rf.getDomElement(this.CALENDAR_CONTENT));
var zindex = parseInt(element.css('z-index'), 10);
- var htmlBegin = '<div id="'+this.EDITOR_SHADOW_ID+'"
class="rf-ca-edtr-shdw" style="position:absolute;
display:none;z-index:'+zindex+'"></div><table
border="0" cellpadding="0" cellspacing="0"
id="'+this.EDITOR_ID+'" style="position:absolute;
display:none;z-index:'+(zindex+1)+'"
onclick="RichFaces.$(\''+this.id+'\').skipEventOnCollapse=true;"><tbody><tr><td
class="rf-ca-edtr-cntr" align="center"><div
style="position:relative; width:100%">';
- var htmlContent = '<div id="'+this.EDITOR_LAYOUT_SHADOW_ID+'"
class="rf-ca-edtr-layout-shdw"></div>';
+ var htmlBegin = '<div id="'+this.EDITOR_SHADOW_ID+'"
class="rf-cal-edtr-shdw" style="position:absolute;
display:none;z-index:'+zindex+'"></div><table
border="0" cellpadding="0" cellspacing="0"
id="'+this.EDITOR_ID+'" style="position:absolute;
display:none;z-index:'+(zindex+1)+'"
onclick="RichFaces.$(\''+this.id+'\').skipEventOnCollapse=true;"><tbody><tr><td
class="rf-cal-edtr-cntr" align="center"><div
style="position:relative; width:100%">';
+ var htmlContent = '<div id="'+this.EDITOR_LAYOUT_SHADOW_ID+'"
class="rf-cal-edtr-layout-shdw"></div>';
var htmlEnd =
'</div></td></tr></tbody></table>';
element.after(htmlBegin+htmlContent+htmlEnd);
@@ -708,27 +708,27 @@
{
if (buttonType==0)
{
- return '<div id="'+id+'"
class="rf-ca-edtr-btn'+(className ? ' '+className : '')+
- '"
onmouseover="this.className=\'rf-ca-edtr-btn rf-ca-edtr-tl-over\';"
onmouseout="this.className=\'rf-ca-edtr-btn\';"
onmousedown="this.className=\'rf-ca-edtr-btn rf-ca-edtr-tl-press\';"
onmouseup="this.className=\'rf-ca-edtr-btn rf-ca-edtr-tl-over\';"
onclick="RichFaces.$(\''+this.id+'\').scrollEditorYear('+param+');">'+value+'</div>';
+ return '<div id="'+id+'"
class="rf-cal-edtr-btn'+(className ? ' '+className : '')+
+ '"
onmouseover="this.className=\'rf-cal-edtr-btn rf-cal-edtr-tl-over\';"
onmouseout="this.className=\'rf-cal-edtr-btn\';"
onmousedown="this.className=\'rf-cal-edtr-btn rf-cal-edtr-tl-press\';"
onmouseup="this.className=\'rf-cal-edtr-btn rf-cal-edtr-tl-over\';"
onclick="RichFaces.$(\''+this.id+'\').scrollEditorYear('+param+');">'+value+'</div>';
}
else
{
var onclick = (buttonType==1 ?
'RichFaces.$(\''+this.id+'\').dateEditorSelectMonth('+param+');':
'RichFaces.$(\''+this.id+'\').dateEditorSelectYear('+param+');'
);
- return '<div id="'+id+'"
class="rf-ca-edtr-btn'+(className ? ' '+className : '')+
- '"
onmouseover="jQuery(this).addClass(\'rf-ca-edtr-btn-over\');"
onmouseout="$(this).removeClass(\'rf-ca-edtr-btn-over\');"
onclick="'+onclick+'">'+value+'</div>';
+ return '<div id="'+id+'"
class="rf-cal-edtr-btn'+(className ? ' '+className : '')+
+ '"
onmouseover="jQuery(this).addClass(\'rf-cal-edtr-btn-over\');"
onmouseout="$(this).removeClass(\'rf-cal-edtr-btn-over\');"
onclick="'+onclick+'">'+value+'</div>';
}
},
createDateEditorLayout: function(editor)
{
- var htmlBegin = '<table id="'+this.DATE_EDITOR_LAYOUT_ID+'"
class="rf-ca-date-layout" border="0" cellpadding="0"
cellspacing="0"><tbody><tr
id="'+this.DATE_EDITOR_LAYOUT_ID+'TR">';
+ var htmlBegin = '<table id="'+this.DATE_EDITOR_LAYOUT_ID+'"
class="rf-cal-monthpicker-cnt" border="0" cellpadding="0"
cellspacing="0"><tbody><tr
id="'+this.DATE_EDITOR_LAYOUT_ID+'TR">';
var htmlEnd = '</tr></tbody></table>';
var month = 0;
this.dateEditorYear = this.getCurrentYear();
var year = this.dateEditorStartYear = this.dateEditorYear-4;
var htmlContent = '<td
align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month,
this.options.monthLabelsShort[month], 1, month)+'</td>'
- +'<td align="center"
class="rf-ca-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6),
this.options.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td align="center"
class="rf-cal-monthpicker-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6),
this.options.monthLabelsShort[month+6], 1, month+6)+'</td>'
+'<td
align="center">'+this.createDECell('','<', 0,
-1)+'</td>'
+'<td
align="center">'+this.createDECell('','>', 0,
1)+'</td>';
month++;
@@ -736,8 +736,8 @@
for (var i=0;i<5;i++)
{
htmlContent+='</tr><tr><td
align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month,
this.options.monthLabelsShort[month], 1, month)+'</td>'
- +'<td align="center"
class="rf-ca-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6),
this.options.monthLabelsShort[month+6], 1, month+6)+'</td>'
- +'<td
align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i,
year, 2, i, (i==4 ? 'rf-ca-edtr-btn-sel' : ''))+'</td>'
+ +'<td align="center"
class="rf-cal-monthpicker-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6),
this.options.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td
align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i,
year, 2, i, (i==4 ? 'rf-cal-edtr-btn-sel' : ''))+'</td>'
+'<td
align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+(i+5),
year+5, 2, i+5)+'</td>';
month++;
year++;
@@ -746,16 +746,16 @@
this.dateEditorMonth = this.getCurrentMonth();
this.dateEditorMonthID = this.DATE_EDITOR_LAYOUT_ID+'M'+this.dateEditorMonth;
- htmlContent+='</tr><tr><td colspan="2"
class="rf-ca-date-layout-ok">'+
- '<div id="'+this.DATE_EDITOR_BUTTON_OK+'"
class="rf-ca-time-btn" style="float:right;"
onmousedown="jQuery(this).addClass(\'rf-ca-time-btn-press\');"
onmouseout="$(this).removeClass(\'rf-ca-time-btn-press\');"
onmouseup="$(this).removeClass(\'rf-ca-time-btn-press\');"
onclick="RichFaces.$(\''+this.id+'\').hideDateEditor(true);"><span>'+this.options.labels.ok+'</span></div>'+
- '</td><td colspan="2"
class="rf-ca-date-layout-cancel">'+
- '<div id="'+this.DATE_EDITOR_BUTTON_CANCEL+'"
class="rf-ca-time-btn" style="float:left;"
onmousedown="jQuery(this).addClass(\'rf-ca-time-btn-press\');"
onmouseout="$(this).removeClass(\'rf-ca-time-btn-press\');"
onmouseup="$(this).removeClass(\'rf-ca-time-btn-press\');"
onclick="RichFaces.$(\''+this.id+'\').hideDateEditor(false);"><span>'+this.options.labels.cancel+'</span></div>'+
+ htmlContent+='</tr><tr><td colspan="2"
class="rf-cal-monthpicker-ok">'+
+ '<div id="'+this.DATE_EDITOR_BUTTON_OK+'"
class="rf-cal-time-btn" style="float:right;"
onmousedown="jQuery(this).addClass(\'rf-cal-time-btn-press\');"
onmouseout="$(this).removeClass(\'rf-cal-time-btn-press\');"
onmouseup="$(this).removeClass(\'rf-cal-time-btn-press\');"
onclick="RichFaces.$(\''+this.id+'\').hideDateEditor(true);"><span>'+this.options.labels.ok+'</span></div>'+
+ '</td><td colspan="2"
class="rf-cal-monthpicker-cancel">'+
+ '<div id="'+this.DATE_EDITOR_BUTTON_CANCEL+'"
class="rf-cal-time-btn" style="float:left;"
onmousedown="jQuery(this).addClass(\'rf-cal-time-btn-press\');"
onmouseout="$(this).removeClass(\'rf-cal-time-btn-press\');"
onmouseup="$(this).removeClass(\'rf-cal-time-btn-press\');"
onclick="RichFaces.$(\''+this.id+'\').hideDateEditor(false);"><span>'+this.options.labels.cancel+'</span></div>'+
'</td>';
$(rf.getDomElement(this.EDITOR_LAYOUT_SHADOW_ID)).after(htmlBegin+htmlContent+htmlEnd);
- $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-ca-edtr-btn-sel');
+ $(rf.getDomElement(this.dateEditorMonthID)).addClass('rf-cal-edtr-btn-sel');
this.correctEditorButtons(editor, this.DATE_EDITOR_BUTTON_OK,
this.DATE_EDITOR_BUTTON_CANCEL);
@@ -764,22 +764,22 @@
createSpinnerTable: function(id) {
return '<table cellspacing="0" cellpadding="0"
border="0"><tbody><tr>'+
- '<td class="rf-ca-sp-inp-ctnr">'+
- '<input id="' + id + '" name="' + id +
'" class="rf-ca-sp-inp" type="text" />'+
+ '<td class="rf-cal-sp-inp-ctnr">'+
+ '<input id="' + id + '" name="' + id +
'" class="rf-cal-sp-inp" type="text" />'+
'</td>'+
- '<td class="rf-ca-sp-btn">'+
+ '<td class="rf-cal-sp-btn">'+
'<table border="0" cellspacing="0"
cellpadding="0"><tbody>'+
'<tr><td>'+
- '<div id="'+id+'BtnUp"
class="rf-ca-sp-up"'+
- ' onmousedown="this.className=\'rf-ca-sp-up
rf-ca-sp-press\'"'+
- ' onmouseup="this.className=\'rf-ca-sp-up\'"'+
- '
onmouseout="this.className=\'rf-ca-sp-up\'"><span></span></div>'+
+ '<div id="'+id+'BtnUp"
class="rf-cal-sp-up"'+
+ ' onmousedown="this.className=\'rf-cal-sp-up
rf-cal-sp-press\'"'+
+ ' onmouseup="this.className=\'rf-cal-sp-up\'"'+
+ '
onmouseout="this.className=\'rf-cal-sp-up\'"><span></span></div>'+
'</td></tr>'+
'<tr><td>'+
- '<div id="'+id+'BtnDown"
class="rf-ca-sp-down"'+
- ' onmousedown="this.className=\'rf-ca-sp-down
rf-ca-sp-press\'"'+
- ' onmouseup="this.className=\'rf-ca-sp-down\'"'+
- '
onmouseout="this.className=\'rf-ca-sp-down\'"><span></span></div>'+
+ '<div id="'+id+'BtnDown"
class="rf-cal-sp-down"'+
+ ' onmousedown="this.className=\'rf-cal-sp-down
rf-cal-sp-press\'"'+
+ ' onmouseup="this.className=\'rf-cal-sp-down\'"'+
+ '
onmouseout="this.className=\'rf-cal-sp-down\'"><span></span></div>'+
'</td></tr>'+
'</tbody></table>'+
'</td>'+
@@ -1089,7 +1089,7 @@
if (this.invokeEvent("datemouseover", obj, e, daydata.date) &&
daydata.enabled)
{
if (daydata._month==0 && obj.id!=this.selectedDateCellId &&
obj.id!=this.todayCellId) {
- $(obj).addClass('rf-ca-hov');
+ $(obj).addClass('rf-cal-hov');
}
}
},
@@ -1099,7 +1099,7 @@
if (this.invokeEvent("datemouseout", obj, e, daydata.date) &&
daydata.enabled)
{
if (daydata._month==0 && obj.id!=this.selectedDateCellId &&
obj.id!=this.todayCellId) {
- $(obj).removeClass('rf-ca-hov');
+ $(obj).removeClass('rf-cal-hov');
}
}
},
@@ -1330,10 +1330,10 @@
// class styles
if (dataobj._month!=0)
{
- classNames+=' rf-ca-boundary-dates';
+ classNames+=' rf-cal-boundary-day';
if (!this.options.disabled && !this.options.readonly &&
boundaryDatesModeFlag)
{
- classNames+=' rf-ca-btn';
+ classNames+=' rf-cal-btn';
}
}
else
@@ -1342,16 +1342,16 @@
{
this.todayCellId = element.id;
this.todayCellColor = this.getCellBackgroundColor(element);
- classNames+=" rf-ca-today";
+ classNames+=" rf-cal-today";
}
if (selectedflag && dataobj.day==selecteddate)
{
this.selectedDateCellId = element.id;
this.selectedDateCellColor = this.getCellBackgroundColor(element);
- classNames+=" rf-ca-sel";
+ classNames+=" rf-cal-sel";
}
- else if (!this.options.disabled && !this.options.readonly &&
dataobj.enabled) classNames+=' rf-ca-btn';
+ else if (!this.options.disabled && !this.options.readonly &&
dataobj.enabled) classNames+=' rf-cal-btn';
// add custom style class
if (dataobj.customStyleClass)
@@ -1608,13 +1608,13 @@
// find cell and change style class
var e = $(rf.getDomElement(this.DATE_ELEMENT_ID+(this.firstDateIndex +
this.selectedDate.getDate()-1)));
- this.clearEffect(this.selectedDateCellId, "rf-ca-sel",
(this.options.disabled || this.options.readonly ? null : "rf-ca-btn"));
+ this.clearEffect(this.selectedDateCellId, "rf-cal-sel",
(this.options.disabled || this.options.readonly ? null : "rf-cal-btn"));
this.selectedDateCellId = e.attr('id');
this.selectedDateCellColor = this.getCellBackgroundColor(e);
- e.removeClass("rf-ca-btn");
- e.removeClass("rf-ca-hov");
- e.addClass("rf-ca-sel");
+ e.removeClass("rf-cal-btn");
+ e.removeClass("rf-cal-hov");
+ e.addClass("rf-cal-sel");
this.renderHF();
}
@@ -1639,7 +1639,7 @@
{
this.selectedDate = null;
- this.clearEffect(this.selectedDateCellId, "rf-ca-sel",
(this.options.disabled || this.options.readonly ? null : "rf-ca-btn"));
+ this.clearEffect(this.selectedDateCellId, "rf-cal-sel",
(this.options.disabled || this.options.readonly ? null : "rf-cal-btn"));
if (this.selectedDateCellId)
{
@@ -1681,7 +1681,7 @@
this.selectedDate = null;
this.invokeEvent("dateselect", null, null, null);
- this.selectedDateCellId = this.clearEffect(this.selectedDateCellId,
"rf-ca-sel", (this.options.disabled || this.options.readonly ? null :
"rf-ca-btn"));
+ this.selectedDateCellId = this.clearEffect(this.selectedDateCellId,
"rf-cal-sel", (this.options.disabled || this.options.readonly ? null :
"rf-cal-btn"));
this.invokeEvent("clean", null, null, null);
this.renderHF();
if (!this.options.showApplyButton)
Modified: trunk/ui/input/ui/src/main/templates/calendar.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/calendar.template.xml 2010-12-29 15:03:28 UTC
(rev 20839)
+++ trunk/ui/input/ui/src/main/templates/calendar.template.xml 2010-12-29 16:31:41 UTC
(rev 20840)
@@ -37,7 +37,7 @@
disabled="#{component.attributes['disabled']}"
accesskey="#{component.attributes['accesskey']}"
maxlength="#{component.attributes['maxlength']}"
size="#{component.attributes['inputSize']}"
style="vertical-align: middle;
#{component.attributes['inputStyle']}"
- class="rf-ca-inp #{component.attributes['inputClass']}"
+ class="rf-cal-inp #{component.attributes['inputClass']}"
tabindex="#{component.attributes['tabindex']}"
readonly="#{(!component.attributes['enableManualInput'] ||
component.attributes['readonly']) ? 'readonly' : ''}">
<cdk:call expression="renderInputHandlers(facesContext, component);"
/>
@@ -45,14 +45,14 @@
<c:choose>
<c:when test="#{isUseIcons(facesContext, component)}">
<img id="#{clientId}PopupButton" alt=""
- class="rf-ca-btn #{component.attributes['buttonClass']}"
+ class="rf-cal-btn #{component.attributes['buttonClass']}"
accesskey="#{component.attributes['accesskey']}"
style="vertical-align: middle"
tabindex="#{component.attributes['tabindex']}"
src="#{getButtonIcon(facesContext, component)}" />
</c:when>
<c:otherwise>
<button type="button" id="#{clientId}PopupButton"
name="#{clientId}PopupButton"
style="vertical-align: middle"
- class="rf-ca-btn #{component.attributes['buttonClass']}"
+ class="rf-cal-btn #{component.attributes['buttonClass']}"
tabindex="#{component.attributes['tabindex']}"
disabled="#{component.attributes['disabled']}">
#{component.attributes['buttonLabel']}
</button>
Modified:
trunk/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml
===================================================================
---
trunk/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2010-12-29
15:03:28 UTC (rev 20839)
+++
trunk/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2010-12-29
16:31:41 UTC (rev 20840)
@@ -1,108 +1,108 @@
-<table id="form:calendarContent" border="0"
cellpadding="0" cellspacing="0" class="rf-ca-extr rf-ca-popup
undefined" style="display:none; position:absolute;z-index: 3;width:200px"
onclick="RichFaces.$('form:calendar').skipEventOnCollapse=true;">
+<table id="form:calendarContent" border="0"
cellpadding="0" cellspacing="0" class="rf-cal-extr rf-cal-popup
undefined" style="display:none; position:absolute;z-index: 3;width:200px"
onclick="RichFaces.$('form:calendar').skipEventOnCollapse=true;">
<tbody>
<tr>
- <td class="rf-ca-hdr" colspan="8"
id="form:calendarHeader"/>
+ <td class="rf-cal-hdr" colspan="8"
id="form:calendarHeader"/>
</tr>
<tr id="form:calendarWeekDay">
- <td class="rf-ca-days">
+ <td class="rf-cal-day-lbl">
<br/>
</td>
- <td class="rf-ca-days rf-ca-weekends"
id="form:calendarWeekDayCell0">
+ <td class="rf-cal-day-lbl rf-cal-holliday-lbl"
id="form:calendarWeekDayCell0">
Sun
</td>
- <td class="rf-ca-days" id="form:calendarWeekDayCell1">
+ <td class="rf-cal-day-lbl"
id="form:calendarWeekDayCell1">
Mon
</td>
- <td class="rf-ca-days" id="form:calendarWeekDayCell2">
+ <td class="rf-cal-day-lbl"
id="form:calendarWeekDayCell2">
Tue
</td>
- <td class="rf-ca-days" id="form:calendarWeekDayCell3">
+ <td class="rf-cal-day-lbl"
id="form:calendarWeekDayCell3">
Wed
</td>
- <td class="rf-ca-days" id="form:calendarWeekDayCell4">
+ <td class="rf-cal-day-lbl"
id="form:calendarWeekDayCell4">
Thu
</td>
- <td class="rf-ca-days" id="form:calendarWeekDayCell5">
+ <td class="rf-cal-day-lbl"
id="form:calendarWeekDayCell5">
Fri
</td>
- <td class="rf-ca-days rf-ca-weekends rf-rgh-cell"
id="form:calendarWeekDayCell6">
+ <td class="rf-cal-day-lbl rf-cal-holliday-lbl rf-cal-right-c"
id="form:calendarWeekDayCell6">
Sat
</td>
</tr>
<tr id="form:calendarWeekNum1">
- <td class="rf-ca-week " id="form:calendarWeekNumCell1">
+ <td class="rf-cal-week " id="form:calendarWeekNumCell1">
1
</td>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell0"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell1"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell2"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell3"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell4"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell5"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell6"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell0"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell1"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell2"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell3"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell4"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell5"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell6"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr id="form:calendarWeekNum2">
- <td class="rf-ca-week " id="form:calendarWeekNumCell2">
+ <td class="rf-cal-week " id="form:calendarWeekNumCell2">
2
</td>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell7"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell8"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell9"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell10"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell11"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell12"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell13"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell7"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell8"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell9"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell10"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell11"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell12"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell13"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr id="form:calendarWeekNum3">
- <td class="rf-ca-week " id="form:calendarWeekNumCell3">
+ <td class="rf-cal-week " id="form:calendarWeekNumCell3">
3
</td>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell14"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell15"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell16"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell17"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell18"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell19"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell20"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell14"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell15"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell16"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell17"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell18"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell19"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell20"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr id="form:calendarWeekNum4">
- <td class="rf-ca-week " id="form:calendarWeekNumCell4">
+ <td class="rf-cal-week " id="form:calendarWeekNumCell4">
4
</td>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell21"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell22"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell23"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell24"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell25"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell26"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell27"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell21"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell22"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell23"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell24"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell25"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell26"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell27"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr id="form:calendarWeekNum5">
- <td class="rf-ca-week " id="form:calendarWeekNumCell5">
+ <td class="rf-cal-week " id="form:calendarWeekNumCell5">
5
</td>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell28"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell29"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell30"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell31"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell32"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c" id="form:calendarDayCell33"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell34"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell28"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell29"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell30"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell31"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell32"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell33"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell34"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr id="form:calendarWeekNum6">
- <td class="rf-ca-week rf-btm-c "
id="form:calendarWeekNumCell6">
+ <td class="rf-cal-week rf-btm-c "
id="form:calendarWeekNumCell6">
6
</td>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c rf-ca-holly"
id="form:calendarDayCell35"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c"
id="form:calendarDayCell36"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c"
id="form:calendarDayCell37"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c"
id="form:calendarDayCell38"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c"
id="form:calendarDayCell39"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c"
id="form:calendarDayCell40"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
- <td class="rf-btm-c rf-ca-c-size rf-ca-c rf-ca-holly rf-rgh-c"
id="form:calendarDayCell41"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday"
id="form:calendarDayCell35"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell36"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell37"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell38"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell39"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c"
id="form:calendarDayCell40"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
+ <td class="rf-btm-c rf-cal-c-cnt-overflow rf-cal-c rf-cal-holiday
rf-cal-right-c" id="form:calendarDayCell41"
onclick="RichFaces.$('form:calendar').eventCellOnClick(event,
this);"
onmouseover="RichFaces.$('form:calendar').eventCellOnMouseOver(event,
this);"
onmouseout="RichFaces.$('form:calendar').eventCellOnMouseOut(event,
this);"/>
</tr>
<tr>
- <td class="rf-ca-ftr" colspan="8"
id="form:calendarFooter"/>
+ <td class="rf-cal-ftr" colspan="8"
id="form:calendarFooter"/>
</tr>
</tbody>
</table>
\ No newline at end of file