Author: abelevich Date: 2008-02-19 10:34:30 -0500 (Tue, 19 Feb 2008) New Revision: 6171 Modified: trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: fix exception Modified: trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java =================================================================== --- trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-02-19 15:09:26 UTC (rev 6170) +++ trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-02-19 15:34:30 UTC (rev 6171) @@ -112,21 +112,21 @@ return UIInplaceSelect.class; } - public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) { - String event = (String) component.getAttributes().get(attributeName); - ScriptString result = JSReference.NULL; - - if (event != null) { - event = event.trim(); - - if (event.length() != 0) { - JSFunctionDefinition function = new JSFunctionDefinition(); - function.addParameter("event"); - function.addToBody(event); - - result = function; - } - } - return ScriptUtils.toScript(result); - } +// public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) { +// String event = (String) component.getAttributes().get(attributeName); +// ScriptString result = JSReference.NULL; +// +// if (event != null) { +// event = event.trim(); +// +// if (event.length() != 0) { +// JSFunctionDefinition function = new JSFunctionDefinition(); +// function.addParameter("event"); +// function.addToBody(event); +// +// result = function; +// } +// } +// return ScriptUtils.toScript(result); +// } } Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss =================================================================== --- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-19 15:09:26 UTC (rev 6170) +++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-19 15:34:30 UTC (rev 6171) @@ -10,21 +10,24 @@ body{padding : 30px;} fieldset{padding : 30px; border : 1px solid #c0c0c0;} legend{font-weight : bold} - .insel_default_state{white-space : nowrap; background-color : #f1f1f1/*editorBackgroundColor*/; border-bottom : 1px dashed #000000/*generalTextColor*/; padding-left : 3px; padding-right : 3px;} -.insel_changed_state{background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;} +.insel_changed_state{background-position : top left; background-repeat : no-repeat;} .insel_edit_state{position : relative; width : 100px;} -.insel_field{background : #FBFF8E/*editBackgroundColor*/; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; position : absolute; top:0px; left : 0px;background-image:url(images/mark_list.gif); background-position : center right; background-repeat : no-repeat;} +.insel_field{background : #FBFF8E/*editBackgroundColor*/; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; position : absolute; top:0px; left : 0px; background-position : center right; background-repeat : no-repeat;} .insel_strut{width : 100px; height : 1px} .insel_btn{ - background : url(images/bg_btn.png) top repeat-x #C7D7EC; /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/ + background-position : top; + background-repeat: repeat-x; + background-color: #C7D7EC; /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/ border : 1px outset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} .insel_btn_press{ - background : url(images/bg_press.png) top repeat-x #C7D7EC; /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/ + background-position: top; + background-repeat: repeat-x; + background-color: #C7D7EC; /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/ border : 1px inset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} @@ -33,10 +36,6 @@ .insel_btn_set{ position : absolute; top:0px; left : 112px; white-space : nowrap} .insel_shadow{ top:0; left:0; position : absolute;} .insel_shadow_size{ width : 34px; height : 16px;} -.insel_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;} -.insel_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;} -.insel_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;} -.insel_shadow_br{ background : url(images/bg_shadow.png) repeat-x bottom right;} .cb_list_cord{ position : relative; font-size : 0px;d!isplay : none}/*DDL is hidden!!!!!*/ .cb_list_scroll{ overflow : auto; height : 100px;} .cb_list_position{ position : absolute; top:1px; left:0px;} @@ -46,11 +45,124 @@ .cb_font{ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/} .cb_select{ padding : 1px; background-color: #4a75b5; border : 1px dotted #4a75b5; color: white;/*generalTextColor*/} -.cb_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;} -.cb_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;} -.cb_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;} -.cb_shadow_br{ background : url(images/bg_shadow.png) repeat-x bottom right;} +.insel_shadow_tl{ + background-repeat: repeat-x; + background-position : top left; +} + +.insel_shadow_tr{ + background-repeat: repeat-x; + background-position : top right; +} + +.insel_shadow_bl{ + background-repeat: repeat-x; + background-position : bottom left; +} + +.insel_shadow_br{ + background-repeat: repeat-x; + background-position : bottom right; +} + +.cb_shadow_tl{ + background-repeat: repeat-x; + background-position: top left; +} + +.cb_shadow_tr{ + background-repeat: repeat-x; + background-position: top right; +} +.cb_shadow_bl{ + background-repeat : repeat-x + background-position: bottom left; +} + +.cb_shadow_br{ + background-repeat : repeat-x; + background-position : bottom right; +} ]]> </f:verbatim> - + <u:selector name=".insel_changed_state"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.EditIcon"/> + </u:style> + </u:selector> + + <u:selector name=".insel_field"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonDown"/> + </u:style> + </u:selector> + + + <u:selector name=".insel_shadow_tl"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".cb_shadow_tr"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".cb_shadow_bl"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".cb_shadow_br"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".insel_shadow_tl"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".insel_shadow_tr"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".insel_shadow_bl"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".insel_shadow_br"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/> + </u:style> + </u:selector> + + <u:selector name=".insel_btn"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient"/> + </u:style> + </u:selector> + + <u:selector name=".insel_btn_press"> + <u:style name="background-image"> + <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"/> + </u:style> + </u:selector> + + + + + + + + </f:template> \ No newline at end of file Modified: trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-19 15:09:26 UTC (rev 6170) +++ trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-19 15:34:30 UTC (rev 6171) @@ -21,6 +21,8 @@ <f:clientid var="clientId" /> +<f:resource var="saveIcon" name="org.richfaces.renderkit.html.images.saveControlIcon"/> +<f:resource var="cancelIcon" name="org.richfaces.renderkit.html.images.CancelControlIcon"/> <f:resource var="spacer" name="images/spacer.gif"/> <span id="#{clientId}" class="insel_edit_state"> @@ -50,8 +52,8 @@ </table> </div> <div style="position : relative"> - <input type="image" src="images/ico_ok.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"/> - <input type="image" src="images/ico_cancel.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"/> + <input type="image" src="#{saveIcon}" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"/> + <input type="image" src="#{cancelIcon}" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"/> </div> </div>