Author: ppitonak(a)redhat.com Date: 2010-11-19 04:45:06 -0500 (Fri, 19 Nov 2010) New Revision: 20113 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml Log: https://jira.jboss.org/browse/RF-9178 * calendar sample fixed * attributes direction and jointPoint added * attributes monthLabels, monthLabelsShort, weekDayLabels and weekDayLabelsShort removed Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-11-19 02:44:12 UTC (rev 20112) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-11-19 09:45:06 UTC (rev 20113) @@ -59,6 +59,8 @@ attributes = Attributes.getUIComponentAttributes(UICalendar.class, getClass(), false); attributes.setAttribute("datePattern", "MMM d, yyyy HH:mm"); + attributes.setAttribute("direction", "bottom-right"); + attributes.setAttribute("jointPoint", "bottom-left"); attributes.setAttribute("popup", true); attributes.setAttribute("rendered", true); attributes.setAttribute("showApplyButton", true); Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2010-11-19 02:44:12 UTC (rev 20112) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2010-11-19 09:45:06 UTC (rev 20113) @@ -29,6 +29,10 @@ attr.jointPoint.auto=auto attr.jointPoint.null= +attr.mode.client=client +attr.mode.ajax=ajax +attr.mode.null= + attr.todayControlMode.scroll=scroll attr.todayControlMode.select=select attr.todayControlMode.hidden=hidden Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2010-11-19 02:44:12 UTC (rev 20112) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2010-11-19 09:45:06 UTC (rev 20113) @@ -36,11 +36,11 @@ </f:metadata> <style type="text/css"> .yellowDay { - background: yellow; + background: yellow !important; } .aquaDay { - background: aqua; + background: aqua !important; } </style> @@ -82,7 +82,7 @@ dayEnabled="#{richCalendarBean.attributes['dayEnabled'].value}" dayStyleClass="#{richCalendarBean.attributes['dayStyleClass'].value}" defaultTime="#{richCalendarBean.attributes['defaultTime'].value}" - + direction="#{richCalendarBean.attributes['direction'].value}" disabled="#{richCalendarBean.attributes['disabled'].value}" enableManualInput="#{richCalendarBean.attributes['enableManualInput'].value}" firstWeekDay="#{richCalendarBean.attributes['firstWeekDay'].value}" @@ -92,11 +92,9 @@ inputClass="#{richCalendarBean.attributes['inputClass'].value}" inputSize="#{richCalendarBean.attributes['inputSize'].value}" inputStyle="#{richCalendarBean.attributes['inputStyle'].value}" - + jointPoint="#{richCalendarBean.attributes['jointPoint'].value}" locale="#{richCalendarBean.attributes['locale'].value}" minDaysInFirstWeek="#{richCalendarBean.attributes['minDaysInFirstWeek'].value}" - monthLabels="#{richCalendarBean.attributes['monthLabels'].value}" - monthLabelsShort="#{richCalendarBean.attributes['monthLabelsShort'].value}" oninputblur="#{richCalendarBean.attributes['oninputblur'].value}" oninputchange="#{richCalendarBean.attributes['oninputchange'].value}" oninputclick="#{richCalendarBean.attributes['oninputclick'].value}" @@ -129,8 +127,6 @@ validatorMessage="#{richCalendarBean.attributes['validatorMessage'].value}" value="#{richCalendarBean.attributes['value'].value}" verticalOffset="#{richCalendarBean.attributes['verticalOffset'].value}" - weekDayLabels="#{richCalendarBean.attributes['weekDayLabels'].value}" - weekDayLabelsShort="#{richCalendarBean.attributes['weekDayLabelsShort'].value}" zindex="#{richCalendarBean.attributes['zindex'].value}" <a4j:ajax event="inputchange" render="output"/>