Author: ayanul Date: 2007-10-03 10:59:02 -0400 (Wed, 03 Oct 2007) New Revision: 3227 Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml Log: http://jira.jboss.com/jira/browse/RF-972 Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-10-03 14:58:55 UTC (rev 3226) +++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-10-03 14:59:02 UTC (rev 3227) @@ -29,14 +29,16 @@ import java.util.StringTokenizer; import java.util.TimeZone; import javax.faces.event.ValueChangeEvent; +import javax.faces.webapp.UIComponentTag; + import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { - private static final String [] WEEK_DAY_SHORT = new String[] { "Sun *", - "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *" }; - private static final String [] WEEK_DAY = new String[] { "Saturday *", "Monday +", - "Tuesday +", "Wednesday +", "Thursday +", "Friday +", "Sunday *"}; + private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|", + "|>Mon +<|", "|>Tue +<|", "|>Wed +<|", "|>Thu +<|", "|>Fri +<|", "|>Sat*<|" }; + private static final String [] WEEK_DAY = new String[] { "|>Saturday*<|", "|>Monday+<|", + "|>Tuesday+<|", "|>Wednesday+<|", "|>Thursday+<|", "|>Friday+<|", "|>Sunday*<|"}; private static final String [] MOUNT_LABELS = new String[] { "January +", "February +", "March +", "April +", "May +", "June +", "July +", "August +", "September +", "October +", "November +", "December +" }; @@ -68,7 +70,6 @@ private String boundary; private String icon; private String toolTipMode; - private String scrollMode; private String label; private String timeZone; private String mode; @@ -145,13 +146,12 @@ rendered = true; zindex = 2; toolTipMode = "none"; - scrollMode = "client"; required = false; weekDay = "long"; month = "none"; mode = "client"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.09.2007"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y preloadDateRangeEnd = "11.10.2007"; } @@ -376,14 +376,6 @@ this.toolTipMode = toolTipMode; } - public String getScrollMode() { - return scrollMode; - } - - public void setScrollMode(String scrollMode) { - this.scrollMode = scrollMode; - } - public int getZindex() { return zindex; } Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-10-03 14:58:55 UTC (rev 3226) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-10-03 14:59:02 UTC (rev 3227) @@ -13,8 +13,6 @@ <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" @@ -38,15 +36,15 @@ width="#{calendarBean.width}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" - scrollMode="#{calendarBean.scrollMode}" rendered="#{calendarBean.rendered}" focus="popupModeID" mode="#{calendarBean.mode}" required="#{calendarBean.required}" - requiredMessage="Required Message"> + requiredMessage="Required Message" + > <f:facet name="weekDay"> - <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> </f:facet> <f:facet name="optionalHeader"> @@ -107,6 +105,7 @@ <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> + <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> </h:selectOneMenu> @@ -182,12 +181,6 @@ <f:selectItem itemLabel="single" itemValue="single"/> <f:selectItem itemLabel="batch" itemValue="batch"/> </h:selectOneRadio> - - <h:outputText value="Mode:" /> - <h:selectOneRadio value="#{calendarBean.scrollMode}" onchange="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> <h:outputText value="BoundaryDatesMode:" /> <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}">