Author: pyaschenko Date: 2007-09-11 06:37:23 -0400 (Tue, 11 Sep 2007) New Revision: 2859 Modified: trunk/ui/calendar/src/main/config/component/calendar.xml trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: RF-882 Modified: trunk/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-11 10:24:15 UTC (rev 2858) +++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-11 10:37:23 UTC (rev 2859) @@ -274,10 +274,17 @@ <name>inputClass</name> <classname>java.lang.String</classname> <description> - Style Class attribute for a text field + Style Class attribute for the text field </description> </property> <property> + <name>buttonClass</name> + <classname>java.lang.String</classname> + <description> + Style Class attribute for the popup button + </description> + </property> + <property> <name>zindex</name> <classname>int</classname> <description> Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss =================================================================== --- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-09-11 10:24:15 UTC (rev 2858) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-09-11 10:37:23 UTC (rev 2859) @@ -207,7 +207,7 @@ <u:style name="font-family" skin="generalFamilyFont"/> </u:selector> - <u:selector name=".rich-calendar-popupicon"> + <u:selector name=".rich-calendar-button"> <u:style name="cursor" value="pointer"/> <u:style name="vertical-align" value="middle"/> </u:selector> Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-11 10:24:15 UTC (rev 2858) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-11 10:37:23 UTC (rev 2859) @@ -152,10 +152,10 @@ variables.setVariable("buttonIcon",buttonIcon); variables.setVariable("buttonLabel",buttonLabel); variables.setVariable("buttonIconDisabled",buttonIconDisabled); - if(buttonLabel==null){ + if(buttonLabel==null || buttonLabel.equals("")){ ]]> </jsp:scriptlet> - <img id="#{clientId}PopupButton" class="rich-calendar-popupicon" + <img id="#{clientId}PopupButton" class="rich-calendar-button #{component.attributes['buttonClass']}" accesskey="#{component.attributes['accesskey']}" name="#{clientId}" style="vertical-align: middle" @@ -199,6 +199,7 @@ name="#{clientId}" onclick="$('#{clientId}').component.doSwitch();return true; #{component.attributes['oninputclick']}" style="vertical-align: middle" + class="rich-calendar-button #{component.attributes['buttonClass']}" tabindex="#{component.attributes['tabindex']}" disabled="#{disabled}"> #{buttonLabel}