[richfaces-svn-commits] JBoss Rich Faces SVN: r5538 - 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
Tue Jan 22 12:01:45 EST 2008
Author: vmolotkov
Date: 2008-01-22 12:01:45 -0500 (Tue, 22 Jan 2008)
New Revision: 5538
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:
strict template is added
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-22 16:49:45 UTC (rev 5537)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-22 17:01:45 UTC (rev 5538)
@@ -13,14 +13,21 @@
}
.rich-combobox-input {
- position : absolute;
+ /*position : absolute;
top : 0px; left : 0;
padding-right :20px;
padding-left :3px;
margin : 0px;
border : 1px solid;
background-position:left top;
- background-repeat:repeat-x;
+ background-repeat:repeat-x;*/
+ width : 240px;
+ position : absolute;
+ top : 0px;
+ left : 0;
+ padding-left :3px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
}
.rich-combobox-input-disabled {
@@ -35,7 +42,7 @@
}
.rich-combobox-input-inactive {
- position : absolute;
+ /*position : absolute;
top : 0px;
left : 0px;
padding-right :20px;
@@ -43,7 +50,17 @@
margin : 0px;
border : 1px solid;
background-position:left top;
- background-repeat:repeat-x;
+ background-repeat:repeat-x;*/
+
+ width : 240px;
+ position : absolute;
+ top : 0px;
+ left : 0;
+ padding-left :3px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
+ /*background-image: url(SpinnerFieldGradient.gif);
+ */ background-position:left top;
}
.rich-combobox-list-position {
position : absolute;
@@ -90,12 +107,23 @@
}
.rich-combobox-button {
- position : absolute;
+ /*position : absolute;
top : 0px;
right : 0px; //left: fullWidth - 17px;
width : 17px;
margin : 0px;
- border : 1px solid;
+ border : 1px solid;*/
+
+ position : absolute;
+ top : 0px;
+ right : 0;
+ width : 17px;
+ padding-left : 0px;
+ padding-right : 0px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
+ /*border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248);*/
+ /*panelBorderColor*/
}
.rich-combobox-button-disabled {
@@ -108,12 +136,23 @@
}
.rich-combobox-button-inactive {
- position : absolute;
+ /*position : absolute;
top : 0px;
right : 0px; //left: fullWidth - 17px;
width : 17px;
margin : 0px;
- border : 1px solid;
+ border : 1px solid;*/
+
+ position : absolute;
+ top : 0px;
+ right : 0;
+ width : 17px;
+ padding-left : 0px;
+ padding-right : 0px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
+ /*border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248);*/
+ /*panelBorderColor*/
}
.rich-combobox-button-background {
@@ -149,6 +188,12 @@
background : center no-repeat; cursor : pointer;
}
+
+.cb_shadow{ top:10; left:0; position : absolute;}
+.cb_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;}
+.cb_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;}
+.cb_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;}
+.cb_shadow_br{ background : url(images/bg_shadow.png) repeat-x bottom right;}
]]>
</f:verbatim>
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-22 16:49:45 UTC (rev 5537)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-22 17:01:45 UTC (rev 5538)
@@ -485,7 +485,7 @@
},
setWidth : function(width) {
- var positionElem = this.listParent.childNodes[0];
+ var positionElem = this.listParent.childNodes[2];
var combobox = this.listParent.parentNode;
combobox.style.width = width;
@@ -600,7 +600,7 @@
resetState : function() {
var tempList = this.list.cloneNode(false);
- this.listParent.childNodes[0].firstChild.replaceChild(tempList, this.list);
+ this.listParent.childNodes[2].firstChild.replaceChild(tempList, this.list);
this.list = $(tempList.id);
this.activeItem = null;
this.isList = false;
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-22 16:49:45 UTC (rev 5537)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-22 17:01:45 UTC (rev 5538)
@@ -181,12 +181,26 @@
]]>
</jsp:scriptlet>
-
- <div id="#{clientId}">
- <div id="control#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; z-index:1;#{style}"
- x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
- <div class="rich-combobox-font rich-combobox-shell" style="width:#{width};z-index:1;">
- <input id="comboboxField#{clientId}"
+ <jsp:scriptlet>
+ <![CDATA[
+ if (listWidth == null) {
+ ]]>
+ </jsp:scriptlet>
+ <style>
+
+ </style>
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
+ <f:resource var="spacer" name="images/spacer.gif"/>
+
+<div id="control#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth};#{style}"
+ x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
+ <div class="rich-combobox-list-cord"></div>
+ <div class="rich-combobox-font rich-combobox-shell" style="width:#{width};">
+ <input id="comboboxField#{clientId}"
name="comboboxField#{clientId}"
disabled="#{disabled}"
class="rich-combobox-font-inactive rich-combobox-input-inactive #{inputDisabledClass}" type="text"
@@ -195,30 +209,44 @@
onchange="#{component.attributes['onchange']}"
onselect="#{component.attributes['onselect']}"
onblur="#{component.attributes['onblur']}"
- style="width:#{width}; #{inputStyle}">
- </input>
- <input id="comboBoxButtonBG#{clientId}" readonly="readonly" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive">
- </input>
- <input id="comboboxButton#{clientId}" readonly="readonly" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};"
- class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}">
- </input>
-
- <input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{width}">
- </input>
- </div>
+ style="width:#{width}; #{inputStyle}"
+ />
+ <input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
+ <input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};"
+ class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/>
+ <div class="rich-combobox-strut rich-combobox-fon" style="width:#{width}">Strut</div>
+ </div>
+ <div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};">
+ <iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="display:none; width:#{listWidth};"/>
+ <div class="cb_shadow">
+ <table cellpadding="0" cellspacing="0" border="0" width="255" height="109">
+ <tr>
+ <td class="cb_shadow_tl">
+ <img src="#{spacer}" width="10" height="1" alt="" border="0"></img><br></br>
+ </td>
+ <td class="cb_shadow_tr">
+ <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br>
+ </td>
+ </tr>
+ <tr>
+ <td class="cb_shadow_bl">
+ <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br>
+ </td>
+ <td class="cb_shadow_br">
+ <img src="#{spacer}" width="10" height="10" alt="" border="0"></img><br></br>
+ </td>
+ </tr>
+ </table>
</div>
- <iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="display:none; width:#{listWidth};z-index:2;"/>
- <div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};z-index:3;">
- <div id="listPosition#{clientId}" class="rich-combobox-list-position" style="width:#{listWidth};">
- <div id="listDecoration#{clientId}" class="rich-combobox-list-decoration">
- <div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};">
- <f:call name="encodeItems"/>
- </div>
+ <div id="listPosition#{clientId}" class="rich-combobox-list-position">
+ <div id="listDecoration#{clientId}" class="rich-combobox-list-decoration">
+ <div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};">
+ <f:call name="encodeItems"/>
</div>
</div>
</div>
</div>
-
+</div>
<script type="text/javascript">
Richfaces.ComboBox.CLASSES = {
More information about the richfaces-svn-commits
mailing list