Author: abelevich Date: 2010-05-20 09:14:52 -0400 (Thu, 20 May 2010) New Revision: 17157 Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/css/datascroller.ecss root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/script/datascroller.js root/ui-sandbox/datascroller/trunk/ui/src/main/templates/datascroller.template.xml Log: apply css name conv Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-20 11:34:03 UTC (rev 17156) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-20 13:14:52 UTC (rev 17157) @@ -204,10 +204,10 @@ if (isCurrentPage) { out.startElement(HTML.SPAN_ELEM, component); - out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital ds_current " + styleClass, null); + out.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-ds-dtl rf-ds-cur " + styleClass, null); } else { out.startElement(HTML.A_ELEMENT, component); - out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital " + styleClass, null); + out.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-ds-dtl " + styleClass, null); out.writeAttribute(HTML.HREF_ATTR, "javascript:void(0);", null); } Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/css/datascroller.ecss =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-20 11:34:03 UTC (rev 17156) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-20 13:14:52 UTC (rev 17157) @@ -1,12 +1,12 @@ -a.ds_digital { +a.rf-ds-dtl { color: '#{richSkin.generalTextColor}'; } -a.ds_button { +a.rf-ds-btn { color: '#{richSkin.generalTextColor}'; } -.ds_container { +.rf-ds-cont { white-space: nowrap; display: inline-block; font-size: '#{richSkin.generalSizeFont}'; @@ -15,13 +15,13 @@ background: '#{richSkin.tableBackgroundColor}'; } -.ds_container_decor { +.rf-ds-cont_dec { border-width: 1px; border-style: solid; border-color: '#{richSkin.tableBorderColor}'; } -.ds_button { +.rf-ds-btn { cursor: pointer; padding: 2px 10px 3px 10px; border-width: 1px; @@ -41,15 +41,15 @@ font-weight: normal; } -.ds_left { +.rf-ds-l { margin-right: 1px; } -.ds_right { +.rf-ds-r { margin-left: 1px; } -.ds_digital { +.rf-ds-dtl { cursor: pointer; width: 2em; text-align: center; @@ -79,7 +79,7 @@ } -.ds_over { +.rf-ds-over { border-width : 1px; border-style: solid; border-color: '#{richSkin.tableBorderColor}'; @@ -89,14 +89,14 @@ background-image: "url(#{resource['org.richfaces.renderkit.html.images.DSButtonOverGradientImage']})"; } -.ds_press { +.rf-ds-press { border-width: 1px; border-style: solid; border-color: '#{richSkin.tableBorderColor}'; background: '#{richSkin.additionalBackgroundColor}'; } -.ds_current { +.rf-ds-cur { cursor: default; font-weight: bold; border-width: 1px; @@ -108,7 +108,7 @@ background: none; } -.ds_disabled{ +.rf-ds-dis{ color: '#{richSkin.tableBorderColor}'; cursor: default; } \ No newline at end of file Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/script/datascroller.js =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/script/datascroller.js 2010-05-20 11:34:03 UTC (rev 17156) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/resources/META-INF/resources/script/datascroller.js 2010-05-20 13:14:52 UTC (rev 17157) @@ -69,25 +69,25 @@ if(buttons) { var leftButtons = buttons.left; - css.mouseover = "ds_button ds_left"; - css.mouseup = "ds_button ds_left"; - css.mouseout = "ds_button ds_left"; - css.mousedown = "ds_button ds_left ds_over"; + css.mouseover = "rf-ds-btn rf-ds-l"; + css.mouseup = "rf-ds-btn rf-ds-l"; + css.mouseout = "rf-ds-btn rf-ds-l"; + css.mousedown = "rf-ds-btn rf-ds-l rf-ds-over"; initButtons(leftButtons,css, this); var rightButtons = buttons.right; - css.mouseover = "ds_button ds_right"; - css.mouseup = "ds_button ds_right"; - css.mouseout = "ds_button ds_right"; - css.mousedown = "ds_button ds_right ds_over"; + css.mouseover = "rf-ds-btn rf-ds-r"; + css.mouseup = "rf-ds-btn rf-ds-r"; + css.mouseout = "rf-ds-btn rf-ds-r"; + css.mousedown = "rf-ds-btn rf-ds-r rf-ds-over"; initButtons(rightButtons,css, this); } if(digitals) { - css.mouseover= "ds_digital ds_over"; - css.mouseup= "ds_digital ds_over"; - css.mouseout = "ds_digital"; - css.mousedown="ds_digital ds_press"; + css.mouseover= "rf-ds-dtl rf-ds-over"; + css.mouseup= "rf-ds-dtl rf-ds-over"; + css.mouseout = "rf-ds-dtl"; + css.mousedown="rf-ds-dtl rf-ds-press"; initButtons(digitals, css,this); } }; Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/templates/datascroller.template.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/templates/datascroller.template.xml 2010-05-20 11:34:03 UTC (rev 17156) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/templates/datascroller.template.xml 2010-05-20 13:14:52 UTC (rev 17157) @@ -20,12 +20,12 @@ <c:if test="#{controlsState.firstRendered}"> <c:choose> <c:when test="#{controlsState.firstEnabled}"> - <a id="#{clientId}_ds_f" class="ds_button ds_left" href="javascript:void(0)" > + <a id="#{clientId}_ds_f" class="rf-ds-btn rf-ds-l" href="javascript:void(0)" > &#171;&#171; </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_f" class="ds_button ds_left ds_disabled"> + <span id="#{clientId}_ds_f" class="rf-ds-btn rf-ds-l rf-ds-dis"> &#171;&#171; </span> </c:otherwise> @@ -36,12 +36,12 @@ <c:if test="#{controlsState.fastRewindRendered}"> <c:choose> <c:when test="#{controlsState.fastRewindEnabled}"> - <a id="#{clientId}_ds_fr" class="ds_button ds_left" href="javascript:void(0)"> + <a id="#{clientId}_ds_fr" class="rf-ds-btn rf-ds-l" href="javascript:void(0)"> &#171; </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_fr" class="ds_button ds_left ds_disabled"> + <span id="#{clientId}_ds_fr" class="rf-ds-btn rf-ds-l rf-ds-dis"> &#171; </span> </c:otherwise> @@ -53,12 +53,12 @@ <c:if test="#{controlsState.fastForwardRendered}"> <c:choose> <c:when test="#{controlsState.fastForwardEnabled}"> - <a id="#{clientId}_ds_ff" class="ds_button ds_right" href="javascript:void(0)"> + <a id="#{clientId}_ds_ff" class="rf-ds-btn rf-ds-r" href="javascript:void(0)"> &#187; </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_ff" class="ds_button ds_right ds_disabled"> + <span id="#{clientId}_ds_ff" class="rf-ds-btn rf-ds-r rf-ds-dis"> &#187; </span> </c:otherwise> @@ -68,19 +68,20 @@ <c:if test="#{controlsState.lastRendered}"> <c:choose> <c:when test="#{controlsState.lastEnabled}"> - <a id="#{clientId}_ds_l" class="ds_button ds_right" href="javascript:void(0)"> + <a id="#{clientId}_ds_l" class="rf-ds-btn rf-ds-r" href="javascript:void(0)"> &#187;&#187; </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_l" class="ds_button ds_right ds_disabled"> + <span id="#{clientId}_ds_l" class="rf-ds-btn rf-ds-r rf-ds-dis"> &#187;&#187; </span> </c:otherwise> </c:choose> </c:if> + <cdk:object type="java.util.Map" name="buttons" value="#{getControls(facesContext, component, controlsState)}" /> - + <script type="text/javascript"> <cdk:call expression="buildScript(responseWriter, facesContext, component, buttons, digitals);"/> </script>