diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java index 4945d9a062..9989878fbd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Datebox.java @@ -42,6 +42,7 @@ public class Datebox extends org.zkoss.zul.Datebox public void setEnabled(boolean enabled) { this.setReadonly(!enabled); + this.setDisabled(!enabled); this.setButtonVisible(enabled); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java index 8018159e93..5589eaa69a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java @@ -460,6 +460,7 @@ public class NumberBox extends Div public void setEnabled(boolean enabled) { decimalBox.setReadonly(!enabled); + decimalBox.setDisabled(!enabled); btn.setEnabled(enabled); if (enabled) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java index 0875a884bc..c78d8b1a18 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java @@ -57,7 +57,13 @@ public class Textbox extends org.zkoss.zul.Textbox implements EventListener 0) diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp index c60a8182ff..0fba098922 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/input-element.css.dsp @@ -1,5 +1,5 @@ <%-- Combobox --%> -.z-combobox-disabled { +.z-combobox-disabled, .z-combobox[disabled] { color: black !important; cursor: default !important; opacity: 1; -moz-opacity: 1; -khtml-opacity: 1; filter: alpha(opacity=100); } @@ -26,6 +26,15 @@ input:focus, textarea:focus, .z-combobox-input:focus, z-datebox-input:focus { background-color: #F0F0F0; } +.z-textbox[disabled], .z-intbox[disabled], .z-longbox[disabled], .z-doublebox[disabled], +.z-decimalbox[disabled], .z-datebox[disabled], .z-timebox[disabled] { + color: black !important; + background-color: #F0F0F0 !important; + cursor: default !important; + opacity: 1 !important; + border: 1px solid #cfcfcf !important; +} + <%-- workaround for http://jira.idempiere.com/browse/IDEMPIERE-692 --%> .z-combobox-popup { max-height: 200px;