JBoss Rich Faces SVN: r4744 - branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:37:04 -0500 (Tue, 11 Dec 2007)
New Revision: 4744
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
Log:
width handling added for rich:column
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-11 20:36:59 UTC (rev 4743)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-12-11 20:37:04 UTC (rev 4744)
@@ -21,6 +21,7 @@
import org.richfaces.component.UIOrderingBaseComponent;
import org.richfaces.component.UIOrderingList;
import org.richfaces.component.UIOrderingBaseComponent.ItemState;
+import org.richfaces.component.util.HtmlUtil;
public abstract class OrderingListRendererBase extends OrderingComponentRendererBase {
@@ -161,6 +162,11 @@
// cellClassName.append(" rich-ordering-list-cell-end");
//}
+ Object width = component.getAttributes().get("width");
+ if (width != null) {
+ writer.writeAttribute("style", "width: " + HtmlUtil.qualifySize(width.toString()), null);
+ }
+
String columnClass = holder.getColumnClass(colCounter);
if (columnClass != null) {
writer.writeAttribute("class", cellClassName.toString().concat(" " + columnClass), null);
18 years, 5 months
JBoss Rich Faces SVN: r4743 - in branches/3.1.x/samples/listShuttleDemo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:36:59 -0500 (Tue, 11 Dec 2007)
New Revision: 4743
Modified:
branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java
branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp
Log:
width handling added for rich:column
Modified: branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-12-11 20:26:51 UTC (rev 4742)
+++ branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-12-11 20:36:59 UTC (rev 4743)
@@ -19,7 +19,7 @@
private Collection sourceSelection;
private Collection targetSelection;
- private String[] zebraItems = new String[] {"Item 0", "Item 1", "Item 2", "Item 3", "Item 4"};
+ private String[] zebraItems = new String[] {"0", "1", "2", "3", "4"};
private ListShuttleOptionItem[] source;
Modified: branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:26:51 UTC (rev 4742)
+++ branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:36:59 UTC (rev 4743)
@@ -2,7 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/dataTable" prefix="rich" %>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/listShuttle" prefix="ls" %>
<html>
@@ -105,12 +105,12 @@
<ls:listShuttle id="listShuttle2" var="item" sourceValue="#{listShuttleDemoBean.zebraItems}"
columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1, zebraRow2">
- <h:column>
+ <rich:column width="10px">
<f:facet name="header">
<h:outputText value="Name" />
</f:facet>
<h:outputText value="#{item}" />
- </h:column>
+ </rich:column>
<h:column>
<f:facet name="header">
<h:outputText value="Name" />
18 years, 5 months
JBoss Rich Faces SVN: r4742 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:26:51 -0500 (Tue, 11 Dec 2007)
New Revision: 4742
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
Log:
columnClasses/rowClasses handling added
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-11 20:17:08 UTC (rev 4741)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-11 20:26:51 UTC (rev 4742)
@@ -6,6 +6,7 @@
initialize : function(label, id, node) {
this._label = label;
this._node = node;
+
this._node.item = this;
this._id = id;
@@ -55,22 +56,40 @@
},
addClass : function(row, classNameRow, classNameCell) {
- row.addClassName(classNameRow);
+ if (row.addClassName) {
+ row.addClassName(classNameRow);
+ } else {
+ Element.addClassName(row, classNameRow);
+ }
+
var cells = row.cells;
for (var i = 0; i < cells.length; i++) {
var cell = cells[i];
- cell.addClassName(classNameCell);
+ if (cell.addClassName) {
+ cell.addClassName(classNameCell);
+ } else {
+ Element.addClassName(cell, classNameCell);
+ }
}
},
removeClass : function(row, classNameRow, classNameCell) {
- row.removeClassName(classNameRow);
+ if (row.removeClassName) {
+ row.removeClassName(classNameRow);
+ } else {
+ Element.removeClassName(row, classNameRow);
+ }
+
var cells = row.cells;
for (var i = 0; i < cells.length; i++) {
var cell = cells[i];
- cell.removeClassName(classNameCell);
+ if (cell.removeClassName) {
+ cell.removeClassName(classNameCell);
+ } else {
+ Element.removeClassName(cell, classNameCell);
+ }
}
},
18 years, 5 months
JBoss Rich Faces SVN: r4741 - in branches/3.1.x/ui/listShuttle/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:17:08 -0500 (Tue, 11 Dec 2007)
New Revision: 4741
Modified:
branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
columnClasses/rowClasses handling added
Modified: branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-11 20:17:08 UTC (rev 4741)
@@ -304,5 +304,15 @@
If "true", dragging between lists realized by click
</description>
</property>
+
+ <property>
+ <name>rowClasses</name>
+ <classname>java.lang.String</classname>
+ </property>
+
+ <property>
+ <name>columnClasses</name>
+ <classname>java.lang.String</classname>
+ </property>
</component>
</components>
Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-12-11 20:17:08 UTC (rev 4741)
@@ -9,11 +9,9 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -130,21 +128,17 @@
cellClassName.append("rich-shuttle-target-cell");
}
+ String rowClass = holder.getRowClass();
+ if (rowClass != null) {
+ rowClassName.append(' ');
+ rowClassName.append(rowClass);
+ }
+
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME);
ItemState itemState = getItemState(context, table, variables);
boolean active = itemState.isActive();
-// if (active) {
-// if (source) {
-// rowClassName.append(" rich-shuttle-source-row-active");
-// cellClassName.append(" rich-shuttle-source-cell-active");
-// } else {
-// rowClassName.append(" rich-shuttle-target-row-active");
-// cellClassName.append(" rich-shuttle-target-cell-active");
-// }
-// }
-
boolean selected = itemState.isSelected();
selectionState.addState(selected);
if (selected) {
@@ -159,25 +153,28 @@
writer.writeAttribute("class", rowClassName.toString(), null);
+ int colCounter = 0;
boolean columnRendered = false;
- List children = table.getChildren();
- for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = table.columns(); iterator.hasNext();) {
UIComponent component = (UIComponent) iterator.next();
- if (component instanceof UIColumn && component.isRendered()) {
- UIColumn column = (UIColumn) component;
-
+ if (component.isRendered()) {
writer.startElement(HTML.td_ELEM, table);
- writer.writeAttribute("class", cellClassName.toString(), null);
+ String columnClass = holder.getColumnClass(colCounter);
+ if (columnClass != null) {
+ writer.writeAttribute("class", cellClassName.toString().concat(" " + columnClass), null);
+ } else {
+ writer.writeAttribute("class", cellClassName.toString(), null);
+ }
writer.startElement(HTML.IMG_ELEMENT, table);
writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null);
writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null);
writer.endElement(HTML.IMG_ELEMENT);
- renderChildren(context, column);
+ renderChildren(context, component);
if (!columnRendered) {
writer.startElement(HTML.INPUT_ELEM, table);
@@ -208,6 +205,8 @@
writer.endElement(HTML.td_ELEM);
}
+
+ colCounter++;
}
writer.endElement(HTML.TR_ELEMENT);
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-11 20:17:08 UTC (rev 4741)
@@ -10,14 +10,12 @@
ROW : {
ACTIVE : "rich-shuttle-source-row-active",
SELECTED : "rich-shuttle-source-row-selected",
- ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
DISABLED : "rich-shuttle-source-row-disabled",
NORMAL : "rich-shuttle-source-row"
},
CELL : {
ACTIVE : "rich-shuttle-source-cell-active",
SELECTED : "rich-shuttle-source-cell-selected",
- ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
DISABLED : "rich-shuttle-source-cell-disabled",
NORMAL : "rich-shuttle-source-cell",
BEGIN: " rich-shuttle-source-cell-first",
@@ -30,14 +28,12 @@
ROW : {
ACTIVE : "rich-shuttle-target-row-active",
SELECTED : "rich-shuttle-target-row-selected",
- ACTIVE_SELECTED : "rich-shuttle-target-row-selected rich-shuttle-target-row-active",
DISABLED : "rich-shuttle-target-row-disabled",
NORMAL : "rich-shuttle-target-row"
},
CELL : {
ACTIVE : "rich-shuttle-target-cell-active",
SELECTED : "rich-shuttle-target-cell-selected",
- ACTIVE_SELECTED : "rich-shuttle-target-cell-selected rich-shuttle-target-cell-active",
DISABLED : "rich-shuttle-target-cell-disabled",
NORMAL : "rich-shuttle-target-cell",
BEGIN: " rich-shuttle-target-cell-first",
18 years, 5 months
JBoss Rich Faces SVN: r4740 - in branches/3.1.x/samples/orderingListDemo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:16:58 -0500 (Tue, 11 Dec 2007)
New Revision: 4740
Modified:
branches/3.1.x/samples/orderingListDemo/src/main/java/org/richfaces/Bean.java
branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp
Log:
columnClasses/rowClasses handling added
Modified: branches/3.1.x/samples/orderingListDemo/src/main/java/org/richfaces/Bean.java
===================================================================
--- branches/3.1.x/samples/orderingListDemo/src/main/java/org/richfaces/Bean.java 2007-12-11 20:16:51 UTC (rev 4739)
+++ branches/3.1.x/samples/orderingListDemo/src/main/java/org/richfaces/Bean.java 2007-12-11 20:16:58 UTC (rev 4740)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Random;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
@@ -40,10 +41,16 @@
"First", "Second", "Third", "Fourth"
};
+ private List zebraItems = new ArrayList();
+
public Bean() {
for (int i = 0; i < 3; i++) {
lists.add(new OrderingListDemoBean());
}
+
+ for (int i = 0; i < 6; i++) {
+ zebraItems.add("Item " + i);
+ }
}
public List getLists() {
@@ -104,4 +111,12 @@
System.out.println("Bean.setActiveItem() " + activeItem);
this.activeItem = activeItem;
}
+
+ public List getZebraItems() {
+ return zebraItems;
+ }
+
+ public void setZebraItems(List zebraItems) {
+ this.zebraItems = zebraItems;
+ }
}
\ No newline at end of file
Modified: branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:16:51 UTC (rev 4739)
+++ branches/3.1.x/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:16:58 UTC (rev 4740)
@@ -19,6 +19,21 @@
font-weight: bold;
}
+ .zebraCell1 {
+ background-color: yellow;
+ }
+
+ .zebraCell2 {
+ background-color: fuchsia;
+ }
+
+ .zebraRow1 * {
+ color: white;
+ }
+
+ .zebraRow2 * {
+ color: navy;
+ }
</style>
<title>Ordering List Demo.</title>
@@ -181,6 +196,24 @@
</h:column>
</ol:orderingList>
</h:panelGroup>
+
+ <h:panelGroup>
+ <ol:orderingList value="#{bean.zebraItems}" var="item"
+ controlsType="link" columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1, zebraRow2">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </h:column>
+ </ol:orderingList>
+ </h:panelGroup>
</h:panelGrid>
<a4j:commandButton value="Ajax Submit" reRender="orderingList1" />
<h:commandButton value="Add item" action="#{demoBean.addItem}" />
18 years, 5 months
JBoss Rich Faces SVN: r4739 - in branches/3.1.x/ui/orderingList/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:16:51 -0500 (Tue, 11 Dec 2007)
New Revision: 4739
Modified:
branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml
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/scripts/OrderingList.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js
Log:
columnClasses/rowClasses handling added
Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-12-11 20:16:39 UTC (rev 4738)
+++ branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-12-11 20:16:51 UTC (rev 4739)
@@ -126,10 +126,10 @@
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
- <name>cellClasses</name>
+ <name>columnClasses</name>
<classname>java.lang.String</classname>
<description>
- CSS class for a cell
+ CSS class for a column
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
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-11 20:16:39 UTC (rev 4738)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-12-11 20:16:51 UTC (rev 4739)
@@ -5,11 +5,9 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -120,6 +118,13 @@
writer.writeAttribute("id", clientId, null);
StringBuffer rowClassName = new StringBuffer("rich-ordering-list-row");
+
+ String rowClass = holder.getRowClass();
+ if (rowClass != null) {
+ rowClassName.append(' ');
+ rowClassName.append(rowClass);
+ }
+
StringBuffer cellClassName = new StringBuffer("rich-ordering-list-cell");
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
@@ -144,20 +149,25 @@
boolean columnRendered = false;
- List children = table.getChildren();
- for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ int colCounter = 0;
+
+ for (Iterator iterator = table.columns(); iterator.hasNext();) {
UIComponent component = (UIComponent) iterator.next();
- if (component instanceof UIColumn && component.isRendered()) {
- UIColumn column = (UIColumn) component;
-
+ if (component.isRendered()) {
writer.startElement(HTML.td_ELEM, table);
//if (!iterator.hasNext()) {
// cellClassName.append(" rich-ordering-list-cell-end");
//}
- writer.writeAttribute("class", cellClassName.toString(), null);
+ String columnClass = holder.getColumnClass(colCounter);
+ if (columnClass != null) {
+ writer.writeAttribute("class", cellClassName.toString().concat(" " + columnClass), null);
+ } else {
+ writer.writeAttribute("class", cellClassName.toString(), null);
+ }
+
//writer.write(" ");
writer.startElement(HTML.IMG_ELEMENT, table);
@@ -165,7 +175,7 @@
writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null);
writer.endElement(HTML.IMG_ELEMENT);
- renderChildren(context, column);
+ renderChildren(context, component);
if (!columnRendered) {
writer.startElement(HTML.INPUT_ELEM, table);
@@ -195,6 +205,8 @@
writer.endElement(HTML.td_ELEM);
}
+
+ colCounter++;
}
writer.endElement(HTML.TR_ELEMENT);
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-11 20:16:39 UTC (rev 4738)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-11 20:16:51 UTC (rev 4739)
@@ -5,14 +5,12 @@
ROW : {
ACTIVE : "rich-ordering-list-row-active",
SELECTED : "rich-ordering-list-row-selected",
- ACTIVE_SELECTED : "rich-ordering-list-row-selected rich-ordering-list-row-active",
DISABLED : "rich-ordering-list-row-disabled",
NORMAL : "rich-ordering-list-row"
},
CELL : {
ACTIVE : "rich-ordering-list-cell-active",
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",
BEGIN: " rich-ordering-list-cell-first",
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-11 20:16:39 UTC (rev 4738)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-12-11 20:16:51 UTC (rev 4739)
@@ -19,35 +19,29 @@
doActive : function() {
var classes = this.CLASSES;
var row = this._node;
- var newRowStyle = classes.ROW.ACTIVE;
- var newCellStyle = classes.CELL.ACTIVE;
- if (Element.hasClassName(row, classes.ROW.SELECTED)) {
- newRowStyle = classes.ROW.ACTIVE_SELECTED;
- newCellStyle = classes.CELL.ACTIVE_SELECTED;
- }
- this.doChange(row, newRowStyle, newCellStyle,
- classes.CELL.BEGIN, classes.CELL.END);
+ this.addClass(row, classes.ROW.ACTIVE, classes.CELL.ACTIVE);
+
this.active = true;
},
doSelect : function() {
var row = this._node;
var classes = this.CLASSES;
- this.doChange(row,
- classes.ROW.SELECTED,
- classes.CELL.SELECTED);
+ this.addClass(row, classes.ROW.SELECTED, classes.CELL.SELECTED);
+ this.removeClass(row, classes.ROW.ACTIVE, classes.CELL.ACTIVE);
+
this.selected = true;
},
doNormal : function() {
var row = this._node;
var classes = this.CLASSES;
- this.doChange(row,
- classes.ROW.NORMAL,
- classes.CELL.NORMAL);
+ this.removeClass(row, classes.ROW.SELECTED, classes.CELL.SELECTED);
+ this.removeClass(row, classes.ROW.ACTIVE, classes.CELL.ACTIVE);
+
this.active = false;
this.selected = false;
},
@@ -60,24 +54,24 @@
return this.active;
},
- doChange : function(row, classNameRow, classNameCell, classNameCellBegin, classNameCellEnd) {
- this.doChangeNode(row, classNameRow);
+ addClass : function(row, classNameRow, classNameCell) {
+ row.addClassName(classNameRow);
var cells = row.cells;
for (var i = 0; i < cells.length; i++) {
var cell = cells[i];
- var clazz = classNameCell;
- if (classNameCellEnd && (cells.length - 1) == i) {
- clazz += " " + classNameCellEnd;
- }
- if (classNameCellBegin && 0 == i){
- clazz += " " + classNameCellBegin;
- }
- this.doChangeNode(cell, clazz);
+
+ cell.addClassName(classNameCell);
}
},
- doChangeNode : function(node, className) {
- node.className = className;
+ removeClass : function(row, classNameRow, classNameCell) {
+ row.removeClassName(classNameRow);
+ var cells = row.cells;
+ for (var i = 0; i < cells.length; i++) {
+ var cell = cells[i];
+
+ cell.removeClassName(classNameCell);
+ }
},
saveState: function() {
18 years, 5 months
JBoss Rich Faces SVN: r4738 - in branches/3.1.x/samples/listShuttleDemo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 15:16:39 -0500 (Tue, 11 Dec 2007)
New Revision: 4738
Modified:
branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java
branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp
Log:
columnClasses/rowClasses handling added
Modified: branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-12-11 20:13:32 UTC (rev 4737)
+++ branches/3.1.x/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2007-12-11 20:16:39 UTC (rev 4738)
@@ -3,10 +3,7 @@
*/
package org.richfaces;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
import java.util.Random;
import javax.faces.context.FacesContext;
@@ -22,6 +19,8 @@
private Collection sourceSelection;
private Collection targetSelection;
+ private String[] zebraItems = new String[] {"Item 0", "Item 1", "Item 2", "Item 3", "Item 4"};
+
private ListShuttleOptionItem[] source;
private ListShuttleOptionItem[] target;
@@ -161,4 +160,12 @@
this.numbers = numbers;
}
+
+ public String[] getZebraItems() {
+ return zebraItems;
+ }
+
+ public void setZebraItems(String[] zebraItems) {
+ this.zebraItems = zebraItems;
+ }
}
Modified: branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:13:32 UTC (rev 4737)
+++ branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-12-11 20:16:39 UTC (rev 4738)
@@ -8,6 +8,24 @@
<html>
<head>
<title></title>
+
+ <style type="text/css">
+ .zebraCell1 {
+ background-color: yellow;
+ }
+
+ .zebraCell2 {
+ background-color: fuchsia;
+ }
+
+ .zebraRow1 * {
+ color: white;
+ }
+
+ .zebraRow2 * {
+ color: navy;
+ }
+ </style>
</head>
<body>
<f:view>
@@ -83,6 +101,23 @@
<h:outputText value="#{item}" />
</h:column>
</ls:listShuttle>
+
+
+ <ls:listShuttle id="listShuttle2" var="item" sourceValue="#{listShuttleDemoBean.zebraItems}"
+ columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1, zebraRow2">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </h:column>
+ </ls:listShuttle>
</h:form>
</f:view>
</body>
18 years, 5 months
JBoss Rich Faces SVN: r4737 - branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: SergeySmirnov
Date: 2007-12-11 15:13:32 -0500 (Tue, 11 Dec 2007)
New Revision: 4737
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
Log:
small look-n-feel corrections
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 19:59:24 UTC (rev 4736)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 20:13:32 UTC (rev 4737)
@@ -17,7 +17,7 @@
}
</style>
<h:form>
- <rich:toolBar id="toolBar" itemSeparator="line" height="40px">
+ <rich:toolBar id="toolBar" itemSeparator="line" height="28px">
<c:forEach items="#{toolBar.items}" var="item">
<h:panelGroup>
<h:graphicImage value="#{item.iconURI}" styleClass="pic"/>
@@ -40,11 +40,12 @@
<rich:column>
<h:outputText value="#{items.label}"></h:outputText>
</rich:column>
- <a4j:support event="onorderchanged" reRender="toolBar"></a4j:support>
</rich:listShuttle>
- <rich:spacer height="20"></rich:spacer>
-
- <h:commandButton value="Update Toolbar" reRender="toolBar" />
+ <div style="width:462px">
+ <a4j:commandButton styleClass="rich-list-shuttle-button"
+ style="float:right;padding:2px;border:1px solid #BED6F8"
+ value="Update Toolbar" reRender="toolBar" />
+ </div>
</h:form>
</ui:composition>
18 years, 5 months
JBoss Rich Faces SVN: r4736 - branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 14:59:24 -0500 (Tue, 11 Dec 2007)
New Revision: 4736
Modified:
branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
Log:
http://jira.jboss.com/jira/browse/RF-1600
Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-12-11 19:17:50 UTC (rev 4735)
+++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-12-11 19:59:24 UTC (rev 4736)
@@ -229,7 +229,8 @@
</u:selector>
<u:selector name=".rich-calendar-tool-btn-hover">
- <u:style name="background" skin="calendarWeekBackgroundColor"/>
+ <u:style name="background-color" skin="calendarWeekBackgroundColor"/>
+ <u:style name="color" skin="generalTextColor"/>
<u:style name="border" value="1px solid"/>
<u:style name="border-color" skin="tableBackgroundColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
18 years, 5 months
JBoss Rich Faces SVN: r4735 - branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 14:17:50 -0500 (Tue, 11 Dec 2007)
New Revision: 4735
Modified:
branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
Log:
Message renderer test fixed
Modified: branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
===================================================================
--- branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 18:37:35 UTC (rev 4734)
+++ branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 19:17:50 UTC (rev 4735)
@@ -13,6 +13,7 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.html.HtmlRichMessages;
+import com.gargoylesoftware.htmlunit.html.DomNode;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -134,10 +135,10 @@
messages2.setInfoMarkerClass("infoMarkerClass");
messages2.setWarnMarkerClass("warnMarkerClass");
- messages2.getFacets().put("errorMarker", output1);
- messages2.getFacets().put("warnMarker", output2);
- messages2.getFacets().put("fatalMarker", output3);
- messages2.getFacets().put("infoMarker", output4);
+// messages2.getFacets().put("errorMarker", output1);
+// messages2.getFacets().put("warnMarker", output2);
+// messages2.getFacets().put("fatalMarker", output3);
+// messages2.getFacets().put("infoMarker", output4);
FacesMessage facesMessage = new FacesMessage();
@@ -236,29 +237,37 @@
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("errorClass")||classAttr.contains("fatalClass")
- ||classAttr.contains("warnClass") ||classAttr.contains("infoClass"));
-
Iterator tdIter = tr.getChildIterator();
for (;tdIter.hasNext();) {
HtmlElement td = (HtmlElement)tdIter.next();
assertNotNull(td);
assertEquals(td.getNodeName().toLowerCase(), "td");
+
+ String classAttribute = td.getAttributeValue("class");
- if(td.getAttributeValue("class")!= null){
- classAttr = td.getAttributeValue("class");
+ assertTrue(classAttribute.contains("errorClass")|| classAttribute.contains("fatalClass")
+ || classAttribute.contains("warnClass") || classAttribute.contains("infoClass"));
+
+ HtmlElement elem = (HtmlElement)td.getFirstChild();
+ assertNotNull(elem);
+
+ if(elem.getNodeName().equals("span")){
+ classAttr = elem.getAttributeValue("class");
assertTrue(classAttr.contains("rich-messages-marker"));
assertTrue(classAttr.contains("errorMarkerClass") || classAttr.contains("fatalMarkerClass")
|| classAttr.contains("infoMarkerClass") || classAttr.contains("warnMarkerClass"));
}
+
+ DomNode node = elem.getNextSibling();
+ while (!(node instanceof HtmlElement)) {
+ node = node.getNextSibling();
+ }
- HtmlElement elem = (HtmlElement)td.getFirstChild();
- assertNotNull(elem);
-
- if(elem.getNodeName().equals("span")){
- classAttr = tr.getAttributeValue("class");
+ HtmlElement label = (HtmlElement) node;
+ if(label.getNodeName().equals("span")){
+ classAttr = label.getAttributeValue("class");
assertTrue(classAttr.contains("rich-messages-label"));
assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")
18 years, 5 months