3 p.m.
Author: sergeyhalipov
Date: 2007-12-13 16:00:40 -0500 (Thu, 13 Dec 2007)
New Revision: 4832
Modified:
branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp
branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1495
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-13
20:26:27 UTC (rev 4831)
+++ branches/3.1.x/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2007-12-13
21:00:40 UTC (rev 4832)
@@ -24,6 +24,9 @@
.zebraRow2 * {
color: navy;
+ }
+ .downControlClass {
+ font-weight: bold;
}
</style>
</head>
@@ -102,7 +105,9 @@
<ls:listShuttle onlistchanged="alert(event.type)"
id="listShuttle2" var="item"
sourceValue="#{listShuttleDemoBean.zebraItems}"
- columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1,
zebraRow2">
+ columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1,
zebraRow2"
+ moveControlsVerticalAlign="top"
orderControlsVerticalAlign="bottom"
+ downControlClass="downControlClass">
<rich:column width="10px">
<f:facet name="header">
<h:outputText value="Name" />
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-13
20:26:27 UTC (rev 4831)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-12-13
21:00:40 UTC (rev 4832)
@@ -23,7 +23,7 @@
</tag>
&ui_component_attributes;
- &html_style_attributes;
+ &html_style_attributes;
&ui_data_attributes;
<property>
<name>columnClasses</name>
@@ -139,8 +139,8 @@
<property>
<name>onorderchanged</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called on an order
operation</description>
- </property>
+ <description>HTML: script expression;
called after ordering action</description>
+ </property>
<property>
<name>showButtonLabels</name>
@@ -426,7 +426,55 @@
<classname>java.lang.String</classname>
<description>HTML: a script expression; a pointer is moved
onto</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
-
+ </property>
+
+ <property>
+ <name>moveControlsVerticalAlign</name>
+ <classname>java.lang.String</classname>
+
<description>Customizes vertically a position of move/copy controls relatively to lists</description>
+ <defaultvalue><![CDATA["middle"]]></defaultvalue>
+ </property>
+ <property>
+ <name>orderControlsVerticalAlign</name>
+ <classname>java.lang.String</classname>
+
<description>Customizes vertically a position of order controls relatively to lists</description>
+ <defaultvalue><![CDATA["middle"]]></defaultvalue>
+ </property>
+ <property>
+ <name>listClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for a list</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>disabledControlClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for a disabled control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>topControlClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for top control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>bottomControlClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for bottom control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>upControlClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for up control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>downControlClass</name>
+ <classname>java.lang.String</classname>
+ <description>CSS class for down control</description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
</component>
</components>
Modified:
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
===================================================================
---
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-12-13
20:26:27 UTC (rev 4831)
+++
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-12-13
21:00:40 UTC (rev 4832)
@@ -643,6 +643,15 @@
public abstract boolean isFastMoveControlsVisible();
public abstract void setFastMoveControlsVisible(boolean visible);
+
+ public abstract String getOrderControlsVerticalAlign();
+ public abstract void setOrderControlsVerticalAlign(String align);
+
+ public abstract String getMoveControlsVerticalAlign();
+ public abstract void setMoveControlsVerticalAlign(String align);
+
+ public abstract String getListClass();
+ public abstract void setListClass(String listClass);
private void createValueHolder() {
if (valueHolder == null) {
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
---
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-13
20:26:27 UTC (rev 4831)
+++
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-13
21:00:40 UTC (rev 4832)
@@ -6,7 +6,7 @@
<f:verbatim><![CDATA[
.rich-shuttle-controls {
- padding : 15px 8px;
+ padding : 0px 8px 5px 8px;
}
.rich-shuttle-list-content {
Modified:
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
---
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-13
20:26:27 UTC (rev 4831)
+++
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-13
21:00:40 UTC (rev 4832)
@@ -60,7 +60,7 @@
</tr>
<tr>
<td>
- <div class="rich-shuttle-source-items">
+ <div class="rich-shuttle-source-items #{component.listClass}">
<input id="#{clientId}focusKeeper" type="button"
value="" style="width: 1px; position: absolute; left: -32767px;"/>
<table id="#{clientId}table" cellpadding="0"
cellspacing="0" class="rich-shuttle-body">
@@ -111,7 +111,7 @@
</table>
</div>
</td>
- <td>
+ <td style="vertical-align: #{component.moveControlsVerticalAlign};"
>
<div class="rich-shuttle-controls">
<jsp:scriptlet><![CDATA[
encodeShuttleControlsFacets(context, component, sourceSelectionState,
targetSelectionState);
@@ -120,7 +120,7 @@
</td>
<td>
- <div class="rich-shuttle-target-items" >
+ <div class="rich-shuttle-target-items #{component.listClass}" >
<input type="hidden" value=":" style="display:
none;" name="#{clientId}" />
<input id="#{clientId}tlFocusKeeper" type="button"
value="" style="width: 1px; position: absolute; left: -32767px;"/>
@@ -172,7 +172,7 @@
</table>
</div>
</td>
- <td>
+ <td style="vertical-align: #{component.orderControlsVerticalAlign};"
>
<div class="rich-shuttle-controls">
<jsp:scriptlet><![CDATA[
encodeTLControlsFacets(context, component, targetSelectionState);