Author: konstantin.mishin Date: 2011-02-09 12:55:54 -0500 (Wed, 09 Feb 2011) New Revision: 21575 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss trunk/ui/input/ui/src/main/templates/autocomplete.template.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml Log: RF-10389 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-09 17:23:35 UTC (rev 21574) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-02-09 17:55:54 UTC (rev 21575) @@ -5,15 +5,18 @@ } input.rf-au-inp { - border-width: 0px; - width: 100%; - padding-left: 0px; - padding-right: 0px; + background-color: '#{richSkin.controlBackgroundColor}'; + background-image: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}"); + background-position:1px 1px; + background-repeat:no-repeat; + border: 0px; + margin: 0px; + padding: 0px; + vertical-align: top; + width: 182px; } .rf-au-fld{ - width: 200px; - position: inline-block; border-width: 1px; border-style: solid; border-color: '#{richSkin.panelBorderColor}'; @@ -25,7 +28,9 @@ } .rf-au-fld-btn{ - position : relative; overflow : hidden; text-align : left; padding-right : 21px; + display: inline-block; + font-size: 1px; + white-space: nowrap; } .rf-au-btn{ @@ -33,38 +38,26 @@ background-repeat: repeat-x; background-position: top left; background-color: '#{richSkin.headerBackgroundColor}'; - text-align: center; - border-left-style: solid; border-left-width: 1px; + border-left-style: solid; border-left-color: '#{richSkin.panelBorderColor}'; - width: 15px; - position: absolute; - top: 0px; - right: 0px; - height: 15px; - padding-top: 1px; - cursor: pointer; + display: inline-block; + vertical-align: top; } -.rf-au-btn-dis{ - background-color: '#{richSkin.headerBackgroundColor}'; - cursor: default; -} - -.rf-au-btn-arrow{ +.rf-au-btn-arrow, .rf-au-btn-arrow-dis{ background-position: center; background-repeat: no-repeat; - background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDownButton']})"; + background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})"; + cursor: pointer; width: 15px; - height: 15px; + height: 16px; + display: inline-block; } .rf-au-btn-arrow-dis{ - background-position: center; - background-repeat: no-repeat; background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDisabledDownButton']})"; - width: 15px; - height: 15px; + cursor: default; } .rf-au-lst-cord{ Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-02-09 17:23:35 UTC (rev 21574) +++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-02-09 17:55:54 UTC (rev 21575) @@ -19,7 +19,7 @@ <cdk:object type="java.lang.Object" name="disabled" value="#{component.attributes['disabled']}" /> <div id="#{clientId}" class="rf-au-fld"> <input id="#{clientId}Value" name="#{clientId}Value" type="hidden"/> - <div class="#{component.attributes['showButton'] ? 'rf-au-fld-btn' : ''}"> + <span class="#{component.attributes['showButton'] ? 'rf-au-fld-btn' : ''}"> <input onclick="#{component.attributes['onclick']}" ondblclick="#{component.attributes['ondblclick']}" onmouseup="#{component.attributes['onmouseup']}" @@ -31,18 +31,11 @@ onkeydown="#{component.attributes['onkeydown']}" onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" value="#{component.attributes['value']}" disabled="#{disabled}" name="#{clientId}Input" type="text" class="rf-au-fnt rf-au-inp" autocomplete="off"/> <c:if test="#{component.attributes['showButton']}"> - <c:if test="#{component.attributes['disabled']}"> - <div id="#{clientId}Button" class="rf-au-btn rf-au-btn-dis"> - <div class="rf-au-btn-arrow-dis"></div> - </div> + <span id="#{clientId}Button" class="rf-au-btn"> + <span class="rf-au-btn-arrow#{component.attributes['disabled'] ? '-dis' : ''}"></span> + </span> </c:if> - <c:if test="#{!component.attributes['disabled']}"> - <div id="#{clientId}Button" class="rf-au-btn"> - <div class="rf-au-btn-arrow"></div> - </div> - </c:if> - </c:if> - </div> + </span> <div onclick="#{component.attributes['onlistclick']}" ondblclick="#{component.attributes['onlistdblclick']}" Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml 2011-02-09 17:23:35 UTC (rev 21574) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteDivLayoutClientMode.xmlunit.xml 2011-02-09 17:55:54 UTC (rev 21575) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <div class="rf-au-fld" id="form:myAutocomplete"> <input id="form:myAutocompleteValue" name="form:myAutocompleteValue" type="hidden"/> - <div class="rf-au-fld-btn"> + <span class="rf-au-fld-btn"> <input autocomplete="off" class="rf-au-fnt rf-au-inp" id="form:myAutocompleteInput" name="form:myAutocomplete" type="text"/> - <div class="rf-au-btn" id="form:myAutocompleteButton"> - <div class="rf-au-btn-arrow"> - </div> - </div> - </div> + <span class="rf-au-btn" id="form:myAutocompleteButton"> + <span class="rf-au-btn-arrow"> + </span> + </span> + </span> <div class="rf-au-lst-cord" id="form:myAutocompleteList"> <div class="rf-au-shdw"> <div class="rf-au-shdw-t"> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml 2011-02-09 17:23:35 UTC (rev 21574) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/autocompleteListLayoutClientMode.xmlunit.xml 2011-02-09 17:55:54 UTC (rev 21575) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <div class="rf-au-fld" id="form:myAutocomplete"> <input id="form:myAutocompleteValue" name="form:myAutocompleteValue" type="hidden"/> - <div class="rf-au-fld-btn"> + <span class="rf-au-fld-btn"> <input autocomplete="off" class="rf-au-fnt rf-au-inp" id="form:myAutocompleteInput" name="form:myAutocomplete" type="text"/> - <div class="rf-au-btn" id="form:myAutocompleteButton"> - <div class="rf-au-btn-arrow"> - </div> - </div> - </div> + <span class="rf-au-btn" id="form:myAutocompleteButton"> + <span class="rf-au-btn-arrow"> + </span> + </span> + </span> <div class="rf-au-lst-cord" id="form:myAutocompleteList"> <div class="rf-au-shdw"> <div class="rf-au-shdw-t">