Author: konstantin.mishin Date: 2011-02-03 14:54:01 -0500 (Thu, 03 Feb 2011) New Revision: 21433 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml trunk/ui/input/ui/src/main/templates/select.template.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml Log: RF-9605 Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2011-02-03 19:54:01 UTC (rev 21433) @@ -403,4 +403,8 @@ border-color: '#{richSkin.panelBorderColor}'; border-right-color: '#{richSkin.tableBackgroundColor}'; border-bottom-color: '#{richSkin.tableBackgroundColor}'; +} + +input.rf-cal-dflt-lbl { + color:#b3b3b3; } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2011-02-03 19:54:01 UTC (rev 21433) @@ -276,6 +276,11 @@ if (!this.selectedDate) { var field = rf.getDomElement(this.INPUT_DATE_ID); field.value = value; + if (value) { + $(field).addClass("rf-cal-dflt-lbl"); + } else { + $(field).removeClass("rf-cal-dflt-lbl"); + } } } Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-02-03 19:54:01 UTC (rev 21433) @@ -190,3 +190,7 @@ .rf-ii-none { clip: rect(0px, 0px, 1px, 1px); } + +.rf-ii-dflt-lbl { + color:#b3b3b3; +} \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-02-03 19:54:01 UTC (rev 21433) @@ -40,6 +40,7 @@ return { name : "inplaceInput", + defaultLabelClass : "rf-ii-dflt-lbl", getName: function() { return this.name; @@ -100,6 +101,11 @@ setLabel: function(value) { this.label.text(value); + if (value == this.defaultLabel) { + this.label.addClass(this.defaultLabelClass); + } else { + this.label.removeClass(this.defaultLabelClass); + } }, isValueChanged: function () { Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-02-03 19:54:01 UTC (rev 21433) @@ -230,3 +230,7 @@ left : 6px; right : 0px; } + +.rf-is-dflt-lbl { + color:#b3b3b3; +} Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2011-02-03 19:54:01 UTC (rev 21433) @@ -43,6 +43,7 @@ return{ name : "inplaceSelect", + defaultLabelClass : "rf-is-dflt-lbl", getName: function() { return this.name; Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputBase.js 2011-02-03 19:54:01 UTC (rev 21433) @@ -61,6 +61,13 @@ __setValue: function(value){ this.input.val(value); + if (this.defaultLabelClass) { + if (value == this.defaultLabel) { + this.input.addClass(this.defaultLabelClass); + } else { + this.input.removeClass(this.defaultLabelClass); + } + } }, getValue: function() { Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.ecss 2011-02-03 19:54:01 UTC (rev 21433) @@ -153,4 +153,8 @@ .rf-sel-lst-ul{ margin: 0px; padding: 0px; +} + +input.rf-sel-dflt-lbl { + color:#b3b3b3; } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2011-02-03 19:54:01 UTC (rev 21433) @@ -68,6 +68,7 @@ $.extend(rf.ui.Select.prototype, ( function () { return{ name : "select", + defaultLabelClass : "rf-sel-dflt-lbl", __onBtnMouseDown: function(e) { if(!this.popupList.isVisible()) { Modified: trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -43,7 +43,7 @@ <cdk:object type="java.lang.String" name="inplaceValue" value="#{getValue(facesContext, component)}" /> <span id="#{clientId}" class="#{getStateStyleClass(component, inplaceState)}" cdk:passThroughWithExclusions="id class"> - <span id="#{clientId}Label" class="rf-ii-lbl"> + <span id="#{clientId}Label" class="rf-ii-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-ii-dflt-lbl' : ''}"> #{inplaceValue} </span> Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -39,7 +39,7 @@ <span id="#{clientId}" class="#{getStateStyleClass(component, inplaceState)}" cdk:passThroughWithExclusions="id class"> - <span id="#{clientId}Label" class="rf-is-lbl"> + <span id="#{clientId}Label" class="rf-is-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-is-dflt-lbl' : ''}"> #{inplaceValue} </span> Modified: trunk/ui/input/ui/src/main/templates/select.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/select.template.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/main/templates/select.template.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -22,13 +22,14 @@ <div id="#{clientId}" class="rf-sel"> <span class="rf-sel-cntr"> <input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getInputValue(facesContext, component)}"/> + <cdk:object type="java.lang.String" name="label" value="#{getSelectLabel(facesContext, component)}" /> <input cdk:passThroughWithExclusions="class autocomplete id value disabled name type readonly onchange onblur onfocus" id="#{clientId}Input" - value="#{getSelectLabel(facesContext, component)}" + value="#{label}" disabled="#{disabled}" name="#{clientId}Input" type="text" - class="rf-sel-inp" + class="rf-sel-inp#{label == component.attributes['defaultLabel'] ? ' rf-sel-dflt-lbl' : ''}" autocomplete="off" readonly="#{component.attributes['enableManualInput'] ? '' : 'readonly'}"/> <c:if test="#{component.attributes['showButton']}"> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-ii-d-s" id="form:inplaceInputDefault"> - <span class="rf-ii-lbl" id="form:inplaceInputDefaultLabel">Edit Text</span> + <span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputDefaultLabel">Edit Text</span> <input class="rf-ii-none" id="form:inplaceInputDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-ii-d-s rf-ii-e-s" id="form:inplaceInputEdit"> - <span class="rf-ii-lbl" id="form:inplaceInputEditLabel">Edit Text</span> + <span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputEditLabel">Edit Text</span> <input class="rf-ii-none" id="form:inplaceInputEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-ii-d-s" id="form:inplaceInputWithControls"> - <span class="rf-ii-lbl" id="form:inplaceInputWithControlsLabel">Edit Text</span> + <span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputWithControlsLabel">Edit Text</span> <input class="rf-ii-none" id="form:inplaceInputWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-is-d-s" id="form:inplaceSelectDefault"> - <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span> + <span class="rf-is-lbl rf-is-dflt-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span> <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" name="form:inplaceSelectDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit"> <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" type="hidden" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-is-d-s rf-is-e-s" id="form:inplaceSelectEdit"> - <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">Edit Text</span> + <span class="rf-is-lbl rf-is-dflt-lbl" id="form:inplaceSelectEditLabel">Edit Text</span> <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> <span class="rf-is-edit" id="form:inplaceSelectEditEdit"> <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden" /> Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml =================================================================== --- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-02-03 19:50:48 UTC (rev 21432) +++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-02-03 19:54:01 UTC (rev 21433) @@ -1,5 +1,5 @@ <span class="rf-is-d-s" id="form:inplaceSelectWithControls"> - <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span> + <span class="rf-is-lbl rf-is-dflt-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span> <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" name="form:inplaceSelectWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" /> <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit"> <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" type="hidden" />