Author: abelevich Date: 2010-05-28 11:23:13 -0400 (Fri, 28 May 2010) New Revision: 17369 Modified: root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml Log: fix styles, RF-8702 Modified: root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java =================================================================== --- root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-28 15:05:10 UTC (rev 17368) +++ root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-28 15:23:13 UTC (rev 17369) @@ -69,6 +69,8 @@ public static final String PAGEMODE_FULL = "full"; public static final String PAGEMODE_SHORT = "short"; + + private static final int MAX_PAGES_DEFAULT = 10; private Integer page; @@ -101,7 +103,7 @@ } public int getMaxPages() { - return (Integer) getStateHelper().eval(PropertyKeys.maxPages, 0); + return (Integer) getStateHelper().eval(PropertyKeys.maxPages, MAX_PAGES_DEFAULT); } public void setMaxPages(int maxPages) { Modified: root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss =================================================================== --- root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-28 15:05:10 UTC (rev 17368) +++ root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-28 15:23:13 UTC (rev 17369) @@ -1,3 +1,12 @@ +.rf-ds{ + white-space:nowrap; + display:inline-block; + font-size:'#{richSkin.generalSizeFont}'; + padding:1px; + font-family:'#{richSkin.generalFamilyFont}'; + background:'#{richSkin.tableBackgroundColor}'; +} + a.rf-ds-dtl { color: '#{richSkin.generalTextColor}'; } Modified: root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml =================================================================== --- root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml 2010-05-28 15:05:10 UTC (rev 17368) +++ root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml 2010-05-28 15:23:13 UTC (rev 17369) @@ -16,7 +16,7 @@ <cdk:object type="org.richfaces.renderkit.ControlsState" name="controlsState" value="#{getControlsState(facesContext,component)}" /> - <span id="#{clientId}" class="ds_container !ds_container_decor"><!-- Now decor is disabled !!! --> + <span id="#{clientId}" class="rf-ds"><!-- Now decor is disabled !!! --> <c:if test="#{controlsState.firstRendered}"> <c:choose> <c:when test="#{controlsState.firstEnabled}">