midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4612 Improve layout of Find Dialog (#495) 

Base on pull request 487 from Flemming Birch (gsjeffen)
This commit is contained in:
hengsin 2021-01-03 00:56:59 +08:00 committed by GitHub
parent afde8a0cf1
commit 240b1b277c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
View File

@ -56,5 +56,5 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
<!-- this js module doesn't actually exists and it is here for default theme version --> <!-- this js module doesn't actually exists and it is here for default theme version -->
<!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it --> <!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it -->
<javascript-module name="idempiere.theme.default" version="202012151533" /> <javascript-module name="idempiere.theme.default" version="202012310310" />
</language> </language>

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -383,6 +383,9 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Panel pnlButtonRight = new Panel(); Panel pnlButtonRight = new Panel();
pnlButtonRight.appendChild(btnOk); pnlButtonRight.appendChild(btnOk);
Separator sep = new Separator("vertical");
sep.setWidth("2px");
pnlButtonRight.appendChild(sep);
pnlButtonRight.appendChild(btnCancel); pnlButtonRight.appendChild(btnCancel);
pnlButtonRight.setStyle("text-align:right"); pnlButtonRight.setStyle("text-align:right");
ZKUpdateUtil.setWidth(pnlButtonRight, "100%"); ZKUpdateUtil.setWidth(pnlButtonRight, "100%");
@ -390,7 +393,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Panel pnlButtonLeft = new Panel(); Panel pnlButtonLeft = new Panel();
pnlButtonLeft.appendChild(btnNew); pnlButtonLeft.appendChild(btnNew);
Separator sep = new Separator("vertical"); sep = new Separator("vertical");
sep.setWidth("2px"); sep.setWidth("2px");
pnlButtonLeft.appendChild(sep); pnlButtonLeft.appendChild(sep);
pnlButtonLeft.appendChild(btnClear); pnlButtonLeft.appendChild(btnClear);
@ -399,13 +402,10 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Hbox hboxButton = new Hbox(); Hbox hboxButton = new Hbox();
hboxButton.appendChild(pnlButtonLeft); hboxButton.appendChild(pnlButtonLeft);
hboxButton.appendChild(pnlButtonRight); hboxButton.appendChild(pnlButtonRight);
ZKUpdateUtil.setWidth(hboxButton, "100%");
contentSimple = new Grid(); contentSimple = new Grid();
contentSimple.setId("contentSimple"); contentSimple.setId("contentSimple");
contentSimple.setStyle("width: 100%; position: relative");
contentSimple.makeNoStrip(); contentSimple.makeNoStrip();
ZKUpdateUtil.setHflex(contentSimple, "1");
Columns columns = new Columns(); Columns columns = new Columns();
Column column = new Column(); Column column = new Column();
@ -437,7 +437,6 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
layout.appendChild(center); layout.appendChild(center);
center.appendChild(contentSimple); center.appendChild(contentSimple);
ZKUpdateUtil.setVflex(contentSimple, "1"); ZKUpdateUtil.setVflex(contentSimple, "1");
ZKUpdateUtil.setHflex(contentSimple, "1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);
@ -481,19 +480,20 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Panel pnlButtonRight = new Panel(); Panel pnlButtonRight = new Panel();
pnlButtonRight.appendChild(btnOk); pnlButtonRight.appendChild(btnOk);
Separator sep = new Separator("vertical");
sep.setWidth("2px");
pnlButtonRight.appendChild(sep);
pnlButtonRight.appendChild(btnCancel); pnlButtonRight.appendChild(btnCancel);
pnlButtonRight.setStyle("text-align: right"); pnlButtonRight.setStyle("text-align: right");
advancedPanelToolBar = new ToolBar(); advancedPanelToolBar = new ToolBar();
advancedPanelToolBar.appendChild(btnNew); advancedPanelToolBar.appendChild(btnNew);
advancedPanelToolBar.appendChild(btnDelete); advancedPanelToolBar.appendChild(btnDelete);
ZKUpdateUtil.setWidth(advancedPanelToolBar, "100%");
fQueryName.addEventListener(Events.ON_SELECT, this); fQueryName.addEventListener(Events.ON_SELECT, this);
Hbox confirmPanel = new Hbox(); Hbox confirmPanel = new Hbox();
confirmPanel.appendChild(pnlButtonRight); confirmPanel.appendChild(pnlButtonRight);
ZKUpdateUtil.setWidth(confirmPanel, "100%");
confirmPanel.setPack("end"); confirmPanel.setPack("end");
advancedPanel = new Listbox(); advancedPanel = new Listbox();
@ -564,7 +564,6 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
layout.appendChild(center); layout.appendChild(center);
center.appendChild(advancedPanel); center.appendChild(advancedPanel);
ZKUpdateUtil.setVflex(advancedPanel, "1"); ZKUpdateUtil.setVflex(advancedPanel, "1");
ZKUpdateUtil.setHflex(advancedPanel, "1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

13
org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/find-window.css.dsp
View File

@ -13,3 +13,16 @@
.find-window-advanced .img-btn, .find-window-advanced .img-btn.btn-ok.z-button, .find-window-advanced .img-btn.btn-cancel.z-button { .find-window-advanced .img-btn, .find-window-advanced .img-btn.btn-ok.z-button, .find-window-advanced .img-btn.btn-cancel.z-button {
margin: 0 2px; margin: 0 2px;
} }
.find-window .z-window-content {
padding-bottom: 0px;
}
.find-window .z-grid.z-flex-item,
.find-window .z-listbox.z-flex-item,
.find-window .z-toolbar,
.find-window .z-south-body>.z-hbox {
width: calc(100% - 1px);
}
.find-window .z-toolbar {
border-bottom: 0px;
}