Author: vmolotkov Date: 2008-04-07 10:01:00 -0400 (Mon, 07 Apr 2008) New Revision: 7629 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/templates/org/richfaces/htmlOrderingList.jspx Log: http://jira.jboss.com/jira/browse/RF-2730 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 2008-04-07 12:33:10 UTC (rev 7628) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-04-07 14:01:00 UTC (rev 7629) @@ -67,7 +67,7 @@ } .rich-ordering-list-button-layout { - padding : 15px 8px 15px 0px; + padding : 0px 8px 0px 0px; } .rich-ordering-list-button-content { @@ -105,7 +105,7 @@ .rich-ordering-list-output { border : 1px solid; - margin : 0px 8px 8px 8px; + margin : 0px 8px 0px 8px; background: none repeat scroll 0% 50%; } Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-04-07 12:33:10 UTC (rev 7628) +++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-04-07 14:01:00 UTC (rev 7629) @@ -33,11 +33,39 @@ <table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-ordering-list-body"> <tbody> <tr style="#{this:getCaptionDisplay(context, component)}" > + <jsp:scriptlet><![CDATA[ + String controlsHorizontalAlign = (String) component.getAttributes().get("controlsHorizontalAlign"); + if ("left".equals(controlsHorizontalAlign)) { + ]]></jsp:scriptlet> + <td></td> + <jsp:scriptlet><![CDATA[ + } + ]]></jsp:scriptlet> <td colspan="2" class="rich-ordering-list-caption"> <f:call name="encodeCaption"/> </td> + <jsp:scriptlet><![CDATA[ + if ("right".equals(controlsHorizontalAlign)) { + ]]></jsp:scriptlet> + <td></td> + <jsp:scriptlet><![CDATA[ + } + ]]></jsp:scriptlet> </tr> <tr> + <jsp:scriptlet><![CDATA[ + String controlsVerticalAlign = (String) component.getAttributes().get("controlsVerticalAlign"); + variables.setVariable("controlsVerticalAlign", controlsVerticalAlign); + if ("left".equals(controlsHorizontalAlign)) { + ]]></jsp:scriptlet> + <td class="rich-ordering-list-button-valign" style="vertical-align: #{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 +102,19 @@ </div> </div> </td> - <td class="rich-ordering-list-button-valign"> + <jsp:scriptlet><![CDATA[ + String controlsHorizontalAlign = (String) component.getAttributes().get("controlsHorizontalAlign"); + if ("right".equals(controlsHorizontalAlign)) { + ]]></jsp:scriptlet> + <td class="rich-ordering-list-button-valign" style="vertical-align: #{controlsVerticalAlign}"> <div class="rich-ordering-list-button-layout"> <f:call name="encodeControlsFacets" /> </div> - <f:clientId var="clientId"/> </td> + <jsp:scriptlet><![CDATA[ + } + ]]></jsp:scriptlet> + <f:clientId var="clientId"/> </tr> </tbody> </table>