[richfaces-svn-commits] JBoss Rich Faces SVN: r5235 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Wed Jan 9 13:01:00 EST 2008


Author: abelevich
Date: 2008-01-09 13:01:00 -0500 (Wed, 09 Jan 2008)
New Revision: 5235

Modified:
   trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
   trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
   trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
rename cb->combobox classes

Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss	2008-01-09 17:32:01 UTC (rev 5234)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss	2008-01-09 18:01:00 UTC (rev 5235)
@@ -8,16 +8,26 @@
 
 
 
-.rich-cb-item-normal {
+.rich-combobox-item-normal {
 }
 
-.rich-cb-font { 
+.rich-combobox-font { 
 } 
 
-.rich-cb-font-disabled { 
+.rich-combobox-font-disabled { 
 } 
 
-.rich-cb-field-disabled {
+.rich-combobox-input-default {
+}
+
+.rich-combobox-input {
+}
+
+.rich-combobox-input-disabled {
+}
+
+
+.rich-combobox-input-default-disabled {
 	position : absolute; 
 	top : 0px; left : 0; 
 	padding-right :20px; 
@@ -28,91 +38,90 @@
 	background-repeat:repeat-x; 
 }
 
-.rich-cb-list {
+.rich-combobox-input-default { 
+	position : absolute; 
+	top : 0px; left : 0px; 
+	padding-right :20px; 
+	padding-left :3px; 
+	margin : 0px; 
+	border : 1px solid #c0c0c0; 
+	background-position:left top;
+	background-repeat:repeat-x; 
+}
+
+.rich-combobox-list {
 	z-index: 1000;
 	overflow: auto;
 	white-space:nowrap;
 }
 
-.rich-cb-list-position { 
+.rich-combobox-list-position { 
 	position : absolute;
 }
 
-.rich-cb-list-decoration { 
+.rich-combobox-list-decoration { 
 	border : 1px solid;  padding : 0px;
 }
 
-.rich-cb-list-scroll { 
+.rich-combobox-list-scroll { 
 	overflow-y : auto;
 	overflow-x : hidden;
 }
 
-.rich-cb-list-cord { 
+.rich-combobox-list-cord { 
 	position : relative;
 }
 
-.rich-cb-item {
+.rich-combobox-item {
 	padding : 2px; white-space : nowrap;
 }
 
 
-.rich-cb-item-selected {
+.rich-combobox-item-selected {
 	padding : 1px; 
-	background-color : #DFE8F6; 
 	border : 1px dotted;
 	cursor:pointer;
 	
 }
 
-.rich-cb-width {
+.rich-combobox-width {
 	 width : 150px;
 }
 
-.rich-cb-strut { 
+.rich-combobox-strut { 
 	position : relative; 
 	visibility : hidden;  
 	margin : 0px; padding : 2px;
 }
 
-.rich-cb-shell {
+.rich-combobox-shell {
 	position : relative;
 }
 
-.rich-cb-field { 
+.rich-combobox-button { 
 	position : absolute; 
-	top : 0px; left : 0px; 
-	padding-right :20px; 
-	padding-left :3px; 
-	margin : 0px; 
-	border : 1px solid #c0c0c0; 
-	background-position:left top;
-	background-repeat:repeat-x; 
-}
-
-.rich-cb-button { 
-	position : absolute; 
 	top : 0px; 
 	right : 0px; //left: fullWidth - 17px; 
 	width : 17px; 
 	margin : 0px; 
-	border : 1px solid #C0C0C0; 
+	border : 1px solid; 
 }
 
-.rich-cb-button-bg { 
+.rich-combobox-button-bg { 
 	background : top  repeat-x;
 	cursor : pointer;
 } 
 
-.rich-cb-button-bg-press { 
+.rich-combobox-button-bg-press { 
 	background : top  repeat-x;
 	cursor : pointer;
 } 
 
-.rich-cb-button-arrow { 
+.rich-combobox-button-arrow { 
 	background : center  no-repeat; cursor : pointer;
 }
 
-.rich-cb-button-arrow-disabled { 
+.rich-combobox-button-arrow-disabled { 
 	background : center  no-repeat; cursor : pointer;
 }
 
@@ -120,82 +129,74 @@
 
 </f:verbatim>
 
-	<u:selector name=".rich-cb-button-bg">
+	<u:selector name=".rich-combobox-button-bg">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" />
 		</u:style>
 		<u:style name="background-color" skin="tabBackgroundColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-button-bg-press">
+	<u:selector name=".rich-combobox-button-bg-press">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonPressGradient" />
 		</u:style>
 		<u:style name="background-color" skin="tabBackgroundColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-button-arrow">
+	<u:selector name=".rich-combobox-button-arrow">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImage" />
 		</u:style>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-button-arrow-disabled">
+	<u:selector name=".rich-combobox-button-arrow-disabled">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImageDisable" />
 		</u:style>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-button">
+	<u:selector name=".rich-combobox-button">
 		<u:style name="border-color" skin="panelBorderColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-font">
+	<u:selector name=".rich-combobox-font">
 		<u:style name="font-size" skin="generalSizeFont"/>
 		<u:style name="font-family" skin="generalFamilyFont"/>
 		<u:style name="color" skin="generalTextColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-font-disabled">
+	<u:selector name=".rich-combobox-font-disabled">
 		<u:style name="color" skin="tabDisabledTextColor"/>
 		<u:style name="font-family" skin="headerFamilyFont"/>
 		<u:style name="font-size" skin="headerSizeFont"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-font-disabled">
-		<u:style name="color" skin="tabDisabledTextColor"/>
-		<u:style name="font-family" skin="headerFamilyFont"/>
-		<u:style name="font-size" skin="headerSizeFont"/>
-	</u:selector>
-	
-	<u:selector name=".rich-cb-field">
+	<u:selector name=".rich-combobox-input-default">
 		<u:style name="background-image">
 			<f:resource f:key="org.richfaces.renderkit.images.ComboBoxInputGradient" />
 		</u:style>
 		<u:style name="border-color" skin="panelBorderColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-item">
+	<u:selector name=".rich-combobox-input-default-disabled">
+		<u:style name="border-color" skin="tabBackgroundColor"/>
+	</u:selector>
+	
+	<u:selector name=".rich-combobox-item">
 		<u:style name="font-size" skin="generalSizeFont"/>
 		<u:style name="font-family" skin="generalFamilyFont"/>
 		<u:style name="color" skin="generalTextColor"/>
 	</u:selector>
 	
-	<u:selector name=".rich-cb-item-selected">
+	<u:selector name=".rich-combobox-item-selected">
 		<u:style name="border-color" skin="generalTextColor"/>
+		<u:style name="background-color" skin="additionalBackgroundColor" />
 	</u:selector>
 	
-	<u:selector name=".rich-cb-list-decoration">
+	<u:selector name=".rich-combobox-list-decoration">
 		<u:style name="border-color" skin="panelBorderColor"/>
 		<u:style name="background" skin="tableBackgroundColor"/>
 	</u:selector>
+
 	
-	<u:selector name=".rich-cb-item-selected">
-		<u:style name="border-color" skin="generalTextColor"/>
-	</u:selector>
-	
-	<u:selector name=".rich-cb-field-disabled">
-		<u:style name="border-color" skin="tabBackgroundColor"/>
-	</u:selector>
-	
 </f:template>

Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2008-01-09 17:32:01 UTC (rev 5234)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2008-01-09 18:01:00 UTC (rev 5235)
@@ -166,13 +166,13 @@
 	},
 	
 	doActive : function() {
-		this.button.className = "rich-cb-button rich-cb-font rich-cb-button-arrow";
- 		this.field.className = "rich-cb-width rich-cb-font rich-cb-field"; //FIXME
+		this.button.className = "rich-combobox-button rich-combobox-font rich-combobox-button-arrow";
+ 		this.field.className = "rich-combobox-font rich-combobox-input-default rich-combobox-input"; //FIXME
 	},
 	
 	doDisable : function() {
-		this.button.className = "rich-cb-button rich-cb-font rich-cb-button-arrow-disabled";
-		this.field.className = "rich-cb-width rich-cb-font-disabled rich-cb-field-disabled"; //FIXME
+		this.button.className = "rich-combobox-button rich-combobox-font rich-combobox-button-arrow-disabled";
+		this.field.className = "rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled"; //FIXME
 	}
 };
 
@@ -460,6 +460,6 @@
 ]
 
 Richfaces.ComboBoxList.CLASSES = {
-	ITEM : {NORMAL : "rich-cb-item rich-cb-item-normal", SELECTED : "rich-cb-item rich-cb-item-selected"},
+	ITEM : {NORMAL : "rich-combobox-item rich-combobox-item-normal", SELECTED : "rich-combobox-item rich-combobox-item-selected"},
 	LIST : {}
 }
\ No newline at end of file

Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-09 17:32:01 UTC (rev 5234)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-09 18:01:00 UTC (rev 5235)
@@ -51,18 +51,18 @@
 		]]>
     </jsp:scriptlet>
 			                					
-	<div id="#{clientId}" class="rich-cb-font rich-cb-shell" style="width:#{listWidth}">
-		<input id="comboboxField#{clientId}" class="rich-cb-font rich-cb-field" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
+	<div id="#{clientId}" class="rich-combobox-font rich-combobox-shell" style="width:#{listWidth}">
+		<input id="comboboxField#{clientId}" class="rich-combobox-font rich-combobox-input-default rich-combobox-input" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
 		</input>
-		<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-bg">
+		<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-button rich-combobox-font rich-combobox-button-bg">
 		</input>
-		<input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-cb-button rich-cb-font rich-cb-button-arrow" 
-			onmousedown="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-cb-button rich-cb-font rich-cb-button-bg-press'"
-			onmouseup="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-cb-button rich-cb-font rich-cb-button-bg'" >
+		<input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-combobox-button rich-combobox-font rich-combobox-button-arrow" 
+			onmousedown="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-button rich-combobox-font rich-combobox-button-bg-press'"
+			onmouseup="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-button rich-combobox-font rich-combobox-button-bg'" >
 		</input>
-		<input type="text" class="rich-cb-strut rich-cb-font" style="width:#{listWidth}">
+		<input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{listWidth}">
 		</input>
-		<div id="listParent#{clientId}" style="display:none;" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position">
+		<div id="listParent#{clientId}" style="display:none;" class="rich-combobox-list-cord rich-combobox-list-scroll rich-combobox-list-decoration rich-combobox-list-position">
 			<div id="list#{clientId}">
 				<f:call name="encodeItems"/>
 			</div>




More information about the richfaces-svn-commits mailing list