[richfaces-svn-commits] JBoss Rich Faces SVN: r2078 - in trunk/ui/datascroller/src/main: templates/org/richfaces and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 6 11:16:42 EDT 2007
Author: nbelaevski
Date: 2007-08-06 11:16:42 -0400 (Mon, 06 Aug 2007)
New Revision: 2078
Modified:
trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
Log:
http://jira.jboss.com/jira/browse/RF-543 fixed
Modified: trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:15:07 UTC (rev 2077)
+++ trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:16:42 UTC (rev 2078)
@@ -44,6 +44,9 @@
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
+<u:selector name=".dr-dscr-button-dsbld">
+ <u:style name="color" skin="panelBorderColor" default="gray" />
+</u:selector>
<u:selector name=".dr-dscr-act">
<u:style name=" border-top-color" skin="generalTextColor" />
@@ -65,5 +68,4 @@
<u:style name="background-color" skin="tableBackgroundColor" />
</u:selector>
-
</f:template>
Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:15:07 UTC (rev 2077)
+++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:16:42 UTC (rev 2078)
@@ -34,19 +34,19 @@
if (controlsState.isFirstRendered()){
if (controlsState.isFirstEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.FIRST_FACET_NAME));
variables.setVariable("facet", component.FIRST_FACET_NAME);
facet=component.FIRST_FACET_NAME;
}else{
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FIRST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -62,7 +62,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("««");
]]></jsp:scriptlet>
@@ -74,19 +74,19 @@
<jsp:scriptlet><![CDATA[
if (controlsState.isFastRewindRendered()){
if (controlsState.isFastRewindEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.FAST_REWIND_FACET_NAME));
variables.setVariable("facet", component.FAST_REWIND_FACET_NAME);
facet=component.FAST_REWIND_FACET_NAME;
}else{
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_REWIND_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -102,7 +102,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("«");
]]></jsp:scriptlet>
@@ -115,19 +115,19 @@
<jsp:scriptlet><![CDATA[
if (controlsState.isPreviousRendered()){
if (controlsState.isPreviousEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.PREVIOUS_FACET_NAME));
variables.setVariable("facet", component.PREVIOUS_FACET_NAME);
facet=component.PREVIOUS_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.PREVIOUS_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -143,7 +143,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
}
@@ -170,18 +170,18 @@
if (controlsState.isNextRendered()){
if (controlsState.isNextEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.NEXT_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.NEXT_FACET_NAME);
facet=component.NEXT_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.NEXT_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -197,7 +197,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
@@ -209,19 +209,19 @@
if (controlsState.isFastForwardRendered()){
if (controlsState.isFastForwardEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.FAST_FORWARD_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.FAST_FORWARD_FACET_NAME);
facet=component.FAST_FORWARD_FACET_NAME;
}
else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_FORWARD_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -237,7 +237,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»");
]]></jsp:scriptlet>
@@ -251,18 +251,18 @@
if (controlsState.isLastRendered()){
if (controlsState.isLastEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.LAST_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.LAST_FACET_NAME);
facet=component.LAST_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld 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 style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.LAST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -278,7 +278,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»»");
]]></jsp:scriptlet>
More information about the richfaces-svn-commits
mailing list