Author: tromanovich
Date: 2008-10-10 07:02:29 -0400 (Fri, 10 Oct 2008)
New Revision: 10710
Modified:
trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelectProperty.xhtml
Log:
"Readonly" attribute was added to the calendar component
Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-10-10
10:41:00 UTC (rev 10709)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2008-10-10
11:02:29 UTC (rev 10710)
@@ -73,6 +73,7 @@
private String jointPoint;
private String direction;
private String boundary;
+ private int firstWeekDay;
private String icon;
private String toolTipMode;
private String label;
@@ -93,6 +94,7 @@
private HtmlCalendar htmlCalendar = null;
public CalendarBean() {
+ firstWeekDay = 1;
horizontalOffset = "0";
verticalOffset = "0";
isDayEnabled = true;
@@ -111,7 +113,7 @@
pattern = "MMM d, yyyy";
jointPoint = "bottom-left";
direction = "bottom-right";
- readonly = true;
+ readonly = false;
enableManualInput = false;
showInput = true;
boundary = "inactive";
@@ -665,8 +667,22 @@
public void setHeaderFacet(String headerFacet) {
this.headerFacet = headerFacet;
}
+
+ /**
+ * @return the firstWeekDay
+ */
+ public int getFirstWeekDay() {
+ return firstWeekDay;
+ }
+ /**
+ * @param firstWeekDay the firstWeekDay to set
+ */
+ public void setFirstWeekDay(int firstWeekDay) {
+ this.firstWeekDay = firstWeekDay;
+ }
+
public HtmlCalendar getHtmlCalendar() {
return htmlCalendar;
}
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-10-10
10:41:00 UTC (rev 10709)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2008-10-10
11:02:29 UTC (rev 10710)
@@ -11,6 +11,7 @@
rendered="#{calendarBean.renderedAjax}" />
<rich:calendar id="calendarClientID"
dataModel="#{calendarDataModel}"
+ firstWeekDay="#{calendarBean.firstWeekDay}"
style="#{style.style}" styleClass="#{style.styleClass}"
inputStyle="#{style.inputStyle}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}"
@@ -35,6 +36,7 @@
buttonIcon="#{calendarBean.icon}"
buttonIconDisabled="#{icon.iconFileManagerReject}"
disabled="#{calendarBean.disabled}"
+ readonly="#{calendarBean.readonly}"
bypassUpdates="#{calendarBean.bypassUpdates}"
zindex="#{calendarBean.zindex}"
toolTipMode="#{calendarBean.toolTipMode}"
@@ -66,7 +68,10 @@
oninputselect="#{event.oninputselect}"
ontimeselect="#{event.ontimeselect}"
ontimeselected="#{event.ontimeselected}"
- binding="#{calendarBean.htmlCalendar}">
+ binding="#{calendarBean.htmlCalendar}"
+ horizontalOffset="#{calendarBean.horizontalOffset}"
+ verticalOffset="#{calendarBean.verticalOffset}"
+ >
<f:facet name="weekDay">
<f:verbatim>
<span style="padding: 2px; font-size: 4">{weekDayLabel +
@@ -97,6 +102,7 @@
</rich:calendar>
<rich:calendar id="calendarAjaxID"
dataModel="#{calendarDataModel}"
+ firstWeekDay="#{calendarBean.firstWeekDay}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
weekDayLabels="#{calendarBean.weekDayLabels}"
@@ -118,6 +124,7 @@
buttonIcon="#{calendarBean.icon}"
buttonIconDisabled="#{icon.iconFileManagerReject}"
disabled="#{calendarBean.disabled}"
+ readonly="#{calendarBean.readonly}"
bypassUpdates="#{calendarBean.bypassUpdates}"
zindex="#{calendarBean.zindex}"
toolTipMode="#{calendarBean.toolTipMode}"
@@ -141,7 +148,10 @@
oninputkeyup="#{event.oninputkeyup}"
oninputselect="#{event.oninputselect}"
ontimeselect="#{event.ontimeselect}"
- ontimeselected="#{event.ontimeselected}">
+ ontimeselected="#{event.ontimeselected}"
+ horizontalOffset="#{calendarBean.horizontalOffset}"
+ verticalOffset="#{calendarBean.verticalOffset}"
+ >
<f:facet name="weekDay">
<f:verbatim>
Modified:
trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml
===================================================================
---
trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-10-10
10:41:00 UTC (rev 10709)
+++
trunk/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2008-10-10
11:02:29 UTC (rev 10710)
@@ -36,10 +36,6 @@
<h:selectBooleanCheckbox value="#{calendarBean.showApplyButton}"
onchange="submit();"></h:selectBooleanCheckbox>
- <h:outputText value="showScrollerBar: "></h:outputText>
- <h:selectBooleanCheckbox value="#{calendarBean.showScrollerBar}"
- onchange="submit();"></h:selectBooleanCheckbox>
-
<h:outputText value="showWeeksBar: "></h:outputText>
<h:selectBooleanCheckbox value="#{calendarBean.showWeeksBar}"
onchange="submit();"></h:selectBooleanCheckbox>
@@ -54,7 +50,19 @@
<h:outputText value="cellWidth: "></h:outputText>
<h:inputText value="#{calendarBean.cellWidth}"
onchange="submit();"></h:inputText>
- <h:outputText value="Custom day labels" />
+ <h:outputText value="firstWeekDay"></h:outputText>
+ <h:selectOneRadio value="#{calendarBean.firstWeekDay}"
+ onchange="submit();">
+ <f:selectItem itemLabel="1" itemValue="1" />
+ <f:selectItem itemLabel="2" itemValue="2" />
+ <f:selectItem itemLabel="3" itemValue="3" />
+ <f:selectItem itemLabel="4" itemValue="4" />
+ <f:selectItem itemLabel="5" itemValue="5" />
+ <f:selectItem itemLabel="6" itemValue="6" />
+ <f:selectItem itemLabel="7" itemValue="7" />
+ </h:selectOneRadio>
+
+ <h:outputText value="todayControlMode" />
<h:selectOneRadio value="#{calendarBean.todayControlMode}"
onchange="submit();">
<f:selectItem itemLabel="scroll" itemValue="scroll" />
@@ -180,6 +188,10 @@
<h:outputText value="Disabled:" />
<h:selectBooleanCheckbox value="#{calendarBean.disabled}"
onclick="submit()" />
+
+ <h:outputText value="Readonly:" />
+ <h:selectBooleanCheckbox value="#{calendarBean.readonly}"
+ onclick="submit()" />
<h:outputText value="Rendered:" />
<h:selectBooleanCheckbox value="#{calendarBean.rendered}"
Modified:
trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml
===================================================================
---
trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-10-10
10:41:00 UTC (rev 10709)
+++
trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-10-10
11:02:29 UTC (rev 10710)
@@ -65,7 +65,7 @@
<h:outputText value="Direction:" />
<h:selectOneRadio value="#{dDMenu.direction}">
- <f:selectItem itemLabel="top-right" itemValue="top-right"
/>
+ <f:selectItem itemLabel="top-right" itemValue="top-right" />
<f:selectItem itemLabel="top-left" itemValue="top-left" />
<f:selectItem itemLabel="bottom-right" itemValue="bottom-right"
/>
<f:selectItem itemLabel="bottom-left" itemValue="bottom-left"
/>
@@ -75,10 +75,12 @@
<h:outputText value="GroupDirection:" />
<h:selectOneRadio value="#{dDMenu.groupDirection}">
- <f:selectItem itemLabel="top-up" itemValue="top-up" />
- <f:selectItem itemLabel="top-down" itemValue="top-down" />
- <f:selectItem itemLabel="bottom-up" itemValue="bottom-up"
/>
- <f:selectItem itemLabel="bottom-down" itemValue="bottom-down"
/>
+ <f:selectItem itemLabel="right" itemValue="right" />
+ <f:selectItem itemLabel="left" itemValue="left" />
+ <f:selectItem itemLabel="left-down" itemValue="left-down"
/>
+ <f:selectItem itemLabel="left-up" itemValue="left-up" />
+ <f:selectItem itemLabel="right-down" itemValue="right-down"
/>
+ <f:selectItem itemLabel="right-up" itemValue="right-up" />
<f:selectItem itemLabel="auto" itemValue="auto" />
<a4j:support event="onclick" reRender="ddmId" />
</h:selectOneRadio>
Modified:
trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelectProperty.xhtml
===================================================================
---
trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelectProperty.xhtml 2008-10-10
10:41:00 UTC (rev 10709)
+++
trunk/test-applications/facelets/src/main/webapp/InplaceSelect/InplaceSelectProperty.xhtml 2008-10-10
11:02:29 UTC (rev 10710)
@@ -101,12 +101,12 @@
value="cancel"></a4j:commandLink>
<br />
<a4j:commandLink
- onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.getValue()"
+ onclick="alert
($('formID:inplaceSelectSubviewID:inplaceSelectID').component.getValue())"
value="getValue"></a4j:commandLink>
<br />
<a4j:commandLink
- onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.setValue('setValue')"
- value="setValuel"></a4j:commandLink>
+ onclick="$('formID:inplaceSelectSubviewID:inplaceSelectID').component.setValue('passeds','passeds')"
+ value="setValue('passeds','passeds')"></a4j:commandLink>
<br />
<br />
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>