[richfaces-svn-commits] JBoss Rich Faces SVN: r4594 - in branches/3.1.x: ui/orderingList/src/main/java/org/richfaces/renderkit and 2 other directories.

Friday, 7 December 2007


Author: sergeyhalipov
Date: 2007-12-07 12:14:00 -0500 (Fri, 07 Dec 2007)
New Revision: 4594

Modified:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
  
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
  
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
  
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
  
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
  
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
Log:
http://jira.jboss.com/jira/browse/RF-1185

Modified:
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
===================================================================
---
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java	2007-12-07
17:14:00 UTC (rev 4594)
@@ -239,6 +239,7 @@
 		public static final String CHARSET_ATTR = "charset";
 		public static final String COORDS_ATTR = "coords";
 		public static final String HREFLANG_ATTR = "hreflang";
+		public static final String HREF_ATTR = "href";
 		public static final String REL_ATTR = "rel";
 		public static final String REV_ATTR = "rev";
 		public static final String SHAPE_ATTR = "shape";

Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java	2007-12-07
17:14:00 UTC (rev 4594)
@@ -316,6 +316,10 @@
 				writer.writeAttribute(HTML.onmouseout_ATTRIBUTE, "this.className='" +
baseStyle + "'", null);
 			}
 			
+			writer.startElement(HTML.a_ELEMENT, orderingList);
+			writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-selection",
null);
+			writer.writeAttribute(HTML.HREF_ATTR, "#", null);
+			
 			writer.startElement(HTML.DIV_ELEM, orderingList);
 			writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-content", null);
 
@@ -364,6 +368,7 @@
 		
 		if (!useFacet) {
 			writer.endElement(HTML.DIV_ELEM);
+			writer.endElement(HTML.a_ELEMENT);
 			writer.endElement(HTML.DIV_ELEM);
 		}
 		writer.endElement(HTML.DIV_ELEM);

Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java	2007-12-07
17:14:00 UTC (rev 4594)
@@ -149,9 +149,9 @@
 				
 				writer.startElement(HTML.td_ELEM, table);
 				
-				if (!iterator.hasNext()) {
-					cellClassName.append(" rich-ordering-list-cell-end");
-				}
+				//if (!iterator.hasNext()) {
+				//	cellClassName.append(" rich-ordering-list-cell-end");
+				//}
 				writer.writeAttribute("class", cellClassName.toString(), null);
 				
 				//writer.write("&nbsp;");

Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss	2007-12-07
17:14:00 UTC (rev 4594)
@@ -143,10 +143,14 @@
 }
 
 .rich-ordering-list-cell-end {
-	border-right : 0px;
+	border-right: 1px solid;
 	white-space: nowrap;
 }
 
+.rich-ordering-list-cell-begin {
+	border-left: 1px solid;
+}
+
 .rich-ordering-list-cell {
 	padding : 2px;
 	white-space: nowrap;
@@ -160,8 +164,8 @@
 .rich-ordering-list-cell-active {
 	padding: 1px 2px 1px 2px;
 	white-space: nowrap;
-	border-top: 1px dotted gray;
-	border-bottom: 1px dotted gray;
+	border-top: 1px solid;
+	border-bottom: 1px solid;
 } 
 
 .rich-ordering-list-ds {
@@ -252,7 +256,12 @@
 	<u:selector name=".rich-ordering-list-cell-end">
 		<u:style name="font-family" skin="generalFamilyFont" />
 		<u:style name="font-size" skin="generalSizeFont" />
+		<u:style name="border-right-color" skin="selectControlColor"
/>
 	</u:selector>
+	
+	<u:selector name=".rich-ordering-list-cell-begin">
+		<u:style name="border-left-color" skin="selectControlColor"
/>
+	</u:selector>
 
 	<u:selector name=".rich-ordering-list-items">
 		<u:style name="background-color" skin="generalBackgroundColor"
/>
@@ -288,6 +297,8 @@
 	<u:selector name=".rich-ordering-list-cell-active">
 		<u:style name="font-size" skin="generalSizeFont" />
 		<u:style name="font-family" skin="generalFamilyFont" />
+		<u:style name="border-top-color" skin="selectControlColor"
/>
+		<u:style name="border-bottom-color" skin="selectControlColor"
/>
 	</u:selector>
 	
 	<u:selector name=".rich-ordering-control-disabled">
@@ -311,6 +322,12 @@
 		<u:style name="font-size" skin="headerSizeFont" />
 	</u:selector>
 	
+	<u:selector name=".rich-ordering-list-button-selection">
+		<u:style name="color" skin="generalTextColor" />
+		<u:style name="text-decoration" value="none" />
+		<u:style name="display" value="block" />
+	</u:selector>
+	
 	<u:selector name=".rich-ordering-list-caption">
 		<u:style name="font-family" skin="headerFamilyFont" />
 		<u:style name="font-size" skin="headerSizeFont" />

Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js	2007-12-07
17:14:00 UTC (rev 4594)
@@ -45,7 +45,9 @@
 			SELECTED : "rich-ordering-list-cell-selected",
 			ACTIVE_SELECTED : "rich-ordering-list-cell-selected
rich-ordering-list-cell-active",
 			DISABLED : "rich-ordering-list-cell-disabled",
-			NORMAL   : "rich-ordering-list-cell"
+			NORMAL   : "rich-ordering-list-cell",
+			BEGIN:	" rich-ordering-list-cell-begin",
+			END:	" rich-ordering-list-cell-end"
 		}
 	},
 	

Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
===================================================================
---
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js	2007-12-07
15:53:46 UTC (rev 4593)
+++
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js	2007-12-07
17:14:00 UTC (rev 4594)
@@ -10,7 +10,8 @@
 			newRowStyle = classes.ROW.ACTIVE_SELECTED;
 			newCellStyle = classes.CELL.ACTIVE_SELECTED;
 		}
-		Richfaces.SelectItems.doChange(row, newRowStyle, newCellStyle);
+		Richfaces.SelectItems.doChange(row, newRowStyle, newCellStyle,
+			classes.CELL.BEGIN, classes.CELL.END);
 	},
 	
 	doSelect : function(row, classes) {
@@ -35,16 +36,19 @@
 		return Richfaces.SelectItems.compareStates(row, classes.ROW.ACTIVE);
 	},
 	
-	doChange : function(row, classNameRow, classNameCell) {
+	doChange : function(row, classNameRow, classNameCell, classNameCellBegin,
classNameCellEnd) {
 		Richfaces.SelectItems.doChangeNode(row, classNameRow);
 		var cells = row.cells;
 		for (var i = 0; i < cells.length; i++) {
 			var cell = cells[i];
-			if (i == (cells.length - 1)) {
-				//TODO nick - testing
-				//Element.setStyle(cell, {'border': '0px'});
+			var clazz = classNameCell;
+			if (classNameCellEnd && (cells.length - 1) == i) {
+				clazz += " " + classNameCellEnd;
 			}
-			Richfaces.SelectItems.doChangeNode(cell, classNameCell);
+			if (classNameCellBegin && 0 == i){
+				clazz += " " + classNameCellBegin;
+			}
+			Richfaces.SelectItems.doChangeNode(cell, clazz);
 		}
 	},
 	


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r4594 - in branches/3.1.x: ui/orderingList/src/main/java/org/richfaces/renderkit and 2 other directories.