Author: abelevich Date: 2008-02-12 07:51:57 -0500 (Tue, 12 Feb 2008) New Revision: 6025 Modified: trunk/ui/combobox/src/main/config/resources/resource-config.xml trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss trunk/ui/combobox/src/main/templates/combobox.jspx Log: move images to the richfaces impl Modified: trunk/ui/combobox/src/main/config/resources/resource-config.xml =================================================================== --- trunk/ui/combobox/src/main/config/resources/resource-config.xml 2008-02-12 12:51:19 UTC (rev 6024) +++ trunk/ui/combobox/src/main/config/resources/resource-config.xml 2008-02-12 12:51:57 UTC (rev 6025) @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <resource-config> - <resource class="org.richfaces.renderkit.images.ComboBoxButtonGradient"> - <name>org.richfaces.renderkit.images.ComboBoxBtnGradient</name> + <resource class="org.richfaces.renderkit.html.images.SpinnerButtonGradient"> + <name>org.richfaces.renderkit.html.images.SpinnerButtonGradient</name> </resource> - <resource class="org.richfaces.renderkit.images.ComboBoxInputGradient"> - <name>org.richfaces.renderkit.images.ComboBoxInputGradient</name> + <resource class="org.richfaces.renderkit.html.images.SpinnerFieldGradient"> + <name>org.richfaces.renderkit.html.images.SpinnerFieldGradient</name> </resource> - <resource class="org.richfaces.renderkit.images.ComboBoxArrowImage"> - <name>org.richfaces.renderkit.images.ComboBoxArrowImage</name> + <resource class="org.richfaces.renderkit.html.images.ComboBoxArrowImage"> + <name>org.richfaces.renderkit.html.images.ComboBoxArrowImage</name> </resource> - <resource class="org.richfaces.renderkit.images.ComboBoxButtonPressGradient"> - <name>org.richfaces.renderkit.images.ComboBoxButtonPressGradient</name> + <resource class="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"> + <name>org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient</name> </resource> - <resource class="org.richfaces.renderkit.images.ComboBoxArrowImageDisable"> - <name>org.richfaces.renderkit.images.ComboBoxArrowImageDisable</name> + <resource class="org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable"> + <name>org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable</name> </resource> - <resource class="org.richfaces.renderkit.images.ComboBoxListShadow"> - <name>org.richfaces.renderkit.images.ComboBoxListShadow</name> + <resource class="org.richfaces.renderkit.html.images.ComboBoxListShadow"> + <name>org.richfaces.renderkit.html.images.ComboBoxListShadow</name> </resource> Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-12 12:51:19 UTC (rev 6024) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-12 12:51:57 UTC (rev 6025) @@ -221,72 +221,72 @@ <u:selector name=".rich-combobox-shadow-tl"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxListShadow" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" /> </u:style> </u:selector> <u:selector name=".rich-combobox-shadow-tr"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxListShadow" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" /> </u:style> </u:selector> <u:selector name=".rich-combobox-shadow-bl"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxListShadow" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" /> </u:style> </u:selector> <u:selector name=".rich-combobox-shadow-br"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxListShadow" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" /> </u:style> </u:selector> <u:selector name=".rich-combobox-button-background"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" /> + <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> <u:selector name=".rich-combobox-button-background-disabled"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" /> + <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> <u:selector name=".rich-combobox-button-background-inactive"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" /> + <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> <u:selector name=".rich-combobox-button-pressed-background"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonPressGradient" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> <u:selector name=".rich-combobox-button-icon"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImage" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxArrowImage" /> </u:style> </u:selector> <u:selector name=".rich-combobox-button-icon-disabled"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImageDisable" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable" /> </u:style> </u:selector> <u:selector name=".rich-combobox-button-icon-inactive"> <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImage" /> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxArrowImage" /> </u:style> </u:selector> Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-02-12 12:51:19 UTC (rev 6024) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-02-12 12:51:57 UTC (rev 6025) @@ -191,7 +191,7 @@ ]]> </jsp:scriptlet> <f:resource var="spacer" name="images/spacer.gif"/> -<f:resource name="org.richfaces.renderkit.images.ComboBoxListShadow"/> +<f:resource name="org.richfaces.renderkit.html.images.ComboBoxListShadow"/> <div id="control#{clientId}" class="rich-combobox-font rich-combobox #{styleClass}" style="width:#{listWidth};#{style}" x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange"> <input id="comboboxValue#{clientId}" name="comboboxValue#{clientId}" type="hidden"/>