diff --git a/org.adempiere.base/src/org/compiere/model/MStyle.java b/org.adempiere.base/src/org/compiere/model/MStyle.java index c6350c1300..762269ba8b 100644 --- a/org.adempiere.base/src/org/compiere/model/MStyle.java +++ b/org.adempiere.base/src/org/compiere/model/MStyle.java @@ -15,16 +15,18 @@ import org.compiere.util.Env; * */ public class MStyle extends X_AD_Style { - /** * */ - private static final long serialVersionUID = -5183438249097292583L; + private static final long serialVersionUID = 4988653330824933725L; /** Cache */ private static CCache s_cache = new CCache(Table_Name, 30, 60); private X_AD_StyleLine[] m_lines = null; + public static final String SCLASS_PREFIX = "@sclass="; + public static final String ZCLASS_PREFIX = "@zclass="; + public MStyle(Properties ctx, int AD_Style_ID, String trxName) { super(ctx, AD_Style_ID, trxName); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java index 08b7cbdd99..afbf8d835f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java @@ -299,7 +299,28 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt styleBuilder.append("; "); styleBuilder.append(inlineStyle); } - component.setStyle(styleBuilder.toString()); + setComponentStyle(component, styleBuilder.toString()); + } + + protected void setComponentStyle(HtmlBasedComponent component, String style) { + if (style != null && style.startsWith(MStyle.SCLASS_PREFIX)) { + String sclass = style.substring(MStyle.SCLASS_PREFIX.length()); + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setSclass(sclass); + else + component.setSclass(sclass); + } else if (style != null && style.startsWith(MStyle.ZCLASS_PREFIX)) { + String zclass = style.substring(MStyle.ZCLASS_PREFIX.length()); + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setZclass(zclass); + else + component.setZclass(zclass); + } else { + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setStyle(style); + else + component.setStyle(style); + } } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java index dd049b10ea..194bd41698 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java @@ -593,9 +593,18 @@ public abstract class WEditor implements EventListener, PropertyChangeLis } } - protected void setLabelStyle(String style) { - if (label != null) - label.setStyle(style); + protected void setLabelStyle(String style) { + if (label != null) { + if (style != null && style.toLowerCase().startsWith(MStyle.SCLASS_PREFIX)) { + String sclass = style.substring(MStyle.SCLASS_PREFIX.length()); + label.setSclass(sclass); + } else if (style != null && style.toLowerCase().startsWith(MStyle.ZCLASS_PREFIX)) { + String zclass = style.substring(MStyle.ZCLASS_PREFIX.length()); + label.setZclass(zclass); + } else { + label.setStyle(style); + } + } } protected void applyFieldStyles(boolean applyDictionaryStyle) { @@ -607,12 +616,26 @@ public abstract class WEditor implements EventListener, PropertyChangeLis setFieldStyle(style); } - protected void setFieldStyle(String style) { + protected void setFieldStyle(String style) { HtmlBasedComponent component = (HtmlBasedComponent) getComponent(); - if (component instanceof EditorBox) - ((EditorBox)component).getTextbox().setStyle(style); - else - component.setStyle(style); + if (style != null && style.startsWith(MStyle.SCLASS_PREFIX)) { + String sclass = style.substring(MStyle.SCLASS_PREFIX.length()); + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setSclass(sclass); + else + component.setSclass(sclass); + } else if (style != null && style.startsWith(MStyle.ZCLASS_PREFIX)) { + String zclass = style.substring(MStyle.ZCLASS_PREFIX.length()); + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setZclass(zclass); + else + component.setZclass(zclass); + } else { + if (component instanceof EditorBox) + ((EditorBox)component).getTextbox().setStyle(style); + else + component.setStyle(style); + } } protected String buildStyle(int AD_Style_ID) {