Author: sergeyhalipov Date: 2008-02-11 06:28:00 -0500 (Mon, 11 Feb 2008) New Revision: 6002 Modified: trunk/samples/orderingListDemo/src/main/java/org/richfaces/OrderingListDemoBean.java trunk/samples/orderingListDemo/src/main/webapp/pages/index.jsp trunk/ui/orderingList/src/main/config/component/orderinglist.xml trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: http://jira.jboss.com/jira/browse/RF-1949 Modified: trunk/samples/orderingListDemo/src/main/java/org/richfaces/OrderingListDemoBean.java =================================================================== --- trunk/samples/orderingListDemo/src/main/java/org/richfaces/OrderingListDemoBean.java 2008-02-11 10:52:31 UTC (rev 6001) +++ trunk/samples/orderingListDemo/src/main/java/org/richfaces/OrderingListDemoBean.java 2008-02-11 11:28:00 UTC (rev 6002) @@ -12,7 +12,7 @@ private String controlsType = "link"; private String controlsHorizontalAlign = "right"; - private String controlsVerticalAlign = "center"; + private String controlsVerticalAlign = "middle"; private String captionLabel = "Caption"; private String ontopclick = "new Effect.Highlight('form:ontopclickDiv', {startcolor:'#FF0000', endcolor:'#FF0000', restorecolor: 'green'});"; Modified: trunk/samples/orderingListDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2008-02-11 10:52:31 UTC (rev 6001) +++ trunk/samples/orderingListDemo/src/main/webapp/pages/index.jsp 2008-02-11 11:28:00 UTC (rev 6002) @@ -149,15 +149,15 @@ <h:selectOneRadio value="#{demoBean.controlsHorizontalAlign}" > <f:selectItem itemValue="left" itemLabel="left" /> <f:selectItem itemValue="right" itemLabel="right" /> - <a4j:support event="onchange" reRender="orderingList1" /> + <a4j:support event="onchange" reRender="orderingList1" ajaxSingle="true" /> </h:selectOneRadio> <h:outputText value="Controls Vertical Align" /> <h:selectOneRadio value="#{demoBean.controlsVerticalAlign}" > <f:selectItem itemValue="top" itemLabel="top" /> <f:selectItem itemValue="bottom" itemLabel="bottom" /> - <f:selectItem itemValue="center" itemLabel="center" /> - <a4j:support event="onchange" reRender="orderingList1" /> + <f:selectItem itemValue="middle" itemLabel="middle" /> + <a4j:support event="onchange" reRender="orderingList1" ajaxSingle="true" /> </h:selectOneRadio> <h:outputText value="Order Controls Visible" /> Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-02-11 10:52:31 UTC (rev 6001) +++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-02-11 11:28:00 UTC (rev 6002) @@ -138,9 +138,9 @@ Controls vertical rendering. Possible values: top - controls should be rendered aligned to top side of a list. bottom - controls should be rendered aligned to bottom side of a list. - center(Default) - controls should be rendered centered relatively to a list. + middle (default) - controls should be rendered centered relatively to a list. </description> - <defaultvalue><![CDATA[""]]></defaultvalue> + <defaultvalue><![CDATA["middle"]]></defaultvalue> </property> <property> <name>sortIconUp</name> Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-02-11 10:52:31 UTC (rev 6001) +++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-02-11 11:28:00 UTC (rev 6002) @@ -67,7 +67,7 @@ } .rich-ordering-list-button-layout { - padding : 15px 8px 15px 0px; + padding : 15px 0px 15px 0px; } .rich-ordering-list-button-content { Modified: trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-02-11 10:52:31 UTC (rev 6001) +++ trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-02-11 11:28:00 UTC (rev 6002) @@ -37,7 +37,18 @@ <f:call name="encodeCaption"/> </td> </tr> - <tr> + <tr> + <jsp:scriptlet><![CDATA[ + if ("left".equals(component.getAttributes().get("controlsHorizontalAlign"))) { + ]]></jsp:scriptlet> + <td class="rich-ordering-list-button-valign" style="vertical-align: #{component.attributes['controlsVerticalAlign']}" > + <div class="rich-ordering-list-button-layout"> + <f:call name="encodeControlsFacets" /> + </div> + </td> + <jsp:scriptlet><![CDATA[ + } + ]]></jsp:scriptlet> <td> <div id="#{clientId}headerBox" class="rich-ordering-list-output"> <jsp:scriptlet><![CDATA[ @@ -74,12 +85,17 @@ </div> </div> </td> - <td class="rich-ordering-list-button-valign"> - <div class="rich-ordering-list-button-layout"> - <f:call name="encodeControlsFacets" /> - </div> - <f:clientId var="clientId"/> - </td> + <jsp:scriptlet><![CDATA[ + if (!"left".equals(component.getAttributes().get("controlsHorizontalAlign"))) { + ]]></jsp:scriptlet> + <td class="rich-ordering-list-button-valign" style="vertical-align: #{component.attributes['controlsVerticalAlign']}" > + <div class="rich-ordering-list-button-layout"> + <f:call name="encodeControlsFacets" /> + </div> + </td> + <jsp:scriptlet><![CDATA[ + } + ]]></jsp:scriptlet> </tr> </tbody> </table> @@ -96,7 +112,7 @@ Richfaces.OrderingListSelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}); - var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); + var layoutManager = new LayoutManager('#{cId}internal_header_tab', '#{cId}internal_tab'); layoutManager.widthSynchronization(); }); //setTimeout(init, 0);