IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable. Fixed layout for firefox. Fixed message popup for error.
This commit is contained in:
parent
a87e9773b5
commit
72abf35700
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
package org.adempiere.webui.adwindow;
|
package org.adempiere.webui.adwindow;
|
||||||
|
|
||||||
|
import org.adempiere.webui.LayoutUtils;
|
||||||
import org.adempiere.webui.apps.AEnv;
|
import org.adempiere.webui.apps.AEnv;
|
||||||
import org.adempiere.webui.component.Label;
|
import org.adempiere.webui.component.Label;
|
||||||
import org.adempiere.webui.component.Panel;
|
import org.adempiere.webui.component.Panel;
|
||||||
|
@ -34,7 +35,7 @@ import org.zkoss.zk.ui.util.Clients;
|
||||||
import org.zkoss.zul.A;
|
import org.zkoss.zul.A;
|
||||||
import org.zkoss.zul.Caption;
|
import org.zkoss.zul.Caption;
|
||||||
import org.zkoss.zul.Div;
|
import org.zkoss.zul.Div;
|
||||||
import org.zkoss.zul.Hbox;
|
import org.zkoss.zul.Hlayout;
|
||||||
import org.zkoss.zul.Separator;
|
import org.zkoss.zul.Separator;
|
||||||
import org.zkoss.zul.Space;
|
import org.zkoss.zul.Space;
|
||||||
|
|
||||||
|
@ -69,7 +70,7 @@ public class StatusBar extends Panel implements EventListener<Event>
|
||||||
|
|
||||||
private Div msgPopupCnt;
|
private Div msgPopupCnt;
|
||||||
|
|
||||||
private Hbox messageContainer;
|
private Hlayout messageContainer;
|
||||||
|
|
||||||
private Caption msgPopupCaption;
|
private Caption msgPopupCaption;
|
||||||
|
|
||||||
|
@ -92,8 +93,7 @@ public class StatusBar extends Panel implements EventListener<Event>
|
||||||
west = new Div();
|
west = new Div();
|
||||||
west.setSclass("adwindow-status-docstatus");
|
west.setSclass("adwindow-status-docstatus");
|
||||||
|
|
||||||
messageContainer = new Hbox();
|
messageContainer = new Hlayout();
|
||||||
messageContainer.setAlign("center");
|
|
||||||
messageContainer.setId("messages");
|
messageContainer.setId("messages");
|
||||||
west.appendChild(messageContainer);
|
west.appendChild(messageContainer);
|
||||||
|
|
||||||
|
@ -247,9 +247,16 @@ public class StatusBar extends Panel implements EventListener<Event>
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) throws Exception {
|
||||||
if(event.getTarget() instanceof RecordLink){
|
if(event.getTarget() instanceof RecordLink){
|
||||||
doZoom((RecordLink)event.getTarget());
|
doZoom((RecordLink)event.getTarget());
|
||||||
|
} else if (event.getTarget() instanceof Label) {
|
||||||
|
showPopup();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void showPopup() {
|
||||||
|
appendChild(msgPopup);
|
||||||
|
LayoutUtils.openOverlappedWindow(messageContainer, msgPopup, "overlap_end");
|
||||||
|
}
|
||||||
|
|
||||||
private void doZoom(RecordLink link) {
|
private void doZoom(RecordLink link) {
|
||||||
int Record_ID = 0;
|
int Record_ID = 0;
|
||||||
int AD_Table_ID = 0;
|
int AD_Table_ID = 0;
|
||||||
|
|
|
@ -665,7 +665,7 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
|
||||||
}
|
}
|
||||||
|
|
||||||
.adwindow-status {
|
.adwindow-status {
|
||||||
height: 20px;
|
min-height: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.adwindow-status-docinfo {
|
.adwindow-status-docinfo {
|
||||||
|
|
Loading…
Reference in New Issue