Author: abelevich Date: 2008-04-11 07:47:11 -0400 (Fri, 11 Apr 2008) New Revision: 7761 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/component/UIInplaceSelect.java trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: apply TODO, http://jira.jboss.com/jira/browse/RF-3021 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/component/UIInplaceSelect.java =================================================================== --- trunk/ui/inplaceSelect/src/main/java/org/richfaces/component/UIInplaceSelect.java 2008-04-11 11:46:07 UTC (rev 7760) +++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/component/UIInplaceSelect.java 2008-04-11 11:47:11 UTC (rev 7761) @@ -11,5 +11,5 @@ */ public abstract class UIInplaceSelect extends UISelectOne{ public static final String COMPONENT_TYPE = "org.richfaces.InplaceSelect"; - final static public String COMPONENT_FAMILY = "org.richfaces.InplaceSelect"; + public static final String COMPONENT_FAMILY = "org.richfaces.InplaceSelect"; } Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-11 11:46:07 UTC (rev 7760) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-11 11:47:11 UTC (rev 7761) @@ -44,7 +44,7 @@ variables.setVariable("fieldLabel", fieldLabel); variables.setVariable("fieldValue", fieldValue); - /*String saveIcon = (String)component.getAttributes().get("saveControlIcon"); + String saveIcon = (String)component.getAttributes().get("saveControlIcon"); if (saveIcon != null && saveIcon.length() != 0 ) { variables.setVariable("saveIcon", saveIcon); } @@ -53,13 +53,13 @@ if (cancelIcon != null && cancelIcon.length() != 0 ) { variables.setVariable("cancelIcon", cancelIcon); } - //TODO use EL exprs. + String controlClass = (String)component.getAttributes().get("controlClass"); variables.setVariable("controlClass", controlClass); String controlHoveredClass = (String)component.getAttributes().get("controlHoveredClass"); variables.setVariable("controlHoveredClass", controlHoveredClass); String controlPressedClass = (String)component.getAttributes().get("controlPressedClass"); - variables.setVariable("controlPressedClass", controlPressedClass);*/ + variables.setVariable("controlPressedClass", controlPressedClass); String layout = (String)component.getAttributes().get("layout"); if (layout != null && layout.length() != 0) { @@ -96,7 +96,7 @@ readonly="readonly" class="rich-inplace-select-field"/> <input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/> - <input id='#{clientId}inplaceValue' name='#{clientId}' type='hidden' value='#{fieldValue}'/> + <input id='#{clientId}inplaceValue' name='#{clientId' type='hidden' value='#{fieldValue}'/> <div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;"> <jsp:scriptlet> <![CDATA[ @@ -126,8 +126,19 @@ </table> </div> <div id="#{clientId}buttons" style="position : relative"> - <input id="#{clientId}ok" type="image" src="#{saveIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/> - <input id="#{clientId}cancel" type="image" src="#{cancelIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/> + <input id="#{clientId}ok" type="image" src="#{saveIcon}" + class="rich-inplace-select-control #{controlClass}" + onmousedown="this.className='rich-inplace-select-control-press #{controlPressedClass}'" + onmouseout="this.className='rich-inplace-select-control #{controlClass}'" + onmouseup="this.className='rich-inplace-select-control #{controlClass}'" + onmouseover="this.className='rich-inplace-select-control #{controlHoverClass}'"/> + <input id="#{clientId}cancel" type="image" src="#{cancelIcon}" + class="rich-inplace-select-control #{controlClass}" + onmousedown="this.className='rich-inplace-select-control-press #{controlPressedClass}''" + onmouseout="this.className='rich-inplace-select-control #{controlClass}'" + onmouseup="this.className='rich-inplace-select-control#{controlClass}'" + onmouseover="this.className='rich-inplace-select-control #{controlHoverClass}'" + /> </div> <jsp:scriptlet>