Author: ayanul Date: 2007-10-15 07:18:11 -0400 (Mon, 15 Oct 2007) New Revision: 3364 Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp Log: http://jira.jboss.com/jira/browse/RF-1115 delete scrollMode Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-15 09:39:24 UTC (rev 3363) +++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-10-15 11:18:11 UTC (rev 3364) @@ -17,72 +17,134 @@ } </style> <h:form> - <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" - popup="#{calendarBean.popup}" - datePattern="#{calendarBean.pattern}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" - buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - mode="#{calendarBean.mode}" - required="#{calendarBean.required}" - requiredMessage="Required Message" - timeZone="#{calendarBean.tmZone}" - > + <rich:messages showDetail="true"></rich:messages> + + <h:panelGrid columns="2"> + <h:outputText value="Client mode" /> + <h:outputText value="Ajax mode" /> - <f:facet name="weekDay"> - {weekDayLabel} - </f:facet> - - <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet" /> - </f:facet> + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" + locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" + preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" + datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" + jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="counter" + inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" + buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" + height="#{calendarBean.height}" + width="#{calendarBean.width}" + zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.rendered}" + focus="popupModeID" + mode="client" + required="#{calendarBean.required}" + requiredMessage="Required Message" + > + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + </f:facet> + + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> + + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> - <f:facet name="optionalFooter"> - <h:outputText value="optionalFooter Facet" /> - </f:facet> + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> + <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" + locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" + datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" + jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" + boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" + valueChangeListener="#{calendarBean.ddd}" reRender="counter" + inputClass="ic" buttonClass="bc" + ajaxSingle="#{calendarBean.ajaxSingle}" + buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" + disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" + height="#{calendarBean.height}" + width="#{calendarBean.width}" + zindex="#{calendarBean.zindex}" + toolTipMode="#{calendarBean.toolTipMode}" + rendered="#{calendarBean.rendered}" + focus="popupModeID" + mode="ajax" + required="#{calendarBean.required}" + requiredMessage="Required Message"> + <f:facet name="weekDay"> + <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + </f:facet> + + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> + + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> + + <f:validator validatorId="org.richfaces.CalendarValidator" /> - <f:validator validatorId="org.richfaces.CalendarValidator" /> + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> + </h:panelGrid> + + <h:panelGrid columns="2"> - <f:verbatim> - <span style="padding: 2px;">{day}</span> - </f:verbatim> - <h:panelGrid> - <h:outputText styleClass="smallText" value="{data.enLabel}" /> - <h:outputText styleClass="smallText" value="{data.frLabel}" /> - <h:outputText styleClass="smallText" value="{data.deLabel}" /> - </h:panelGrid> - </h:panelGrid> - </rich:calendar> - - <h:panelGrid columns="2"> <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US" - valueChangeListener="#{calendarBean.selectLocale}"> + <h:selectOneRadio onchange="submit()" value="en/US"> <f:selectItem itemLabel="US" itemValue="en/US" /> <f:selectItem itemLabel="DE" itemValue="de/DE" /> <f:selectItem itemLabel="FR" itemValue="fr/FR" /> @@ -98,7 +160,7 @@ <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> - <a4j:support event="onclick" reRender="calendarID"></a4j:support> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Custom month labels" /> @@ -106,12 +168,11 @@ <f:selectItem itemLabel="none" itemValue="none"/> <f:selectItem itemLabel="day labels" itemValue="long"/> <f:selectItem itemLabel="day labels short" itemValue="short"/> - <a4j:support event="onclick" reRender="calendarID"></a4j:support> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:selectOneRadio> <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()" - valueChangeListener="#{calendarBean.selectPattern}"> + <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> <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" /> @@ -123,12 +184,6 @@ <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - <h:outputText value="Mode:" /> - <h:selectOneRadio value="#{calendarBean.mode}" onclick="submit();"> - <f:selectItem itemLabel="client" itemValue="client"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - </h:selectOneRadio> - <h:outputText value="Preload date range begin(d.m.y)" /> <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> @@ -137,17 +192,17 @@ <h:outputText value="z-index:" /> <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Height:" /> <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="Width:" /> <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarID"></a4j:support> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> </h:inputText> <h:outputText value="reRender (counter):" /> @@ -158,8 +213,7 @@ <h:outputText value="Select Popup Joint Point:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}" - valueChangeListener="#{calendarBean.selectJointPoint}"> + value="#{calendarBean.jointPoint}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" /> @@ -168,8 +222,7 @@ <h:outputText value="Select Popup Direction:" /> <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}" - valueChangeListener="#{calendarBean.selectDirection}"> + value="#{calendarBean.direction}"> <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> <f:selectItem itemLabel="top-right" itemValue="top-right" />