Author: vmolotkov Date: 2007-11-15 07:52:25 -0500 (Thu, 15 Nov 2007) New Revision: 4001 Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: cosmetic changes Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 12:30:58 UTC (rev 4000) +++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 12:52:25 UTC (rev 4001) @@ -6,48 +6,17 @@ <f:verbatim><![CDATA[ - .ol_button_light{background : url(ol_images/bg_header.png) top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;} - .ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px} - .ol_button_press{background : url(ol_images/bg_press.png) top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;} - .ol_center_button_col_valign{vertical-align : middle} - .ol_right_button_col_valign{vertical-align : middle} - .ol_button_content{font-family : Arial; font-size :11px; padding : 0px 0px 0px 0px; text-align : center;} +.ol_button_layout{padding : 15px 8px 15px 0px;} +.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;} +.ol_button{background : url(ol_images/bg_header.png) top left #C6D6EA repeat-x; cursor : pointer; padding : 2px; font-family : Arial; font-size :11px;} +.ol_button_light{background : url(ol_images/bg_header.png) top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;} +.ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px} +.ol_button_press{background : url(ol_images/bg_press.png) top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;} +.ol_center_button_col_valign{vertical-align : middle} +.ol_right_button_col_valign{vertical-align : middle} +.ol_button_content{font-family : Arial; font-size :11px; padding : 0px 0px 0px 0px; text-align : center;} -.ol_caption { - padding : 1px; - height: 8px; -} - -.ol_body{border : 0px solid #bfbfc0;} - -.ol_label{font-family : Arial; font-size :11px; font-weight : bold;} - -.ol_out_label{padding : 3px 3px 3px 8px} - -.ol_list{overflow : auto; width : 200px; height : 150px; background : #FFFFFF; border : 1px solid #bfbfc0;} - -.ol_outputlist{ margin : 0px 8px 8px 8px;} - -.ol_list_content { - overflow : auto; - width: 300px; - height: 232px; -} - -.ol_list_header { - overflow: hidden; - width: 300px; - height: 18px; -} - -.ol_button { - background : repeat scroll left top; - border : 1px solid #bfbfc0; - margin-bottom : 3px; - cursor : pointer; - padding : 1px; -} - +/* .ol_button_clicked { background : repeat scroll left top; border : 1px solid #bfbfc0; @@ -55,12 +24,7 @@ cursor : pointer; padding : 1px; } - -.ol_button_layout{padding : 15px 8px 15px 0px;} -.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;} - - .ol_button_dis { background : #bfbfc0; border : 1px solid #bfbfc0; @@ -74,27 +38,44 @@ margin-bottom : 3px; padding : 2px 0px 0px 2px; } +*/ +.ol_caption { + padding : 1px; + height: 8px; +} + +.ol_body{border : 0px solid #bfbfc0;} + +.ol_label{font-family : Arial; font-size :11px; font-weight : bold;} + +.ol_out_label{padding : 3px 3px 3px 8px} + +.ol_list{background : #FFFFFF; border : 1px solid #bfbfc0;} + +.ol_outputlist{ margin : 0px 8px 8px 8px;} + +.ol_list_content { + overflow-y : scroll; + overflow-x: auto; + /*width: 300px; + height: 232px;*/ + width: 200px; + height: 150px; +} + +.ol_list_header { + overflow: hidden; + /*width: 300px;*/ + height: 18px; +} + .ol_internal_header_tab { background : repeat scroll left top; - width : 100%; + /*width : 100%;*/ } -<<<<<<< .mine -.ol_internal_header_tab th { - color : #FFFFFF; - - font-family : Arial; - font-size :11px; - font-weight : normal; - border-bottom : 1px solid #bfbfc0; - border-right : 1px solid #bfbfc0; - padding : 2px; - white-space: nowrap; -} -======= .ol_internal_header_tab th{background : url(ol_images/bg_header.png) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px} ->>>>>>> .r3997 .ol_internal_header_tab .ol_endcol { border-right : 0px; @@ -105,25 +86,14 @@ width : 100%; } -.ol_internal_tab .ol_endcol{border-right : 0px} +.ol_internal_tab .ol_endcol{border-right : 0px;white-space: nowrap;} -.ol_internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0;border-top : 1px solid #FFFFFF; padding : 2px} +.ol_internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0; border-top : 1px solid #FFFFFF; padding : 2px;white-space: nowrap;} - -<<<<<<< .mine -.ol_internal_tab tr.ol_select { - background : repeat scroll left top; -} -======= .ol_internal_tab tr.ol_select{background : #EAF0F8} ->>>>>>> .r3997 .ol_internal_tab tr.ol_active { -<<<<<<< .mine - background : repeat scroll left top; -======= background : #EAF0F8; color : #4A75B5; ->>>>>>> .r3997 } .ol_internal_tab tr.ol_normal { @@ -251,6 +221,5 @@ <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" /> </u:style> <u:style name="background-color" skin="additionalBackgroundColor" /> - <u:style name="color" skin="hoverLinkColor" /> </u:selector> </f:template> \ No newline at end of file Modified: trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-15 12:30:58 UTC (rev 4000) +++ trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-15 12:52:25 UTC (rev 4001) @@ -35,12 +35,12 @@ <tr> <td> <div id="#{clientId}headerBox" class="ol_list ol_outputlist"> - <div class="ol_list_header" style="width: #{component.attributes['listHeight']}px;"> + <div class="ol_list_header" style="width: #{component.attributes['listWidth']}px;"> <table id="#{clientId}internal_header_tab" class="ol_internal_header_tab rich-ordering-list-items" cellpadding="0" cellspacing="0"> <f:call name="encodeHeader"/> </table> </div> - <div id="#{clientId}contentBox" class="ol_list_content" style="width: #{component.attributes['listHeight']}px; height:#{component.attributes['listWidth']}px;"> + <div id="#{clientId}contentBox" class="ol_list_content" style="width: #{component.attributes['listWidth']}px; height:#{component.attributes['listHeight']}px;"> <table id="#{clientId}internal_tab" class="ol_internal_tab" cellpadding="0" cellspacing="0"> <tbody id="#{clientId}tbody"> <vcp:body> @@ -51,7 +51,7 @@ </div> </div> </td> - <td class="ol_button_layout"> + <td class="ol_center_button_col_valign"> <div class="ol_button_layout"> <div class="ol_button_border"><div class="ol_button" onmouseover="this.className='ol_button_light'" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><div class="ol_button_content"><img src="img/up.gif" width="15" height="15" alt="" border="0"/></div></div></div> <div class="ol_button_border"><div class="ol_button" onmouseover="this.className='ol_button_light'" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><div class="ol_button_content"><img src="img/down.gif" width="15" height="15" alt="" border="0"/></div></div></div>