Author: vmolotkov Date: 2008-03-17 11:45:18 -0400 (Mon, 17 Mar 2008) New Revision: 6865 Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx Log: bugs RF-2016,RF-2015 Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml =================================================================== --- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-17 15:27:52 UTC (rev 6864) +++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-17 15:45:18 UTC (rev 6865) @@ -404,17 +404,11 @@ </property> <property> - <name>moveControlsVerticalAlign</name> + <name>controlsVerticalAlign</name> <classname>java.lang.String</classname> - <description>Customizes vertically a position of move/copy controls relatively to lists</description> + <description>Customizes vertically a position of move/copy and order 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> Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2008-03-17 15:27:52 UTC (rev 6864) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2008-03-17 15:45:18 UTC (rev 6865) @@ -657,6 +657,9 @@ } } + public abstract String getControlsVerticalAlign(); + public abstract void setControlsVerticalAlign(String controlsVerticalAlign); + public abstract boolean isOrderControlsVisible(); public abstract void setOrderControlsVisible(boolean visible); @@ -669,12 +672,6 @@ 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); Modified: trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx =================================================================== --- trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-03-17 15:27:52 UTC (rev 6864) +++ trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-03-17 15:45:18 UTC (rev 6865) @@ -114,7 +114,7 @@ </table> </div> </td> - <td style="vertical-align: #{component.moveControlsVerticalAlign};" > + <td style="vertical-align: #{component.controlsVerticalAlign};" > <div class="rich-shuttle-controls"> <jsp:scriptlet><![CDATA[ encodeShuttleControlsFacets(context, component, sourceSelectionState, targetSelectionState); @@ -175,7 +175,7 @@ </table> </div> </td> - <td style="vertical-align: #{component.orderControlsVerticalAlign};" > + <td style="vertical-align: #{component.controlsVerticalAlign};" > <div class="rich-shuttle-controls"> <jsp:scriptlet><![CDATA[ encodeTLControlsFacets(context, component, targetSelectionState);