Author: abelevich Date: 2008-04-21 08:12:35 -0400 (Mon, 21 Apr 2008) New Revision: 7991 Modified: trunk/ui/combobox/src/main/templates/combobox.jspx Log: http://jira.jboss.com/jira/browse/RF-2933, http://jira.jboss.com/jira/browse/RF-2936 Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-21 12:11:52 UTC (rev 7990) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-21 12:12:35 UTC (rev 7991) @@ -11,7 +11,8 @@ component="org.richfaces.component.UIComboBox"> <jsp:directive.page import="org.richfaces.component.util.HtmlUtil" /> - <jsp:directive.page import=" java.util.List"/> + <jsp:directive.page import="java.util.List"/> + <jsp:directive.page import="org.ajax4jsf.renderkit.compiler.TemplateContext"/> <h:styles>css/combobox.xcss</h:styles> <h:scripts> @@ -181,19 +182,19 @@ String buttonIcon = (String)component.getAttributes().get("buttonIcon"); if (!"".equals(buttonIcon)) { - buttonIcon = "url('" + buttonIcon + "')"; + buttonIcon = "url('" + getResource(buttonIcon).getUri(context, component) + "')"; } variables.setVariable("buttonIcon", buttonIcon); String buttonIconDisabled = (String)component.getAttributes().get("buttonIconDisabled"); if (!"".equals(buttonIconDisabled)) { - buttonIconDisabled = "url('" + buttonIconDisabled + "')"; + buttonIconDisabled = "url('" + getResource(buttonIconDisabled).getUri(context, component) + "')"; } variables.setVariable("buttonIconDisabled", buttonIconDisabled); String buttonIconInactive = (String)component.getAttributes().get("buttonIconInactive"); if (!"".equals(buttonIconInactive)) { - buttonIconInactive = "url('" + buttonIconInactive + "')"; + buttonIconInactive = "url('" + getResource(buttonIconInactive).getUri(context, component) + "')"; } variables.setVariable("buttonIconInactive", buttonIconInactive); variables.setVariable("enableManualInput", !component.isEnableManualInput()); @@ -223,7 +224,7 @@ type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/> - <input id="#{clientId}comboboxButton" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" + <input id="#{clientId}comboboxButton" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconInactive};" class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/> <div class="rich-combobox-strut rich-combobox-font" style="width:#{correction}">Strut</div> </div>