Author: amarkhel Date: 2010-10-28 11:14:58 -0400 (Thu, 28 Oct 2010) New Revision: 19732 Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml Log: add calendarIcon rendering, fix template Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-28 15:14:24 UTC (rev 19731) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-28 15:14:58 UTC (rev 19732) @@ -141,7 +141,11 @@ public static final String MIN_DAYS_IN_FIRST_WEEK = "minDaysInFirstWeek"; + public static final String CALENDAR_ICON_RESOURCE_NAME = "calendarIcon.png"; + public static final String CALENDAR_DISABLE_ICON_RESOURCE_NAME = "disabledCalendarIcon.png"; + + protected static final Map<String, ComponentAttribute> CALENDAR_INPUT_HANDLER_ATTRIBUTES = Collections.unmodifiableMap(ComponentAttribute.createMap( @@ -229,13 +233,21 @@ String buttonIcon = (String)component.getAttributes().get("buttonIcon"); if(disable) { buttonIcon = (String)component.getAttributes().get("buttonIconDisabled"); - } - //TODO: add default icon - return (buttonIcon != null && !"".equals(buttonIcon)) ? getResourcePath(facesContext, buttonIcon) : ""; + } + + if(buttonIcon != null && buttonIcon.trim().length() != 0) { + buttonIcon = ViewUtil.getResourceURL(buttonIcon, facesContext); + } else { + buttonIcon = disable ? CALENDAR_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME; + buttonIcon = RenderKitUtils.getResourcePath(facesContext, "org.richfaces.images",buttonIcon); + } + + return buttonIcon; } - public Object getSelectedDate(FacesContext facesContext, AbstractCalendar calendar) throws IOException { + public Object getSelectedDate(FacesContext facesContext, UIComponent component) throws IOException { Object returnValue = null; + AbstractCalendar calendar = (AbstractCalendar)component; if(calendar.isValid()) { Date date; Object value = calendar.getValue(); @@ -268,7 +280,8 @@ return formatDate(date); } - public String getCurrentDateAsString(FacesContext context, AbstractCalendar calendar) throws IOException { + public String getCurrentDateAsString(FacesContext context, UIComponent component) throws IOException { + AbstractCalendar calendar = (AbstractCalendar)component; Format formatter = new SimpleDateFormat("MM/yyyy"); Date currentDate = calendar.getCurrentDateOrDefault(); @@ -549,10 +562,6 @@ writer.write(scriptBuffer.toString()); } - protected String getResourcePath(FacesContext facesContext, String source) { - return (source != null && !"".equals(source)) ? ViewUtil.getResourceURL(source, facesContext) :"" ; - } - public boolean isUseIcons(FacesContext facesContext, UIComponent component) { Object label = component.getAttributes().get("buttonLabel"); return (label == null || ((String)label).trim().length() == 0); Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-28 15:14:24 UTC (rev 19731) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-28 15:14:58 UTC (rev 19732) @@ -45,8 +45,8 @@ FacesContext context = FacesContext.getCurrentInstance(); Skin skin = SkinFactory.getInstance(context).getSkin(context); - this.headerTextColor = skin.getColorParameter(context, Skin.HEAD_TEXT_COLOR); - this.headerBackgroundColor = skin.getColorParameter(context, Skin.HEADER_BACKGROUND_COLOR); + this.headerTextColor = skin.getColorParameter(context, Skin.HEADER_BACKGROUND_COLOR); + this.headerBackgroundColor = skin.getColorParameter(context, Skin.SELECT_CONTROL_COLOR); } Modified: sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-28 15:14:24 UTC (rev 19731) +++ sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-28 15:14:58 UTC (rev 19732) @@ -1,6 +1,6 @@ -org.richfaces.images\:calendarSeparator.png=org.richfaces.renderkit.html.iconimages.CalendarSeparator -org.richfaces.images\:calendarIcon.png=org.richfaces.renderkit.html.iconimages.CalendarIcon -org.richfaces.images\:disabledCalendarIcon.png=org.richfaces.renderkit.html.iconimages.DisabledCalendarIcon +org.richfaces.images\:calendarSeparator.png=org.richfaces.renderkit.html.images.CalendarSeparator +org.richfaces.images\:calendarIcon.png=org.richfaces.renderkit.html.images.CalendarIcon +org.richfaces.images\:disabledCalendarIcon.png=org.richfaces.renderkit.html.images.DisabledCalendarIcon org.richfaces.images\:calendarButtonUp.png=org.richfaces.renderkit.html.BaseGradient\ {width=8, height=18, baseColorParam=generalBackgroundColor, gradientColorParam=tabBackgroundColor} org.richfaces.images\:calendarButtonDown.png=org.richfaces.renderkit.html.BaseGradient\ Modified: sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-28 15:14:24 UTC (rev 19731) +++ sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-28 15:14:58 UTC (rev 19732) @@ -59,7 +59,7 @@ </c:choose> </c:otherwise> </c:choose> - <input type="hidden" id="#{clientId}InputCurrentDate" style="display:none" autocomplete="off" name="#{clientId}InputCurrentDate" value="getCurrentDateAsString(facesContext, component)" /> + <input type="hidden" id="#{clientId}InputCurrentDate" style="display:none" autocomplete="off" name="#{clientId}InputCurrentDate" value="#{getCurrentDateAsString(facesContext, component)}" /> </span> <div style="display: none;" id="#{clientId}"></div>