[richfaces-svn-commits] JBoss Rich Faces SVN: r18662 - in trunk/ui/input/ui/src/main: java/org/richfaces/renderkit and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 16 10:11:11 EDT 2010
Author: amarkhel
Date: 2010-08-16 10:11:11 -0400 (Mon, 16 Aug 2010)
New Revision: 18662
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutoComplete.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutoCompleteRendererBase.java
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.js
trunk/ui/input/ui/src/main/templates/autoComplete.template.xml
Log:
Refactor css-classes according to convention
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutoComplete.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutoComplete.java 2010-08-16 13:28:02 UTC (rev 18661)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractAutoComplete.java 2010-08-16 14:11:11 UTC (rev 18662)
@@ -81,6 +81,9 @@
@Attribute
public abstract String getFilterFunction();
+
+ @Attribute(defaultValue = "rf-au-c")
+ public abstract String getSelectedItemClass();
@Attribute
public abstract String getMode();
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-08-16 13:28:02 UTC (rev 18661)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutoCompleteRendererBase.java 2010-08-16 14:11:11 UTC (rev 18662)
@@ -75,7 +75,7 @@
Map<String, Object> options = new HashMap<String, Object>();
RendererUtils utils = getUtils();
utils.addToScriptHash(options, "buttonId", component.getClientId() + "Button");
- utils.addToScriptHash(options, "selectedItemClass", "cb_select");
+ utils.addToScriptHash(options, "selectedItemClass", attributes.get("selectedItemClass"));
utils.addToScriptHash(options, "minChars", attributes.get("minChars"), "1");
utils.addToScriptHash(options, "mode", attributes.get("mode"), "ajax");
utils.addToScriptHash(options, "filterFunction", attributes.get("filterFunction"));
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-08-16 13:28:02 UTC (rev 18661)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutoComplete.ecss 2010-08-16 14:11:11 UTC (rev 18662)
@@ -1,29 +1,29 @@
-.cb_field_width {
+.rf-au-f-w{
width: 200px;
}
-.cb_list_width {
+.rf-au-l-w{
width: 200px;
}
-.cb_list_height {
+.rf-au-l-h{
max-height: 100px;
min-height: 20px;
}
-.cb_input.cb_font, .cb_option.cb_font {
+.rf-au-i.rf-au-ft, .rf-au-o.rf-au-ft{
color: '#{richSkin.generalTextColor}';
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
}
-input.cb_input {
+input.rf-au-i {
border-width: 0px;
background: none;
width: 100%;
}
-.cb_field {
+.rf-au-f{
position: inline-block;
border-width: 1px;
border-style: solid;
@@ -35,7 +35,7 @@
background-color: '#{richSkin.controlBackgroundColor}';
}
-.cb_button {
+.rf-au-b{
background-image: "url(#{resource['org.richfaces.renderkit.html.images.AutoCompleteButtonGradient']})";
background-repeat: repeat-x;
background-position: top left;
@@ -52,7 +52,7 @@
padding-top: 1px
}
-.cb_button_arrow {
+.rf-au-b-a{
background-position: center;
background-repeat: no-repeat;
background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})";
@@ -61,13 +61,13 @@
height: 15px;
}
-.cb_list_cord {
+.rf-au-l-c{
position: absolute;
/* TODO nick - review: font-size: 0px; */
display: none;
}
-.cb_list_decoration {
+.rf-au-l-d{
border-width: 1px;
border-style: solid;
border-color: '#{richSkin.panelBorderColor}';
@@ -75,28 +75,28 @@
background-color: '#{richSkin.tableBackgroundColor}';
}
-.cb_list_scroll {
+.rf-au-l-s{
overflow: auto;
overflow-x: hidden;
}
-.cb_option {
+.rf-au-o{
padding: 2px;
white-space: nowrap;
cursor: default;
list-style-type: none;
}
-.cb_select {
+.rf-au-s{
padding: 1px;
width: 100%;
- background-color: #DFE8F6;
+ background-color: '#{richSkin.headerBackgroundColor}';
border-width: 1px;
border-style: dotted;
border-color: '#{richSkin.generalTextColor}';
}
-.cb_shadow {
+.rf-au-shw{
border: 0px solid red;
display: inline-block;
position: absolute;
@@ -106,7 +106,7 @@
left: -7px;
}
-.cb_shadow_t {
+.rf-au-shw-t{
background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})";
background-position: top left;
position: absolute;
@@ -116,7 +116,7 @@
left: 0px
}
-.cb_shadow_l {
+.rf-au-shw-l{
background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})";
background-position: bottom left;
position: absolute;
@@ -126,7 +126,7 @@
right: 6px;
}
-.cb_shadow_r {
+.rf-au-shw-r{
background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})";
background-position: bottom right;
position: absolute;
@@ -136,7 +136,7 @@
right: 0px;
}
-.cb_shadow_b {
+.rf-au-shw-b{
background-image: "url(#{resource['org.richfaces:combo_list_shadow.png']})";
background-position: right top;
position: absolute;
@@ -146,7 +146,7 @@
right: 0px;
}
-.cb_list_ul {
+.rf-au-l-ul{
margin: 0px;
padding: 0px;
}
\ No newline at end of file
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutoComplete.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutoComplete.js 2010-08-16 13:28:02 UTC (rev 18661)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutoComplete.js 2010-08-16 14:11:11 UTC (rev 18662)
@@ -87,7 +87,7 @@
var $super = rf.ui.AutoComplete.$super;
var defaultOptions = {
- selectedItemClass:'cb_select',
+ selectedItemClass:'rf-au-s',
autoFill:true,
minChars:1,
selectFirst:true,
Modified: trunk/ui/input/ui/src/main/templates/autoComplete.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/autoComplete.template.xml 2010-08-16 13:28:02 UTC (rev 18661)
+++ trunk/ui/input/ui/src/main/templates/autoComplete.template.xml 2010-08-16 14:11:11 UTC (rev 18662)
@@ -15,8 +15,8 @@
<cc:implementation>
<cdk:object type="java.lang.Object" name="disabled" value="#{component.attributes['disabled']}" />
- <div id="#{clientId}" class="cb_field_width cb_field">
- <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="cb_font cb_input" />
+ <div id="#{clientId}" class="rf-au-f-w rf-au-f">
+ <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="rf-au-ft rf-au-i" />
<div style="position : relative; overflow : hidden; text-align : left; padding-right : 21px;">
<input onclick="#{component.attributes['onclick']}"
ondblclick="#{component.attributes['ondblclick']}"
@@ -29,16 +29,16 @@
onmouseout="#{component.attributes['onmouseout']}"
onkeyup="#{component.attributes['onkeyup']}"
onkeydown="#{component.attributes['onkeydown']}"
- onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" disabled="#{disabled}" name="#{clientId}" type="text" class="cb_font cb_input" />
+ onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" disabled="#{disabled}" name="#{clientId}" type="text" class="rf-au-ft rf-au-i" />
<c:if test="#{component.attributes['showButton']}">
<c:if test="#{component.attributes['disabled']}">
- <div id="#{clientId}Button" class="cb_button">
- <div class="cb_button_arrow"></div>
+ <div id="#{clientId}Button" class="rf-au-b">
+ <div class="rf-au-b-a"></div>
</div>
</c:if>
<c:if test="#{!component.attributes['disabled']}">
- <div id="#{clientId}Button" class="cb_button">
- <div class="cb_button_arrow"></div>
+ <div id="#{clientId}Button" class="rf-au-b">
+ <div class="rf-au-b-a"></div>
</div>
</c:if>
</c:if>
@@ -56,16 +56,16 @@
onkeyup="#{component.attributes['onlistkeyup']}"
onkeydown="#{component.attributes['onlistkeydown']}"
onkeypress="#{component.attributes['onlistkeypress']}"
- id="#{clientId}List" class="cb_list_cord">
+ id="#{clientId}List" class="rf-au-l-c">
- <div class="cb_shadow">
- <div class="cb_shadow_t"></div>
- <div class="cb_shadow_l"></div>
- <div class="cb_shadow_r"></div>
- <div class="cb_shadow_b"></div>
+ <div class="rf-au-shw">
+ <div class="rf-au-shw-t"></div>
+ <div class="rf-au-shw-l"></div>
+ <div class="rf-au-shw-r"></div>
+ <div class="rf-au-shw-b"></div>
- <div class="cb_list_decoration">
- <div class="cb_list_scroll cb_list_width cb_list_height">
+ <div class="rf-au-l-d">
+ <div class="rf-au-l-s rf-au-l-w rf-au-l-h">
<cdk:body>
<cdk:call expression="encodeItemsContainer(facesContext, component)"/>
</cdk:body>
More information about the richfaces-svn-commits
mailing list