diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java index f2106cb3f9..957739be82 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFEditor.java @@ -23,7 +23,6 @@ import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.ListboxFactory; -import org.adempiere.webui.component.VerticalBox; import org.adempiere.webui.panel.ADForm; import org.compiere.apps.wf.WFLine; import org.compiere.model.MRole; @@ -37,8 +36,11 @@ import org.zkoss.image.AImage; import org.zkoss.image.Image; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zkex.zul.Borderlayout; +import org.zkoss.zkex.zul.Center; +import org.zkoss.zkex.zul.North; +import org.zkoss.zkex.zul.South; import org.zkoss.zul.Imagemap; -import org.zkoss.zul.Separator; /** * @@ -48,13 +50,17 @@ import org.zkoss.zul.Separator; */ public class WFEditor extends ADForm { + private static final long serialVersionUID = 1L; + private Listbox workflowList; private Imagemap imageMap; @Override protected void initForm() { - VerticalBox vbox = new VerticalBox(); - appendChild(vbox); + this.setHeight("100%"); + Borderlayout layout = new Borderlayout(); + layout.setStyle("width: 100%; height: 100%; position: absolute;"); + appendChild(layout); String sql = MRole.getDefault().addAccessSQL( "SELECT AD_Workflow_ID, Name FROM AD_Workflow ORDER BY 2", @@ -67,16 +73,25 @@ public class WFEditor extends ADForm { } workflowList.addEventListener(Events.ON_SELECT, this); - vbox.appendChild(workflowList); - vbox.appendChild(new Separator()); + North north = new North(); + layout.appendChild(north); + north.appendChild(workflowList); + workflowList.setStyle("margin-left: 10px; margin-top: 5px;"); + north.setHeight("30px"); imageMap = new Imagemap(); - vbox.appendChild(imageMap); + Center center = new Center(); + layout.appendChild(center); + center.setAutoscroll(true); +// center.setFlex(true); + center.appendChild(imageMap); ConfirmPanel confirmPanel = new ConfirmPanel(true); confirmPanel.addActionListener(this); - vbox.appendChild(new Separator()); - vbox.appendChild(confirmPanel); + South south = new South(); + layout.appendChild(south); + south.appendChild(confirmPanel); + south.setHeight("36px"); } @Override diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java index 15d09da237..dc6ce2afed 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java @@ -21,8 +21,6 @@ import java.util.logging.Level; import javax.imageio.ImageIO; -import org.adempiere.webui.component.Panel; -import org.adempiere.webui.component.VerticalBox; import org.adempiere.webui.exception.ApplicationException; import org.adempiere.webui.session.SessionManager; import org.compiere.apps.wf.WFLine; @@ -36,19 +34,23 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.MouseEvent; +import org.zkoss.zkex.zul.Borderlayout; +import org.zkoss.zkex.zul.Center; +import org.zkoss.zkex.zul.South; import org.zkoss.zul.Area; import org.zkoss.zul.Div; import org.zkoss.zul.Html; import org.zkoss.zul.Imagemap; -import org.zkoss.zul.Separator; /** * WorkFlow Panel * * @author Low Heng Sin */ -public class WFPanel extends Panel implements EventListener +public class WFPanel extends Borderlayout implements EventListener { + private static final long serialVersionUID = 1L; + /** * Create Workflow Panel */ @@ -98,17 +100,22 @@ public class WFPanel extends Panel implements EventListener */ private void jbInit() throws Exception { - VerticalBox vbox = new VerticalBox(); - appendChild(vbox); - // Center - contentPanel.setStyle("width: 100%; heigh: 100%; overflow: auto;"); - vbox.appendChild(new Separator()); - vbox.appendChild(contentPanel); - vbox.appendChild(new Separator()); - vbox.appendChild(infoTextPane); - vbox.setHeights("85%,15%"); - vbox.setStyle("padding-left: 10px"); + this.setStyle("height: 100%; width: 100%; position: absolute"); + Center center = new Center(); + this.appendChild(center); + center.appendChild(contentPanel); + contentPanel.setStyle("width: 100%; heigh: 100%;"); + center.setAutoscroll(true); + center.setFlex(true); + South south = new South(); + this.appendChild(south); + south.appendChild(infoTextPane); + south.setHeight("15%"); + south.setSplittable(true); + south.setCollapsible(true); + south.setAutoscroll(true); + south.setFlex(true); } // jbInit /**