[richfaces-svn-commits] JBoss Rich Faces SVN: r2085 - in trunk/ui/datascroller/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-08-06 14:55:20 -0400 (Mon, 06 Aug 2007)
New Revision: 2085

Modified:
   trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java
   trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
   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-547 fixed

Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java	2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java	2007-08-06 18:55:20 UTC (rev 2085)
@@ -44,6 +44,8 @@
 	private boolean fastForwardRendered = true;
 	private boolean fastForwardEnabled = true;
 	
+	private boolean controlsSeparatorRendered = false;
+	
 	public boolean isFirstRendered() {
 		return firstRendered;
 	}
@@ -116,4 +118,10 @@
 	public void setFastForwardEnabled(boolean fastForwardEnabled) {
 		this.fastForwardEnabled = fastForwardEnabled;
 	}
+	public boolean isControlsSeparatorRendered() {
+		return controlsSeparatorRendered;
+	}
+	public void setControlsSeparatorRendered(boolean controlsSeparatorRendered) {
+		this.controlsSeparatorRendered = controlsSeparatorRendered;
+	}
 }

Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java	2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java	2007-08-06 18:55:20 UTC (rev 2085)
@@ -171,6 +171,11 @@
             controlsState.setFastRewindRendered(false);
         }
 
+        UIComponent controlsSeparatorFacet = datascroller.getFacet("controlsSeparator");
+        if (controlsSeparatorFacet != null && controlsSeparatorFacet.isRendered()) {
+        	controlsState.setControlsSeparatorRendered(true);
+        }
+        
         return controlsState;
     }
 

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 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss	2007-08-06 18:55:20 UTC (rev 2085)
@@ -10,7 +10,7 @@
 	border-width : 1px;
 	border-style: solid;
 }
-.dr-dscr-button{
+.dr-dscr-button, .dr-dscr-sepctrl {
 	border-width: 1px;
 	border-style: solid;
 	width : 25px;
@@ -40,7 +40,7 @@
     <u:style name="border-color" skin="panelBorderColor" />
 </u:selector>
 
-<u:selector name=".dr-dscr-button">
+<u:selector name=".dr-dscr-button, .dr-dscr-sepctrl">
     <u:style name="background-color" skin="additionalBackgroundColor" />
     <u:style name="border-color" skin="panelBorderColor" />
     <u:style name="font-family" skin="generalFamilyFont" />

Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx	2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx	2007-08-06 18:55:20 UTC (rev 2085)
@@ -68,6 +68,12 @@
                     ]]></jsp:scriptlet>    
                     </td>                              
                 <jsp:scriptlet><![CDATA[
+                } 
+                if (controlsState.isControlsSeparatorRendered() && 
+                		(controlsState.isFastRewindRendered() || controlsState.isPreviousRendered())) {
+                ]]></jsp:scriptlet>
+                	<td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+                <jsp:scriptlet><![CDATA[
                 }
                 }
                 ]]></jsp:scriptlet>
@@ -109,6 +115,12 @@
                     </td>                              
                 <jsp:scriptlet><![CDATA[
                 }
+                
+                if (controlsState.isControlsSeparatorRendered() && controlsState.isPreviousRendered()) {
+                ]]></jsp:scriptlet>
+                	<td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+                <jsp:scriptlet><![CDATA[
+                }
                 }                
                 ]]></jsp:scriptlet>
                                 
@@ -202,6 +214,13 @@
                     </td>                              
                 <jsp:scriptlet><![CDATA[
                 }
+                
+                if (controlsState.isControlsSeparatorRendered() && 
+                		(controlsState.isFastForwardRendered() || controlsState.isLastRendered())) {
+                ]]></jsp:scriptlet>
+                	<td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+                <jsp:scriptlet><![CDATA[
+                }
                 }                
                 ]]></jsp:scriptlet>
 
@@ -244,6 +263,12 @@
                     </td>                              
                 <jsp:scriptlet><![CDATA[
                 }
+                
+                if (controlsState.isControlsSeparatorRendered() && controlsState.isLastRendered()) {
+                ]]></jsp:scriptlet>
+                	<td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+                <jsp:scriptlet><![CDATA[
+                }
                 }                
                 ]]></jsp:scriptlet>