From 13410623d46733e3d1efe9ef2e9dd964c12d923d Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Fri, 12 Apr 2013 16:20:41 +0800 Subject: [PATCH] IDEMPIERE-855 The parameter ZK_BUTTON_STYLE = IT makes the rendering of the buttons wrong --- .../adempiere/webui/apps/ProcessDialog.java | 11 +++---- .../webui/component/ConfirmPanel.java | 31 ++++++------------- org.adempiere.ui.zk/index.zul | 2 +- .../theme/default/css/theme.css.dsp | 31 ++++++++++--------- 4 files changed, 33 insertions(+), 42 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java index 4d7337f91f..3b32b86bb8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java @@ -62,7 +62,7 @@ import org.zkoss.zul.A; import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Center; import org.zkoss.zul.Div; -import org.zkoss.zul.Hbox; +import org.zkoss.zul.Hlayout; import org.zkoss.zul.Html; import org.zkoss.zul.Label; import org.zkoss.zul.North; @@ -172,8 +172,7 @@ public class ProcessDialog extends Window implements EventListener, IProc center.setAutoscroll(true); center.setStyle("border: none"); - Div div = new Div(); - Hbox hbox = new Hbox(); + Hlayout hbox = new Hlayout(); @SuppressWarnings("unused") String label = Msg.getMsg(Env.getCtx(), "Start"); // Invert - Unify OK/Cancel IDEMPIERE-77 @@ -186,13 +185,13 @@ public class ProcessDialog extends Window implements EventListener, IProc btn.setId("Cancel"); btn.addEventListener(Events.ON_CLICK, this); hbox.appendChild(btn); - div.appendChild(hbox); - div.setStyle("padding: 10px; text-align: center; text-align: -webkit-center; text-align: -moz-center; "); + hbox.setStyle("padding: 10px; margin: auto; overflow: visible;"); + hbox.setHflex("min"); South south = new South(); south.setSclass("dialog-footer"); layout.appendChild(south); - south.appendChild(div); + south.appendChild(hbox); this.appendChild(layout); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java index bf725a1457..90f27f1264 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java @@ -25,7 +25,8 @@ import java.util.Map; import org.adempiere.webui.factory.ButtonFactory; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; -import org.zkoss.zul.Hbox; +import org.zkoss.zul.Div; +import org.zkoss.zul.Hlayout; import org.zkoss.zul.Messagebox; /** * Application Confirm Panel @@ -33,7 +34,7 @@ import org.zkoss.zul.Messagebox; * @author Sendy Yagambrum * @date July 25, 2007 **/ -public final class ConfirmPanel extends Hbox +public final class ConfirmPanel extends Div { /** * @@ -217,35 +218,23 @@ public final class ConfirmPanel extends Hbox this(withCancel,false,false,false,false,false); } // - private Hbox hboxBtnLeft; - private Hbox hboxBtnRight; - // - private Panel pnlBtnRight; - private Panel pnlBtnLeft; + private Hlayout pnlBtnRight; + private Hlayout pnlBtnLeft; /** * initialise components */ private void init() { - pnlBtnLeft = new Panel(); + pnlBtnLeft = new Hlayout(); pnlBtnLeft.setSclass("confirm-panel-left"); - pnlBtnRight = new Panel(); + pnlBtnRight = new Hlayout(); pnlBtnRight.setSclass("confirm-panel-right"); - hboxBtnRight = new Hbox(); - hboxBtnRight.appendChild(pnlBtnRight); - hboxBtnRight.setPack("end"); - hboxBtnRight.setHflex("1"); - - hboxBtnLeft = new Hbox(); - hboxBtnLeft.appendChild(pnlBtnLeft); - hboxBtnLeft.setPack("start"); - hboxBtnLeft.setHflex("1"); - - this.appendChild(hboxBtnLeft); - this.appendChild(hboxBtnRight); + this.appendChild(pnlBtnLeft); + this.appendChild(pnlBtnRight); this.setSclass("confirm-panel"); + this.setVflex("min"); setId("confirmPanel"); } diff --git a/org.adempiere.ui.zk/index.zul b/org.adempiere.ui.zk/index.zul index f3e6f0cd73..3a64e8f146 100644 --- a/org.adempiere.ui.zk/index.zul +++ b/org.adempiere.ui.zk/index.zul @@ -4,7 +4,7 @@ Copyright (C) 2007 Ashley G Ramdass. --> - + diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 281617f6b9..51a3723174 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -67,7 +67,7 @@ html,body { width: 604px; margin-left: 10px; margin-right: 10px; - padding-top: 40px; + padding-top: 40px !important; } .login-label { @@ -1130,21 +1130,19 @@ div.simileAjax-bubble-container { } .confirm-panel { - width: 100%; - height: 36px; + width: auto; + height: auto; position: relative; + padding-left: 2px; + padding-right: 2px; } -.confirm-panel .z-hbox { - margin: 2px; +.confirm-panel-right { + float: right; } -.confirm-panel-right .z-button-os { - margin-left: 3px; -} - -.confirm-panel-left .z-button-os { - margin-right: 3px; +.confirm-panel-left { + float: left; } .info-product-tabbedpane { @@ -1448,11 +1446,11 @@ font-size: 0; } .popup-dialog.z-window-overlapped .dialog-footer { - padding: 12px 15px 8px 15px; + padding: 12px 15px 8px 15px !important; } .popup-dialog.z-window-highlighted .dialog-footer { - padding: 12px 15px 5px 15px; + padding: 12px 15px 5px 15px !important; } .dialog-footer { @@ -1466,4 +1464,9 @@ font-size: 0; .btn-ok { font-weight: bold; -} \ No newline at end of file +} + +<%-- vbox fix for firefox and ie --%> +table.z-vbox > tbody > tr > td > table { + width: 100%; +}