Author: abelevich Date: 2008-02-27 11:26:10 -0500 (Wed, 27 Feb 2008) New Revision: 6382 Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/component/UIInplaceInput.java trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx Log: css fix Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-27 16:23:24 UTC (rev 6381) +++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-27 16:26:10 UTC (rev 6382) @@ -83,14 +83,14 @@ <defaultvalue><![CDATA["click"]]></defaultvalue> </property> <property> - <name>controlsPosition</name> + <name>controlsVerticalPosition</name> <classname>java.lang.String</classname> <description></description> - <defaultvalue><![CDATA["center"]]></defaultvalue> + <defaultvalue><![CDATA["bottom"]]></defaultvalue> </property> <property> - <name>controlsHorizontalAlign</name> + <name>controlsHorizontalPosition</name> <classname>java.lang.String</classname> <description></description> <defaultvalue><![CDATA["right"]]></defaultvalue> Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/component/UIInplaceInput.java =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/component/UIInplaceInput.java 2008-02-27 16:23:24 UTC (rev 6381) +++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/component/UIInplaceInput.java 2008-02-27 16:26:10 UTC (rev 6382) @@ -23,7 +23,7 @@ public abstract String getDefaultLabel(); public abstract void setDefaultLabel(String label); - + } \ No newline at end of file Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 16:23:24 UTC (rev 6381) +++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-27 16:26:10 UTC (rev 6382) @@ -50,7 +50,7 @@ private static final String INPLACE_CSS_EDITABLE = "edit"; - private static final String INPLACE_CSS_CHANGE = "change"; + private static final String INPLACE_CSS_CHANGE = "changed"; private static final String INPLACE_CSS_HOVER = "hover"; @@ -120,11 +120,11 @@ options.addOption("applyFromControlsOnly"); options.addOption("editEvent"); options.addOption("selectOnEdit"); - options.addOption("verticalPosition"); - options.addOption("horizontalPosition"); + options.addOption("verticalPosition", component.getAttributes().get("controlsVerticalPosition")); + options.addOption("horizontalPosition", component.getAttributes().get("controlsHorizontalPosition")); options.addOption("inputWidth"); - options.addOption("inputMinWidth"); - options.addOption("inputMaxWidth"); + options.addOption("minInputWidth"); + options.addOption("maxInputWidth"); attributes.append(options.toScript()); return attributes.toString(); Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-27 16:23:24 UTC (rev 6381) +++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-27 16:26:10 UTC (rev 6382) @@ -9,7 +9,7 @@ .rich-inplace { } - .rich-inplace-change { + .rich-inplace-changed { background-position:left top; background-repeat:no-repeat; } @@ -36,7 +36,7 @@ color: blue; } - .rich-inplace-input-change-hover { + .rich-inplace-input-changed-hover { border: thin solid blue; } @@ -45,7 +45,7 @@ position: absolute; } - .rich-inplace-button { + .rich-inplace-controls { background-position: top; background-repeat: repeat-x; border-width : 1px; @@ -54,7 +54,7 @@ margin : 0px; } - .rich-inplace-button-press { + .rich-inplace-controls-press { background-position: top; background-repeat: repeat-x; border-width: 1px; @@ -63,7 +63,7 @@ margin : 0px; } - .rich-inplace-input-button-set { + .rich-inplace-input-controls-set { white-space : nowrap; } @@ -107,7 +107,7 @@ </u:style> </u:selector> - <u:selector name=".rich-inplace-button"> + <u:selector name=".rich-inplace-control"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient"/> </u:style> @@ -115,7 +115,7 @@ <u:style name="border-color" skin="panelBorderColor"/> </u:selector> - <u:selector name=".rich-inplace-button-press"> + <u:selector name=".rich-inplace-control-press"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"/> </u:style> Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-27 16:23:24 UTC (rev 6381) +++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-27 16:26:10 UTC (rev 6382) @@ -86,7 +86,7 @@ /> <input id='#{clientId}value' name='#{clientId}value' type='hidden' value='#{fieldValue}'/> - <div id="#{clientId}bar" class="rich-inplace-input-button-set" style="display:none;"> + <div id="#{clientId}bar" class="rich-inplace-input-controls-set" style="display:none;"> <jsp:scriptlet> <![CDATA[ if (isControlsFacetExists(context, component)) { @@ -118,19 +118,19 @@ </div> <div id="#{clientId}buttons" style="position:relative;"> - <input id='#{clientId}ok' class='rich-inplace-button #{controlClass}' + <input id='#{clientId}ok' class='rich-inplace-control #{controlClass}' type='image' - onmouseup="this.className='rich-inplace-button #{controlClass}'" - onmouseout="this.className='rich-inplace-button #{controlClass}'" - onmousedown="this.className='rich-inplace-button-press #{controlPressedClass}'" - onmouseover="this.className='rich-inplace-button #{controlHoveredClass}'" + onmouseup="this.className='rich-inplace-control #{controlClass}'" + onmouseout="this.className='rich-inplace-control #{controlClass}'" + onmousedown="this.className='rich-inplace-control-press #{controlPressedClass}'" + onmouseover="this.className='rich-inplace-control #{controlHoveredClass}'" src='#{saveIcon}'/> - <input id='#{clientId}cancel' class='rich-inplace-button #{controlClass}' + <input id='#{clientId}cancel' class='rich-inplace-control #{controlClass}' type='image' - onmouseup="this.className='rich-inplace-button #{controlClass}'" - onmouseout="this.className='rich-inplace-button #{controlClass}'" - onmousedown="this.className='rich-inplace-button-press #{controlPressedClass}'" - onmouseover="this.className='rich-inplace-button #{controlHoveredClass}'" + onmouseup="this.className='rich-inplace-control #{controlClass}'" + onmouseout="this.className='rich-inplace-control #{controlClass}'" + onmousedown="this.className='rich-inplace-control-press #{controlPressedClass}'" + onmouseover="this.className='rich-inplace-control #{controlHoveredClass}'" src='#{cancelIcon}'/> </div> <jsp:scriptlet>