[richfaces-svn-commits] JBoss Rich Faces SVN: r16826 - in branches/enterprise/3.3.X/ui/datascroller/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.

Author: konstantin.mishin Date: 2010-04-28 11:24:38 -0400 (Wed, 28 Apr 2010) New Revision: 16826 Modified: branches/enterprise/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java branches/enterprise/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss branches/enterprise/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx Log: RFPL-544 Modified: branches/enterprise/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java =================================================================== --- branches/enterprise/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2010-04-28 13:43:58 UTC (rev 16825) +++ branches/enterprise/3.3.X/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2010-04-28 15:24:38 UTC (rev 16826) @@ -219,7 +219,11 @@ out.writeAttribute("onclick", getOnClick(Integer.toString(i + 1)), null); } if (null != style) out.writeAttribute("style", style, null); + out.startElement("a", component); + out.writeAttribute("class", "rich-datascr-button-content", null); + out.writeAttribute("href", "javascript:void(0)", null); out.writeText(Integer.toString(i + 1), null); + out.endElement("a"); //renderChild(context, link); out.endElement("td"); } Modified: branches/enterprise/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss =================================================================== --- branches/enterprise/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2010-04-28 13:43:58 UTC (rev 16825) +++ branches/enterprise/3.3.X/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2010-04-28 15:24:38 UTC (rev 16826) @@ -18,6 +18,10 @@ text-align: center; } +.rich-datascr-button-content { + text-decoration:none; +} + .dr-dscr-button-dsbld { cursor: default; } @@ -52,11 +56,13 @@ <u:style name="font-size" skin="generalSizeFont" /> </u:selector> -<u:selector name=".dr-dscr-button-dsbld"> +<u:selector name=".rich-datascr-button-dsbld, + .rich-datascr-button-dsbld .rich-datascr-button-content, .rich-datascr-button-dsbld a.rich-datascr-button-content:hover, + .rich-datascr-inact .rich-datascr-button-content, .rich-datascr-inact a.rich-datascr-button-content:hover"> <u:style name="color" skin="panelBorderColor" default="gray" /> </u:selector> -<u:selector name=".dr-dscr-act"> +<u:selector name=".dr-dscr-act, .rich-datascr-button-content, a.rich-datascr-button-content:hover"> <u:style name=" border-top-color" skin="generalTextColor" /> <u:style name="color" skin="generalTextColor" /> <u:style name="font-family" skin="generalFamilyFont" /> Modified: branches/enterprise/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- branches/enterprise/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2010-04-28 13:43:58 UTC (rev 16825) +++ branches/enterprise/3.3.X/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2010-04-28 15:24:38 UTC (rev 16826) @@ -101,9 +101,11 @@ }else{ ]]></jsp:scriptlet> <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}"> - <jsp:scriptlet><![CDATA[ - writer.write("&#171;&#171;"); - ]]></jsp:scriptlet> + <a class="rich-datascr-button-content" href="javascript:void(0)"> + <jsp:scriptlet><![CDATA[ + writer.write("&#171;&#171;"); + ]]></jsp:scriptlet> + </a> </td> <jsp:scriptlet><![CDATA[ } @@ -147,9 +149,11 @@ }else{ ]]></jsp:scriptlet> <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}"> - <jsp:scriptlet><![CDATA[ - writer.write("&#171;"); - ]]></jsp:scriptlet> + <a class="rich-datascr-button-content" href="javascript:void(0)"> + <jsp:scriptlet><![CDATA[ + writer.write("&#171;"); + ]]></jsp:scriptlet> + </a> </td> <jsp:scriptlet><![CDATA[ } @@ -294,9 +298,11 @@ }else{ ]]></jsp:scriptlet> <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}"> - <jsp:scriptlet><![CDATA[ - writer.write("&#187;"); - ]]></jsp:scriptlet> + <a class="rich-datascr-button-content" href="javascript:void(0)"> + <jsp:scriptlet><![CDATA[ + writer.write("&#187;"); + ]]></jsp:scriptlet> + </a> </td> <jsp:scriptlet><![CDATA[ } @@ -341,9 +347,11 @@ }else{ ]]></jsp:scriptlet> <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}"> + <a class="rich-datascr-button-content" href="javascript:void(0)"> <jsp:scriptlet><![CDATA[ writer.write("&#187;&#187;"); - ]]></jsp:scriptlet> + ]]></jsp:scriptlet> + </a> </td> <jsp:scriptlet><![CDATA[ }