[richfaces-svn-commits] JBoss Rich Faces SVN: r4512 - in branches/3.1.x/ui/listShuttle/src/main: templates/org/richfaces and 1 other directory.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Wed Dec 5 13:14:33 EST 2007


Author: sergeyhalipov
Date: 2007-12-05 13:14:33 -0500 (Wed, 05 Dec 2007)
New Revision: 4512

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/templates/org/richfaces/htmlListShuttle.jspx
Log:
List shuttle skinning.
http://jira.jboss.com/jira/browse/RF-1179

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-05 17:38:26 UTC (rev 4511)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss	2007-12-05 18:14:33 UTC (rev 4512)
@@ -5,20 +5,10 @@
 
 <f:verbatim><![CDATA[
 
-.shuttle_button {
-	background: none repeat scroll 0%;
-	border: 1px solid;
-	cursor: pointer;
-	margin-bottom: 3px;
-	padding: 1px;
+.rich-shuttle-­controls {
+	padding : 15px 8px 15px 0px;
 }
 
-.shuttle_button_layout{padding : 15px 8px 15px 0px;}
-.shuttle_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px;  padding : 1px}
-.shuttle_button_press{background : #4A75B5; border : 1px solid #bfbfc0; margin-bottom : 3px;  padding : 2px 0px 0px 2px}
-.shuttle_center_button_col_valign{vertical-align : middle}
-.shuttle_right_button_col_valign{vertical-align : middle}
-
 .rich-shuttle-list-content {
 	overflow: auto;
 }
@@ -31,35 +21,10 @@
 	padding : 0px 2px;
 }
 
-.rich-shuttle-internal-header-tab .ol_endcol {
-	border-right : 0px;
-	white-space: nowrap;
-	width:100%;
-}
-
 .rich-shuttle-internal-tab {
 	width:100%;
 }
 
-.rich-shuttle-internal-tab .ol_endcol{border-right : 0px;}
-
-.rich-shuttle-internal-tab tr.ol_select{background : #EAF0F8}
-
-.rich-shuttle-internal-tab tr.ol_active {
-	background :   #EAF0F8; color : #4A75B5;
-}
-
-.rich-shuttle-internal-tab tr.ol_active td{
-	color : #4A75B5;
-}
-
-.ol_control_shown {
-	display: block;
-}
-.ol_control_hidden {
-	display: none;
-}
-
 .body {
 	-moz-user-select: none;
 }
@@ -79,84 +44,12 @@
 	<u:style name="border" value="0"/>
 	<u:style name="white-space" value="nowrap"/>
 </u:selector>
-<u:selector name=".ol_control_bn_up">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconUp" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_down">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconDown" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_top">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconTop" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_bn_bottom">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconBottom" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_up">
-	<u:style name="disabled" value="true"/>
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconUpDisabled" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_down">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconDownDisabled" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_top">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconTopDisabled" />
-	</u:style>
-</u:selector>
-<u:selector name=".ol_control_dbn_bottom">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled" />
-	</u:style>
-</u:selector>
 
-<u:selector name=".shuttle_button">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
-	</u:style>
-	<u:style name="background-color" skin="headerBackgroundColor" />
-</u:selector>
-
-<u:selector name=".shuttle_button_press">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListClickedGradient" />
-	</u:style>
-	<u:style name="background-color" skin="headerBackgroundColor" />
-</u:selector>
-
-<u:selector name=".rich-shuttle-internal-tab tr.ol_select">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
-	</u:style>
-	<u:style name="background-color" skin="additionalBackgroundColor" />
-</u:selector>
-
-<u:selector name=".rich-shuttle-internal-tab tr.ol_active">
-	<u:style name="background-image">
-		<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" />
-	</u:style>
-	<u:style name="background-color" skin="additionalBackgroundColor" />
-</u:selector>
-
-
-
-<!-- Ordering List copied -->
-
 <f:verbatim><![CDATA[
 
-.rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom, .rich-shuttle-control-up, .rich-shuttle-control-down,
-.rich-shuttle-control-copyall, .rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall {
+.rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom, 
+.rich-shuttle-control-up, .rich-shuttle-control-down, .rich-shuttle-control-copyall,
+.rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall {
 	border : 1px solid;
 	margin-bottom : 3px;
 }
@@ -214,25 +107,6 @@
 	padding: 3px 3px 3px 0px;
 }
 
-.rich-ordering-list-body {
-	border : 0px solid;
-}
-
-.rich-ordering-list-output {
-	border : 1px solid;
-	margin : 0px 8px 8px 8px;
-	background: none repeat scroll 0% 50%;
-}
-
-.rich-ordering-list-content {
-	overflow: auto;
-}
-
-.rich-ordering-list-header {
-	overflow: hidden;
-	height: 18px;
-}
-
 .rich-shuttle-source-items {
 	margin: 0px 8px 8px;
 }
@@ -241,15 +115,6 @@
 	margin: 0px 8px 8px 0px;
 }
 
-.rich-ordering-list-active {
-	background : repeat scroll left top;
-	width: 100%;
-}
-
-.rich-ordering-list-disabled {
-	background : repeat scroll left top;
-}
-
 .rich-shuttle-source-row-active, .rich-shuttle-target-row-active {
 	background : transparent none repeat-x scroll left top;
 }
@@ -258,31 +123,19 @@
 	background : transparent none repeat-x scroll left top;
 }
 
-.rich-ordering-list-table-header-cell {
-	background : none top left repeat-x;
-	border-style: solid;
-	padding : 2px;
-}
-
 .rich-shuttle-header-tab-cell-end {
 	border-right : 0px;
 	white-space: nowrap;
 	padding : 2px;
 }
 
-.rich-ordering-list-cell-end {
-	border-right : 0px;
-	white-space: nowrap;
-	padding : 2px;
-}
-
 .rich-shuttle-source-cell, .rich-shuttle-target-cell {
 	padding : 2px;
 	white-space: nowrap;
 }
 
 .rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected * {
-	padding : 2px;
+	padding : 2px 0px;
 	white-space: nowrap;
 }
 
@@ -292,19 +145,6 @@
 	border-bottom: 1px dotted gray;
 } 
 
-.rich-ordering-list-ds {
-	-moz-user-select: -moz-none;
-}
-
-.rich-ordering-list-fk {
-	width: 1px;
-	position: absolute;
-	left: -32767px;
-}
-
-.rich-ordering-list-ds input {
-	-moz-user-select: text;
-}
 ]]>
 </f:verbatim>
 
@@ -375,22 +215,6 @@
 		<u:style name="color" skin="generalTextColor"/>
 	</u:selector>
 
-	<u:selector name=".rich-ordering-list-table-header-cell">
-		<u:style name="background-image">
-			<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
-		</u:style>
-		<u:style name="background-color" skin="headerBackgroundColor" />
-		<u:style name="color" skin="headerTextColor" />
-		<u:style name="font-family" skin="headerFamilyFont" />
-		<u:style name="font-size" skin="headerSizeFont" />
-		<u:style name="font-weight" skin="headerWeightFont" />
-		<u:style name="border-width" skin="tableBorderWidth" />
-		<u:style name="border-top-color" skin="subBorderColor" />
-		<u:style name="border-bottom-color" skin="tableBorderColor" />
-		<u:style name="border-right-color" skin="tableBorderColor" />
-		<u:style name="border-left-color" skin="panelBorderColor" />
-	</u:selector>
-	
 	<u:selector name=".rich-shuttle-header-tab-cell-end">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListHeaderGradient" />
@@ -402,11 +226,6 @@
 		<u:style name="font-weight" skin="headerWeightFont" />
 	</u:selector>
 	
-	<u:selector name=".rich-ordering-list-cell-end">
-		<u:style name="font-family" skin="generalFamilyFont" />
-		<u:style name="font-size" skin="generalSizeFont" />
-	</u:selector>
-
 	<u:selector name=".rich-shuttle-source-items, .rich-shuttle-target-items">
 		<u:style name="background-color" skin="generalBackgroundColor" />
 		<u:style name="border-color" skin="panelBorderColor" />
@@ -415,17 +234,6 @@
 		<u:style name="overflow" value="auto" />
 	</u:selector>
 	
-	<u:selector name=".rich-ordering-list-output">
-		<u:style name="background-color" skin="generalBackgroundColor" />
-		<u:style name="border-color" skin="panelBorderColor" />
-	</u:selector>
-	
-	<u:selector name=".rich-ordering-list-cell, .rich-ordering-list-cell *">
-		<u:style name="color" skin="generalTextColor"/>
-		<u:style name="font-family" skin="generalFamilyFont" />
-		<u:style name="font-size" skin="generalSizeFont" />
-	</u:selector>
-	
 	<u:selector name=".rich-shuttle-source-cell-selected, .rich-shuttle-target-cell-selected, .rich-shuttle-source-cell-selected *, .rich-shuttle-target-cell-selected *">
 		<u:style name="color" skin="generalTextColor"/>
 		<u:style name="font-family" skin="generalFamilyFont" />

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-05 17:38:26 UTC (rev 4511)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-05 18:14:33 UTC (rev 4512)
@@ -106,7 +106,7 @@
 					</div> 
 				</td>
 				<td>
-					<div class="shuttle_button_layout">
+					<div class="rich-shuttle-­controls">
 						<jsp:scriptlet><![CDATA[
 							encodeShuttleControlsFacets(context, component, sourceSelectionState, targetSelectionState);
 						]]></jsp:scriptlet>
@@ -164,8 +164,8 @@
 						</table>
 					</div> 
 				</td>
-				<td class="ol_center_button_col_valign">
-					<div class="shuttle_button_layout rich-ordering­controls">
+				<td>
+					<div class="rich-shuttle-­controls">
 						<jsp:scriptlet><![CDATA[
 							encodeTLControlsFacets(context, component, targetSelectionState);
 						]]></jsp:scriptlet>




More information about the richfaces-svn-commits mailing list