Author: Alex.Kolonitsky Date: 2011-03-12 11:46:18 -0500 (Sat, 12 Mar 2011) New Revision: 22184 Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml Log: RF-10692 Inplace Select with controls - rendered wrong - reviewed by Pavel Yaschenko Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss =================================================================== --- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-03-12 16:46:18 UTC (rev 22184) @@ -113,9 +113,15 @@ position: relative; padding : 6px 6px 6px 6px; top : -6px; - right : -6px; + left : -6px; } +.rf-ii-btn-cntr { + position : relative; + display: block; + font-size: 0px; +} + .rf-ii-btn-shdw-t { background-position : left top; background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss =================================================================== --- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-03-12 16:46:18 UTC (rev 22184) @@ -176,6 +176,12 @@ left : -6px; } +.rf-is-btn-cntr { + position : relative; + display: block; + font-size: 0px; +} + .rf-is-shdw-t { display : block; background-image : "url(#{resource['org.richfaces:bg_shadow.png']})"; Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 16:46:18 UTC (rev 22184) @@ -59,13 +59,13 @@ <c:if test="#{component.attributes['showControls']}"> <span class="rf-ii-btn-prepos"> <span class="rf-ii-btn-pos"> - <span id="#{clientId}Btnshadow" class="rf-ii-btn-shadow"> + <span id="#{clientId}Btnshadow" class="rf-ii-btn-shdw"> <span class="rf-ii-btn-shdw-t"></span> <span class="rf-ii-btn-shdw-l"></span> <span class="rf-ii-btn-shdw-r"></span> <span class="rf-ii-btn-shdw-b"></span> - <span id="#{clientId}Btn" style="position : relative"> + <span id="#{clientId}Btn" class="rf-ii-btn-cntr"> <input type="image" id="#{clientId}Okbtn" src="#{getResourcePath(facesContext, 'org.richfaces', 'ico_ok.gif')}" @@ -78,7 +78,6 @@ class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" tabindex="-1" /> - <br /> </span> </span> </span> Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 16:46:18 UTC (rev 22184) @@ -64,16 +64,15 @@ <span class="rf-is-shdw-r"></span> <span class="rf-is-shdw-b"></span> - <span id="#{clientId}Btn" style="position : relative;"> + <span id="#{clientId}Btn" class="rf-is-btn-cntr"> <input type="image" id="#{clientId}Okbtn" src="#{getResourcePath(facesContext, 'org.richfaces', 'ico_ok.gif')}" class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" /> - <input type="image" id="#{clientId}Cancelbtn" + <input type="image" id="#{clientId}Cancelbtn" src="#{getResourcePath(facesContext,'org.richfaces', 'ico_cancel.gif')}" class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" /> - <br /> </span> </span> </span> Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-03-12 16:46:18 UTC (rev 22184) @@ -9,12 +9,12 @@ style="width: 100%;" type="text" /> <span class="rf-ii-btn-prepos"> <span class="rf-ii-btn-pos"> - <span class="rf-ii-btn-shadow" id="form:inplaceInputWithControlsBtnshadow"> + <span class="rf-ii-btn-shdw" id="form:inplaceInputWithControlsBtnshadow"> <span class="rf-ii-btn-shdw-t"></span> <span class="rf-ii-btn-shdw-l"></span> <span class="rf-ii-btn-shdw-r"></span> <span class="rf-ii-btn-shdw-b"></span> - <span id="form:inplaceInputWithControlsBtn" style="position : relative" tabindex="-1"> + <span id="form:inplaceInputWithControlsBtn" class="rf-ii-btn-cntr" tabindex="-1"> <input class="rf-ii-btn" id="form:inplaceInputWithControlsOkbtn" onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" @@ -27,7 +27,6 @@ src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" tabindex="-1" /> - <br /> </span> </span> </span> Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-03-12 14:09:15 UTC (rev 22183) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-03-12 16:46:18 UTC (rev 22184) @@ -11,10 +11,9 @@ <span class="rf-is-shdw-l"></span> <span class="rf-is-shdw-r"></span> <span class="rf-is-shdw-b"></span> - <span id="form:inplaceSelectWithControlsBtn" style="position : relative;" tabindex="-1"> + <span id="form:inplaceSelectWithControlsBtn" class="rf-is-btn-cntr" tabindex="-1"> <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" /> <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" /> - <br /> </span> </span> </span>