[richfaces-svn-commits] JBoss Rich Faces SVN: r14434 - in branches/community/3.3.X/ui/datascroller/src: main/resources/org/richfaces/renderkit/html/css and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Jun 2 09:41:21 EDT 2009
Author: konstantin.mishin
Date: 2009-06-02 09:41:21 -0400 (Tue, 02 Jun 2009)
New Revision: 14434
Modified:
branches/community/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
branches/community/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
branches/community/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
branches/community/3.3.X/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
Log:
RF-7296
Modified: branches/community/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- branches/community/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2009-06-02 13:40:34 UTC (rev 14433)
+++ branches/community/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2009-06-02 13:41:21 UTC (rev 14434)
@@ -211,10 +211,10 @@
out.startElement("td", component);
if (isCurrentPage) {
- out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+
+ out.writeAttribute("class", "rich-datascr-act "+
styleClass, null);
} else {
- out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+
+ out.writeAttribute("class", "rich-datascr-inact "+
styleClass, null);
out.writeAttribute("onclick", getOnClick(Integer.toString(i + 1)), null);
}
Modified: branches/community/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- branches/community/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2009-06-02 13:40:34 UTC (rev 14433)
+++ branches/community/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2009-06-02 13:41:21 UTC (rev 14434)
@@ -4,13 +4,11 @@
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.dr-dscr{
-}
-.dr-dscr-t{
+.rich-dtascroller-table{
border-width : 1px;
border-style: solid;
}
-.dr-dscr-button, .dr-dscr-sepctrl {
+.rich-datascr-button, .rich-datascr-ctrls-separator {
border-width: 1px;
border-style: solid;
width : 25px;
@@ -18,17 +16,17 @@
text-align: center;
}
-.dr-dscr-button-dsbld {
+.rich-datascr-button-dsbld {
cursor: default;
}
-.dr-dscr-act{
+.rich-datascr-act{
border-top-width: 2px;
border-top-style: solid;
width : 25px;
text-align: center;
}
-.dr-dscr-inact{
+.rich-datascr-inact{
border-top-width: 2px;
border-top-style: solid;
width : 25px;
@@ -40,23 +38,18 @@
]]>
</f:verbatim>
-<u:selector name=".dr-stglpnl">
- <u:style name="background-color" skin="tableBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
-</u:selector>
-
-<u:selector name=".dr-dscr-button, .dr-dscr-sepctrl">
+<u:selector name=".rich-datascr-button, .rich-datascr-ctrls-separator">
<u:style name="background-color" skin="additionalBackgroundColor" />
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
-<u:selector name=".dr-dscr-button-dsbld">
+<u:selector name=".rich-datascr-button-dsbld">
<u:style name="color" skin="panelBorderColor" default="gray" />
</u:selector>
-<u:selector name=".dr-dscr-act">
+<u:selector name=".rich-datascr-act">
<u:style name=" border-top-color" skin="generalTextColor" />
<u:style name="color" skin="generalTextColor" />
<u:style name="font-family" skin="generalFamilyFont" />
@@ -64,14 +57,14 @@
</u:selector>
-<u:selector name=".dr-dscr-inact">
+<u:selector name=".rich-datascr-inact">
<u:style name=" border-top-color" skin="headerBackgroundColor" />
<u:style name="color" skin="headerBackgroundColor" />
<u:style name="font-family" skin="generalFamilyFont" />
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
-<u:selector name=".dr-dscr-t">
+<u:selector name=".rich-dtascroller-table">
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="background-color" skin="tableBackgroundColor" />
</u:selector>
Modified: branches/community/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- branches/community/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2009-06-02 13:40:34 UTC (rev 14433)
+++ branches/community/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2009-06-02 13:41:21 UTC (rev 14434)
@@ -55,7 +55,7 @@
<div id="#{clientId}"
x:passThruWithExclusions="value,name,type,id,styleClass,class,style"
style="#{component.attributes['style']} #{singlePageRenderStyle}"
- class="dr-dscr rich-datascr #{component.attributes['styleClass']}">
+ class="rich-datascr #{component.attributes['styleClass']}">
<jsp:scriptlet>
<![CDATA[
@@ -64,7 +64,7 @@
]]>
</jsp:scriptlet>
- <table id="#{clientId}_table" style="text-align:#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}">
+ <table id="#{clientId}_table" style="text-align:#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="rich-dtascroller-table #{component.attributes['tableStyleClass']}">
<tbody>
<tr>
<jsp:scriptlet><![CDATA[
@@ -77,14 +77,14 @@
variables.setVariable("facet", component.FIRST_FACET_NAME);
facet=component.FIRST_FACET_NAME;
}else{
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("onclick", "");
variables.setVariable("facet", component.FIRST_DISABLED_FACET_NAME);
facet=component.FIRST_DISABLED_FACET_NAME;
};
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FIRST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -100,7 +100,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("««");
]]></jsp:scriptlet>
@@ -110,7 +110,7 @@
if (controlsState.isControlsSeparatorRendered() &&
(controlsState.isFastRewindRendered() || controlsState.isPreviousRendered())) {
]]></jsp:scriptlet>
- <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <td class="rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
<jsp:scriptlet><![CDATA[
}
}
@@ -123,14 +123,14 @@
variables.setVariable("facet", component.FAST_REWIND_FACET_NAME);
facet=component.FAST_REWIND_FACET_NAME;
}else{
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("onclick", "");
variables.setVariable("facet", component.FAST_REWIND_DISABLED_FACET_NAME);
facet=component.FAST_REWIND_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_REWIND_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -146,7 +146,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("«");
]]></jsp:scriptlet>
@@ -156,7 +156,7 @@
if (controlsState.isControlsSeparatorRendered() && controlsState.isPreviousRendered()) {
]]></jsp:scriptlet>
- <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <td class="rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
<jsp:scriptlet><![CDATA[
}
}
@@ -171,13 +171,13 @@
facet=component.PREVIOUS_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("facet", component.PREVIOUS_DISABLED_FACET_NAME);
facet=component.PREVIOUS_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.PREVIOUS_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -193,7 +193,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
}
@@ -224,13 +224,13 @@
facet=component.NEXT_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("facet", component.NEXT_DISABLED_FACET_NAME);
facet=component.NEXT_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.NEXT_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -246,7 +246,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
@@ -255,7 +255,7 @@
if (controlsState.isControlsSeparatorRendered() &&
(controlsState.isFastForwardRendered() || controlsState.isLastRendered())) {
]]></jsp:scriptlet>
- <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <td class="rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
<jsp:scriptlet><![CDATA[
}
}
@@ -271,13 +271,13 @@
}
else{
variables.setVariable("onclick", "");
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("facet", component.FAST_FORWARD_DISABLED_FACET_NAME);
facet=component.FAST_FORWARD_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_FORWARD_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -293,7 +293,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»");
]]></jsp:scriptlet>
@@ -303,7 +303,7 @@
if (controlsState.isControlsSeparatorRendered() && controlsState.isLastRendered()) {
]]></jsp:scriptlet>
- <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <td class="rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
<jsp:scriptlet><![CDATA[
}
}
@@ -318,13 +318,13 @@
facet=component.LAST_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
+ variables.setVariable("buttonClass", "rich-datascr-button-dsbld");
variables.setVariable("facet", component.LAST_DISABLED_FACET_NAME);
facet=component.LAST_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.LAST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -340,7 +340,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»»");
]]></jsp:scriptlet>
Modified: branches/community/3.3.X/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2009-06-02 13:40:34 UTC (rev 14433)
+++ branches/community/3.3.X/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2009-06-02 13:41:21 UTC (rev 14434)
@@ -225,7 +225,6 @@
assertNotNull(f6_d);
String classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-dscr"));
assertTrue(classAttr.contains("rich-datascr"));
More information about the richfaces-svn-commits
mailing list