5:03 p.m.
Author: abelevich
Date: 2010-10-08 11:03:43 -0400 (Fri, 08 Oct 2010)
New Revision: 19506
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
Log:
rename css according richfaces css names convention
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2010-10-08
14:29:46 UTC (rev 19505)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2010-10-08
15:03:43 UTC (rev 19506)
@@ -120,8 +120,8 @@
@Override
public void addToOptions(FacesContext facesContext, UIComponent component,
Map<String, Object> options, Object additional) {
- options.put(OPTIONS_ITEM_CLASS, "insel_option");
- options.put(OPTIONS_SELECT_ITEM_CLASS, "insel_select");
+ options.put(OPTIONS_ITEM_CLASS, "rf-is-opt");
+ options.put(OPTIONS_SELECT_ITEM_CLASS, "rf-is-sel");
String clientId = component.getClientId(facesContext);
options.put(OPTIONS_LIST_CORD, clientId + "List");
options.put(OPTIONS_ITEMS_CORD, clientId + "Items");
@@ -192,15 +192,15 @@
}
public String getReadyStateCss() {
- return "insel_default_state";
+ return "rf-is-d-s";
}
public String getEditStateCss() {
- return "insel_edit_state";
+ return "rf-is-e-s";
}
public String getChangedStateCss() {
- return "insel_changed_state";
+ return "rf-is-c-s";
}
public String getNoneCss() {
@@ -208,7 +208,7 @@
}
public String getOptionCss() {
- return "insel_option insel_font";
+ return "rf-is-opt rf-is-fnt";
}
}
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-10-08
14:29:46 UTC (rev 19505)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-10-08
15:03:43 UTC (rev 19506)
@@ -1,4 +1,4 @@
-input.rf-ii-f {
+input.rf-ii-fld {
background-image: none;
background-color : '#{richSkin.editBackgroundColor}';
/*TODO: seems these styles are incorrect*/
@@ -46,7 +46,7 @@
width: 100%;
}
-.rf-ii-f {
+.rf-ii-fld {
background-color : '#{richSkin.editBackgroundColor}';
border-bottom-width : 10px;
border-bottom-style: solid;
@@ -110,7 +110,7 @@
white-space : nowrap;
}
-.rf-ii-btn-shadow {
+.rf-ii-btn-shdw {
display: inline-block;
position: relative;
padding : 6px 6px 6px 6px;
@@ -118,7 +118,7 @@
right : -6px;
}
-.rf-ii-btn-shadow-t {
+.rf-ii-btn-shdw-t {
background-position : left top;
background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
background-attachment: scroll;
@@ -131,7 +131,7 @@
left : 0px
}
-.rf-ii-btn-shadow-l {
+.rf-ii-btn-shdw-l {
background-position : left bottom;
background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
background-attachment: scroll;
@@ -144,7 +144,7 @@
right : 6px;
}
-.rf-ii-btn-shadow-r {
+.rf-ii-btn-shdw-r {
background-position : right bottom;
background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
background-attachment: scroll;
@@ -157,7 +157,7 @@
right: 0px;
}
-.rf-ii-btn-shadow-b {
+.rf-ii-btn-shdw-b {
background-position : right top;
background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
background-attachment: scroll;
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-08
14:29:46 UTC (rev 19505)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-08
15:03:43 UTC (rev 19506)
@@ -1,4 +1,4 @@
-input.insel_field {
+input.rf-is-fld {
background : '#{richSkin.editBackgroundColor}';
padding : 0px 0px 0px 0px;
border : 0px;
@@ -12,13 +12,17 @@
}
.rf-is-none {
- clip:rect(0px, 0px, 1px, 1px);
+ clip: "rect(0px 0px 1px 1px)";
}
-.insel_font {
+.rf-is-none {
+ clip: rect(0px, 0px, 1px, 1px);
}
-.insel_default_state {
+.rf-is-fnt {
+}
+
+.rf-is-d-s {
display : inline-block;
position : relative;
white-space : nowrap;
@@ -30,14 +34,14 @@
padding-right : 3px;
}
-.insel_changed_state {
+.rf-is-c-s {
display : inline-block;
background-image :
"url(#{resource['org.richfaces:mark_changed.gif']})";
background-position : top left;
background-repeat : no-repeat;
}
-.insel_edit_state{
+.rf-is-e-s {
position : absolute;
top : 0px;
left : 0px;
@@ -45,7 +49,7 @@
background-color : '#{richSkin.editBackgroundColor}';
}
-.insel_field {
+.rf-is-fld {
background-color : '#{richSkin.editBackgroundColor}';
padding : 0px 0px 0px 0px;
border : 0px;
@@ -56,7 +60,7 @@
background-repeat : no-repeat;
}
-.insel_btn {
+.rf-is-btn {
background-image :
"url(#{resource['org.richfaces.renderkit.html.images.InplaceComponentButtonGradientImage']})";
background-position : top;
background-repeat: repeat-x;
@@ -68,7 +72,7 @@
margin : 0px;
}
-.insel_btn_press {
+.rf-is-btn-p {
background-image :
"url(#{resource['org.richfaces.renderkit.html.images.InplaceComponentPressButtonGradientImage']})";
background-position : top;
background-repeat : repeat-x;
@@ -80,14 +84,14 @@
margin : 0px;
}
-.insel_btn_set {
+.rf-is-btn-set {
position : absolute;
top : 0px;
left : 112px;
white-space : nowrap;
}
-.insel_list_cord {
+.rf-is-lst-cord {
display : block;
/*font-size : 0px;*/
position : relative;
@@ -95,14 +99,14 @@
font-size : inherit;
}
-.insel_list_position {
+.rf-is-lst-pos {
display : block;
position : absolute;
top: 0px;
left: -1px;
}
-.insel_list_decoration {
+.rf-is-lst-dec {
display : block;
border-width : 1px;
border-style : solid;
@@ -112,14 +116,14 @@
background-color : '#{richSkin.editBackgroundColor}';
}
-.insel_list_scroll {
+.rf-is-lst-scrl {
display : block;
overflow : auto;
overflow-x : hidden;
/*height : 100px;*/
}
-.insel_option {
+.rf-is-opt {
display : block;
padding : 2px;
white-space : nowrap;
@@ -127,7 +131,7 @@
cursor : default;
}
-.insel_select {
+.rf-is-sel {
display : block;
padding : 1px;
background-color: #DFE8F6; /*get from skin???*/
@@ -136,7 +140,7 @@
border-color : '#{richSkin.generalTextColor}';
}
-.insel_btn_preposition {
+.rf-is-btn-prepos {
display : block;
position : absolute;
top : -4px;
@@ -145,7 +149,7 @@
height : 1px;
}
-.insel_btn_position {
+.rf-is-btn-pos {
display : block;
position : absolute;
top : 0px;
@@ -153,7 +157,7 @@
white-space : nowrap;
}
-.insel_btn_shadow {
+.rf-is-btn-shdw {
display : block;
position: relative;
padding : 6px 6px 6px 6px;
@@ -161,7 +165,7 @@
right : -6px;
}
-.insel_shadow {
+.rf-is-shdw {
display : block;
position: relative;
padding : 6px 6px 6px 6px;
@@ -169,7 +173,7 @@
left : -6px;
}
-.insel_shadow_t {
+.rf-is-shdw-t {
display : block;
background-image :
"url(#{resource['org.richfaces:bg_shadow.png']})";
background-position : top left;
@@ -180,7 +184,7 @@
left : 0px
}
-.insel_shadow_l {
+.rf-is-shdw-l {
display : block;
background-image : "url(#{resource['org.richfaces:bg_shadow.png']})";
background-position : bottom left;
@@ -191,7 +195,7 @@
right : 6px;
}
-.insel_shadow_r {
+.rf-is-shdw-r {
display : block;
background : "url(#{resource['org.richfaces:bg_shadow.png']})";
background-position : bottom right;
@@ -202,7 +206,7 @@
right : 0px;
}
-.insel_shadow_b {
+.rf-is-shdw-b {
display : block;
background : "url(#{resource['org.richfaces:bg_shadow.png']})";
background-position : right top;
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-08
14:29:46 UTC (rev 19505)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-08
15:03:43 UTC (rev 19506)
@@ -89,7 +89,7 @@
},
__isPopupList: function(target) {
- var parentId =
target.parents(".insel_list_cord").attr("id");
+ var parentId =
target.parents(".rf-is-lst-cord").attr("id");
return (parentId && (parentId == this.select.__getId()));
}
}
Modified: trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-08 14:29:46 UTC
(rev 19505)
+++ trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-10-08 15:03:43 UTC
(rev 19506)
@@ -49,17 +49,17 @@
<input id="#{clientId}:focus" type="image"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
class="rf-ii-none"/>
<span id="#{clientId}:edit" class="#{getEditStyleClass(component,
inplaceState)}">
<input id="#{clientId}:input" autocomplete="off"
name="#{clientId}"
- type="text" value="#{getInputValue(facesContext, component)}"
class="rf-ii-f" style="width:
#{component.attributes['inputWidth']};"
cdk:passThrough="tabIndex">
+ type="text" value="#{getInputValue(facesContext, component)}"
class="rf-ii-fld" style="width:
#{component.attributes['inputWidth']};"
cdk:passThrough="tabIndex">
<cdk:call expression="renderInputHandlers(facesContext,
component);"/>
</input>
<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 class="rf-ii-btn-shadow-t"></span>
- <span class="rf-ii-btn-shadow-l"></span>
- <span class="rf-ii-btn-shadow-r"></span>
- <span class="rf-ii-btn-shadow-b"></span>
+ <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">
<input type="image"
Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-08 14:29:46
UTC (rev 19505)
+++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-08 15:03:43
UTC (rev 19506)
@@ -50,48 +50,47 @@
<input id="#{clientId}selValue" name="#{clientId}"
type="hidden" value="#{getValue(facesContext, component)}"/>
<input id="#{clientId}:input" autocomplete="off"
type="text" value="#{getSelectInputLabel(facesContext,
component)}"
- class="insel_field" style="width:
#{component.attributes['inputWidth']};" readonly="readonly"
+ class="rf-is-fld" style="width:
#{component.attributes['inputWidth']};" readonly="readonly"
cdk:passThrough="tabIndex">
<cdk:call expression="renderInputHandlers(facesContext, component);"
/>
</input>
<c:if test="#{component.attributes['showControls']}">
- <span class="insel_btn_preposition">
- <span class="insel_btn_position">
- <span id="#{clientId}:btnshadow" class="insel_shadow">
- <span class="insel_shadow_t"></span>
- <span class="insel_shadow_l"></span>
- <span class="insel_shadow_r"></span>
- <span class="insel_shadow_b"></span>
+ <span class="rf-is-btn-prepos">
+ <span class="rf-is-btn-pos">
+ <span id="#{clientId}:btnshadow" class="rf-is-shdw">
+ <span class="rf-is-shdw-t"></span>
+ <span class="rf-is-shdw-l"></span>
+ <span class="rf-is-shdw-r"></span>
+ <span class="rf-is-shdw-b"></span>
<span id="#{clientId}:btn" style="position :
relative;">
<input type="image" id="#{clientId}:okbtn"
src="#{getResourcePath(facesContext,
'org.richfaces/ico_ok.gif')}"
- class="insel_btn"
onmousedown="this.className='insel_btn_press'"
- onmouseout="this.className='insel_btn_press'"
onmouseup="this.className='insel_btn'" />
+ class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
+ onmouseout="this.className='rf-is-btn-press'"
onmouseup="this.className='rf-is-btn'" />
<input type="image" id="#{clientId}:cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
- class="insel_btn"
onmousedown="this.className='insel_btn_press'"
- onmouseout="this.className='insel_btn_press'"
onmouseup="this.className='insel_btn'" />
+ class="rf-is-btn"
onmousedown="this.className='rf-is-btn-press'"
+ onmouseout="this.className='rf-is-btn-press'"
onmouseup="this.className='rf-is-btn'" />
<br />
</span>
</span>
</span>
</span>
</c:if>
- <span id="#{clientId}List" class="rf-is-none
insel_list_cord">
- <span class="insel_list_position" style="width:
#{component.attributes['listWidth']}">
- <span class="insel_shadow">
- <span class="insel_shadow_t"></span>
- <span class="insel_shadow_l"></span>
- <span class="insel_shadow_r"></span>
- <span class="insel_shadow_b"></span>
- <span class="insel_list_decoration">
- <span class="insel_list_scroll" id="#{clientId}Items"
style="height: #{component.attributes['listHeight']}">
+ <span id="#{clientId}List" class="rf-is-none
rf-is-lst-cord">
+ <span class="rf-is-lst-pos" style="width:
#{component.attributes['listWidth']}">
+ <span class="rf-is-shdw">
+ <span class="rf-is-shdw-t"></span>
+ <span class="rf-is-shdw-l"></span>
+ <span class="rf-is-shdw-r"></span>
+ <span class="rf-is-shdw-b"></span>
+ <span class="rf-is-lst-dec">
+ <span class="rf-is-lst-scrl" id="#{clientId}Items"
style="height: #{component.attributes['listHeight']}">
<cdk:call expression="encodeOptions(facesContext, component,
clientSelectItems);"/>
</span>
</span>
</span>
-
</span>
</span>
</span>
Modified:
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
===================================================================
---
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-10-08
14:29:46 UTC (rev 19505)
+++
trunk/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-10-08
15:03:43 UTC (rev 19506)
@@ -73,7 +73,7 @@
HtmlElement input = (HtmlElement)edit.getFirstChild();
assertEquals("input", input.getNodeName());
- assertEquals("rf-ii-f",
input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
+ assertEquals("rf-ii-fld",
input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
assertEquals(text.getNodeValue(),
input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE));
List<?> buttons = page.getByXPath("//*[@id =
'form:input_default:btn']");
@@ -101,7 +101,7 @@
HtmlElement input = (HtmlElement)edit.getFirstChild();
assertEquals("input", input.getNodeName());
- assertEquals("rf-ii-f",
input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
+ assertEquals("rf-ii-fld",
input.getAttribute(HtmlConstants.CLASS_ATTRIBUTE));
assertEquals(text.getNodeValue(),
input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE));
HtmlElement button = page.getFirstByXPath("//*[@id =
'form:input_edit:btn']");