Author: amarkhel Date: 2010-09-21 15:44:36 -0400 (Tue, 21 Sep 2010) New Revision: 19294 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss trunk/ui/input/ui/src/main/templates/autocomplete.template.xml Log: RF-RF-9301 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java 2010-09-21 19:44:36 UTC (rev 19294) @@ -64,7 +64,7 @@ public void encodeItem(FacesContext facesContext, UIComponent component) throws IOException { ResponseWriter writer = facesContext.getResponseWriter(); encodeItemBegin(facesContext, component); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-option rf-au-font rf-au-input", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-opt rf-au-fnt rf-au-inp", null); for (UIComponent child : component.getChildren()) { child.encodeAll(facesContext); } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java 2010-09-21 19:44:36 UTC (rev 19294) @@ -43,7 +43,7 @@ public void encodeItem(FacesContext facesContext, UIComponent component) throws IOException { ResponseWriter writer = facesContext.getResponseWriter(); encodeItemBegin(facesContext, component); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-option rf-au-font rf-au-input", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-opt rf-au-fnt rf-au-inp", null); for (UIComponent child : component.getChildren()) { child.encodeAll(facesContext); } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-21 19:44:36 UTC (rev 19294) @@ -256,7 +256,7 @@ } else { if (item != null) { strategy.encodeItemBegin(facesContext, comboBox); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-option rf-au-font rf-au-input", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-opt rf-au-fnt rf-au-inp", null); // TODO nick - use converter String value = null; if (comboBox.getItemConverter() != null) { Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java 2010-09-21 19:44:36 UTC (rev 19294) @@ -62,7 +62,7 @@ for (UIComponent child : component.getChildren()) { if (child instanceof UIColumn) { encodeItemChildBegin(facesContext, component); - writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-option rf-au-font rf-au-input", null); + writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-opt rf-au-fnt rf-au-inp", null); child.encodeAll(facesContext); encodeItemChildEnd(facesContext, component); } 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 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2010-09-21 19:44:36 UTC (rev 19294) @@ -1,29 +1,18 @@ -.rf-au-field-width{ - width: 200px; -} -.rf-au-list-width{ - width: 200px; -} - -.rf-au-list-height{ - max-height: 100px; - min-height: 20px; -} - -.rf-au-input.rf-au-font, .rf-au-option.rf-au-font{ +.rf-au-inp.rf-au-fnt, .rf-au-opt.rf-au-fnt{ color: '#{richSkin.generalTextColor}'; font-size: '#{richSkin.generalSizeFont}'; font-family: '#{richSkin.generalFamilyFont}'; } -input.rf-au-input { +input.rf-au-inp { border-width: 0px; background: none; width: 100%; } -.rf-au-field{ +.rf-au-fld{ + width: 200px; position: inline-block; border-width: 1px; border-style: solid; @@ -35,7 +24,7 @@ background-color: '#{richSkin.controlBackgroundColor}'; } -.rf-au-button{ +.rf-au-btn{ background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutocompleteButtonGradient']})"; background-repeat: repeat-x; background-position: top left; @@ -52,7 +41,7 @@ padding-top: 1px } -.rf-au-button-arrow{ +.rf-au-btn-arrow{ background-position: center; background-repeat: no-repeat; background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})"; @@ -61,13 +50,13 @@ height: 15px; } -.rf-au-list-cord{ +.rf-au-lst-cord{ position: absolute; /* TODO nick - review: font-size: 0px; */ display: none; } -.rf-au-list-decoration{ +.rf-au-lst-dcrtn{ border-width: 1px; border-style: solid; border-color: '#{richSkin.panelBorderColor}'; @@ -75,28 +64,22 @@ background-color: '#{richSkin.tableBackgroundColor}'; } -.rf-au-list-scroll{ +.rf-au-lst-scrl{ overflow: auto; overflow-x: hidden; + width: 200px; + max-height: 100px; + min-height: 20px; } -.rf-au-option{ +.rf-au-opt{ padding: 2px; white-space: nowrap; cursor: default; list-style-type: none; } -.rf-au-select{ - padding: 1px; - width: 100%; - background-color: '#{richSkin.headerBackgroundColor}'; - border-width: 1px; - border-style: dotted; - border-color: '#{richSkin.generalTextColor}'; -} - -.rf-au-shadow{ +.rf-au-shdw{ border: 0px solid red; display: inline-block; position: absolute; @@ -106,7 +89,7 @@ left: -7px; } -.rf-au-shadow-t{ +.rf-au-shdw-t{ background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})"; background-position: top left; position: absolute; @@ -116,7 +99,7 @@ left: 0px } -.rf-au-shadow-l{ +.rf-au-shdw-l{ background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})"; background-position: bottom left; position: absolute; @@ -126,7 +109,7 @@ right: 6px; } -.rf-au-shadow-r{ +.rf-au-shdw-r{ background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})"; background-position: bottom right; position: absolute; @@ -136,7 +119,7 @@ right: 0px; } -.rf-au-shadow-b{ +.rf-au-shdw-b{ background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})"; background-position: right top; position: absolute; @@ -146,7 +129,7 @@ right: 0px; } -.rf-au-list-ul{ +.rf-au-lst-ul{ margin: 0px; padding: 0px; } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2010-09-21 17:41:11 UTC (rev 19293) +++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2010-09-21 19:44:36 UTC (rev 19294) @@ -15,8 +15,8 @@ <cc:implementation> <cdk:object type="java.lang.Object" name="disabled" value="#{component.attributes['disabled']}" /> - <div id="#{clientId}" class="rf-au-field-width rf-au-field"> - <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="rf-au-font rf-au-input" /> + <div id="#{clientId}" class="rf-au-fld"> + <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="rf-au-fnt rf-au-inp" /> <div style="position : relative; overflow : hidden; text-align : left; padding-right : 21px;"> <input onclick="#{component.attributes['onclick']}" ondblclick="#{component.attributes['ondblclick']}" @@ -27,16 +27,16 @@ onmouseout="#{component.attributes['onmouseout']}" onkeyup="#{component.attributes['onkeyup']}" onkeydown="#{component.attributes['onkeydown']}" - onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" value="#{component.attributes['value']}" disabled="#{disabled}" name="#{clientId}" type="text" class="rf-au-font rf-au-input" autocomplete="off"/> + onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" value="#{component.attributes['value']}" disabled="#{disabled}" name="#{clientId}" 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-button"> - <div class="rf-au-button-arrow"></div> + <div id="#{clientId}Button" class="rf-au-btn"> + <div class="rf-au-btn-arrow"></div> </div> </c:if> <c:if test="#{!component.attributes['disabled']}"> - <div id="#{clientId}Button" class="rf-au-button"> - <div class="rf-au-button-arrow"></div> + <div id="#{clientId}Button" class="rf-au-btn"> + <div class="rf-au-btn-arrow"></div> </div> </c:if> </c:if> @@ -52,16 +52,16 @@ onkeyup="#{component.attributes['onlistkeyup']}" onkeydown="#{component.attributes['onlistkeydown']}" onkeypress="#{component.attributes['onlistkeypress']}" - id="#{clientId}List" class="rf-au-list-cord"> + id="#{clientId}List" class="rf-au-lst-cord"> - <div class="rf-au-shadow"> - <div class="rf-au-shadow-t"></div> - <div class="rf-au-shadow-l"></div> - <div class="rf-au-shadow-r"></div> - <div class="rf-au-shadow-b"></div> + <div class="rf-au-shdw"> + <div class="rf-au-shdw-t"></div> + <div class="rf-au-shdw-l"></div> + <div class="rf-au-shdw-r"></div> + <div class="rf-au-shdw-b"></div> - <div class="rf-au-list-decoration"> - <div class="rf-au-list-scroll rf-au-list-width rf-au-list-height"> + <div class="rf-au-lst-dcrtn"> + <div class="rf-au-lst-scrl"> <cdk:body> <cdk:call expression="encodeItemsContainer(facesContext, component)"/> </cdk:body>