Author: akushunin Date: 2007-07-27 09:00:13 -0400 (Fri, 27 Jul 2007) New Revision: 1889 Modified: trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: Modified: trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml 2007-07-27 12:43:31 UTC (rev 1888) +++ trunk/sandbox/ui/calendar/src/main/config/component/calendar.xml 2007-07-27 13:00:13 UTC (rev 1889) @@ -131,5 +131,11 @@ <classname>java.lang.Object</classname> <description></description> </property> + <property> + <name>buttonLabel</name> + <classname>java.lang.String</classname> + <description></description> + <defaultvalue>"popupButton"</defaultvalue> + </property> </component> </components> Modified: trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-27 12:43:31 UTC (rev 1888) +++ trunk/sandbox/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-07-27 13:00:13 UTC (rev 1889) @@ -121,9 +121,13 @@ public abstract boolean isPopup(); - public abstract void setPopup(boolean direction); + public abstract void setPopup(boolean popup); + public abstract String getButtonLabel(); + public abstract void setButtonLabel(String buttonLabel); + + // currentDate processing ------------------------------------------------- public String getValueAsString(FacesContext context, UIComponent component) Modified: trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-27 12:43:31 UTC (rev 1888) +++ trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-27 13:00:13 UTC (rev 1889) @@ -83,10 +83,11 @@ accesskey="#{component.attributes['accesskey']}" name="#{clientId}" onclick="#{component.attributes['onclick']}" - value="#{component.attributes['value']}" + style="#{component.attributes['style']}" tabindex="#{component.attributes['tabindex']}" type="button"> + #{component.attributes['buttonLabel']} </button> </span> <jsp:scriptlet>