IDEMPIERE-405 Zk: Replace hardcoded style with css class

This commit is contained in:
Heng Sin Low 2012-08-29 00:39:36 +08:00
parent c640496e37
commit 32e66c9da8
36 changed files with 663 additions and 395 deletions

View File

@ -28,6 +28,8 @@ import org.adempiere.util.Callback;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.Datebox;
import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.Label;
@ -44,6 +46,7 @@ import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.VerticalBox;
import org.adempiere.webui.component.WListItemRenderer;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.panel.InfoPanel;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.FDialog;
@ -58,17 +61,18 @@ import org.compiere.util.Env;
import org.compiere.util.Ini;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.compiere.util.ValueNamePair;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Hlayout;
import org.zkoss.zul.South;
import org.zkoss.zul.Caption;
import org.zkoss.zul.Filedownload;
import org.zkoss.zul.Groupbox;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Listhead;
import org.zkoss.zul.Listheader;
import org.zkoss.zul.Listitem;
@ -169,7 +173,7 @@ public class WAcctViewer extends Window implements EventListener
private Tabpanel query = new Tabpanel();
private Tabpanels tabpanels = new Tabpanels();
private Hbox southPanel = new Hbox();
private Hlayout southPanel = new Hlayout();
private int m_windowNo;
@ -240,156 +244,119 @@ public class WAcctViewer extends Window implements EventListener
private void init() throws Exception
{
// Selection Panel
selectionPanel.setHflex("1");
// Accounting Schema
Hbox boxAcctSchema = new Hbox();
boxAcctSchema.setWidth("100%");
boxAcctSchema.setWidths("30%, 70%");
Grid grid = new Grid();
grid.setHflex("1");
grid.setSclass("grid-layout");
selectionPanel.appendChild(grid);
Columns columns = new Columns();
grid.appendChild(columns);
Column column = new Column();
column.setWidth("30%");
columns.appendChild(column);
column = new Column();
columns.appendChild(column);
Rows rows = grid.newRows();
lacctSchema.setValue(Msg.translate(Env.getCtx(), "C_AcctSchema_ID"));
selAcctSchema.setMold("select");
selAcctSchema.setRows(1);
boxAcctSchema.appendChild(lacctSchema);
boxAcctSchema.appendChild(selAcctSchema);
Hbox boxSelDoc = new Hbox();
boxSelDoc.setWidth("100%");
boxSelDoc.setWidths("30%, 50%, 20%");
Row row = rows.newRow();
row.appendChild(lacctSchema);
row.appendChild(selAcctSchema);
selDocument.setLabel(Msg.getMsg(Env.getCtx(), "SelectDocument"));
selDocument.addEventListener(Events.ON_CHECK, this);
selTable.setMold("select");
selTable.setRows(1);
boxSelDoc.appendChild(selDocument);
boxSelDoc.appendChild(selTable);
boxSelDoc.appendChild(selRecord);
row = rows.newRow();
row.appendChild(selDocument);
Hlayout hlayout = new Hlayout();
hlayout.appendChild(selTable);
hlayout.appendChild(selRecord);
row.appendChild(hlayout);
// Posting Type
Hbox boxPostingType = new Hbox();
boxPostingType.setWidth("100%");
boxPostingType.setWidths("30%, 70%");
lpostingType.setValue(Msg.translate(Env.getCtx(), "PostingType"));
selPostingType.setMold("select");
selPostingType.setRows(1);
selPostingType.addEventListener(Events.ON_CLICK, this);
boxPostingType.appendChild(lpostingType);
boxPostingType.appendChild(selPostingType);
row = rows.newRow();
row.appendChild(lpostingType);
row.appendChild(selPostingType);
// Date
Hbox boxDate = new Hbox();
boxDate.setWidth("100%");
boxDate.setWidths("30%, 35%, 35%");
lDate.setValue(Msg.translate(Env.getCtx(), "DateAcct"));
boxDate.appendChild(lDate);
boxDate.appendChild(selDateFrom);
boxDate.appendChild(selDateTo);
row = rows.newRow();
row.appendChild(lDate);
hlayout = new Hlayout();
hlayout.appendChild(selDateFrom);
hlayout.appendChild(new Label(" - "));
hlayout.appendChild(selDateTo);
row.appendChild(hlayout);
// Organization
Hbox boxOrg = new Hbox();
boxOrg.setWidth("100%");
boxOrg.setWidths("30%, 70%");
lOrg.setValue(Msg.translate(Env.getCtx(), "AD_Org_ID"));
selOrg.setMold("select");
selOrg.setRows(1);
selOrg.addEventListener(Events.ON_SELECT, this);
boxOrg.appendChild(lOrg);
boxOrg.appendChild(selOrg);
row = rows.newRow();
row.appendChild(lOrg);
row.appendChild(selOrg);
// Account
Hbox boxAcct = new Hbox();
boxAcct.setWidth("100%");
boxAcct.setWidths("30%, 70%");
lAcct.setValue(Msg.translate(Env.getCtx(), "Account_ID"));
boxAcct.appendChild(lAcct);
boxAcct.appendChild(selAcct);
row = rows.newRow();
row.appendChild(lAcct);
row.appendChild(selAcct);
Hbox boxSel1 = new Hbox();
boxSel1.setWidth("100%");
boxSel1.setWidths("30%, 70%");
row = rows.newRow();
row.appendChild(lsel1);
row.appendChild(sel1);
boxSel1.appendChild(lsel1);
boxSel1.appendChild(sel1);
row = rows.newRow();
row.appendChild(lsel2);
row.appendChild(sel2);
Hbox boxSel2 = new Hbox();
boxSel2.setWidth("100%");
boxSel2.setWidths("30%, 70%");
row = rows.newRow();
row.appendChild(lsel3);
row.appendChild(sel3);
boxSel2.appendChild(lsel2);
boxSel2.appendChild(sel2);
row = rows.newRow();
row.appendChild(lsel4);
row.appendChild(sel4);
Hbox boxSel3 = new Hbox();
boxSel3.setWidth("100%");
boxSel3.setWidths("30%, 70%");
row = rows.newRow();
row.appendChild(lsel5);
row.appendChild(sel5);
boxSel3.appendChild(lsel3);
boxSel3.appendChild(sel3);
row = rows.newRow();
row.appendChild(lsel6);
row.appendChild(sel6);
Hbox boxSel4 = new Hbox();
boxSel4.setWidth("100%");
boxSel4.setWidths("30%, 70%");
boxSel4.appendChild(lsel4);
boxSel4.appendChild(sel4);
Hbox boxSel5 = new Hbox();
boxSel5.setWidth("100%");
boxSel5.setWidths("30%, 70%");
boxSel5.appendChild(lsel5);
boxSel5.appendChild(sel5);
Hbox boxSel6 = new Hbox();
boxSel6.setWidth("100%");
boxSel6.setWidths("30%, 70%");
boxSel6.appendChild(lsel6);
boxSel6.appendChild(sel6);
Hbox boxSel7 = new Hbox();
boxSel7.setWidth("100%");
boxSel7.setWidths("30%, 70%");
boxSel7.appendChild(lsel7);
boxSel7.appendChild(sel7);
Hbox boxSel8 = new Hbox();
boxSel8.setWidth("100%");
boxSel8.setWidths("30%, 70%");
boxSel8.appendChild(lsel8);
boxSel8.appendChild(sel8);
selectionPanel.setWidth("100%");
selectionPanel.appendChild(boxAcctSchema);
selectionPanel.appendChild(boxSelDoc);
selectionPanel.appendChild(boxPostingType);
selectionPanel.appendChild(boxDate);
selectionPanel.appendChild(boxOrg);
selectionPanel.appendChild(boxAcct);
selectionPanel.appendChild(boxSel1);
selectionPanel.appendChild(boxSel2);
selectionPanel.appendChild(boxSel3);
selectionPanel.appendChild(boxSel4);
selectionPanel.appendChild(boxSel5);
selectionPanel.appendChild(boxSel6);
selectionPanel.appendChild(boxSel7);
selectionPanel.appendChild(boxSel8);
row = rows.newRow();
row.appendChild(lsel7);
row.appendChild(sel7);
row = rows.newRow();
row.appendChild(lsel8);
row.appendChild(sel8);
//Display Panel
// Display Document Info
@ -407,65 +374,54 @@ public class WAcctViewer extends Window implements EventListener
displayQty.setLabel(Msg.getMsg(Env.getCtx(), "DisplayQty"));
displayQty.addEventListener(Events.ON_CHECK, this);
Hbox boxSortDisplay = new Hbox();
boxSortDisplay.setWidth("100%");
boxSortDisplay.setWidths("70%, 30%");
lSort.setValue(Msg.getMsg(Env.getCtx(), "SortBy"));
lGroup.setValue(Msg.getMsg(Env.getCtx(), "GroupBy"));
boxSortDisplay.appendChild(lSort);
boxSortDisplay.appendChild(lGroup);
Hbox boxSort1 = new Hbox();
boxSort1.setWidth("100%");
boxSort1.setWidths("70%, 30%");
sortBy1.setMold("select");
sortBy1.setRows(1);
boxSort1.appendChild(sortBy1);
boxSort1.appendChild(group1);
Hbox boxSort2 = new Hbox();
boxSort2.setWidth("100%");
boxSort2.setWidths("70%, 30%");
sortBy2.setMold("select");
sortBy2.setRows(1);
boxSort2.appendChild(sortBy2);
boxSort2.appendChild(group2);
Hbox boxSort3 = new Hbox();
boxSort3.setWidth("100%");
boxSort3.setWidths("70%, 30%");
sortBy3.setMold("select");
sortBy3.setRows(1);
boxSort3.appendChild(sortBy3);
boxSort3.appendChild(group3);
Hbox boxSort4 = new Hbox();
boxSort4.setWidth("100%");
boxSort4.setWidths("70%, 30%");
sortBy4.setMold("select");
sortBy4.setRows(1);
boxSort4.appendChild(sortBy4);
boxSort4.appendChild(group4);
displayPanel.setWidth("100%");
displayPanel.appendChild(displayDocumentInfo);
displayPanel.appendChild(displaySourceAmt);
displayPanel.appendChild(displayQty);
displayPanel.appendChild(boxSortDisplay);
displayPanel.appendChild(boxSort1);
displayPanel.appendChild(boxSort2);
displayPanel.appendChild(boxSort3);
displayPanel.appendChild(boxSort4);
grid = new Grid();
grid.setSclass("grid-layout");
grid.setHflex("1");
displayPanel.appendChild(grid);
columns = new Columns();
grid.appendChild(columns);
column = new Column();
column.setWidth("70%");
columns.appendChild(column);
column = new Column();
column.setWidth("30%");
columns.appendChild(column);
rows = grid.newRows();
row = rows.newRow();
lSort.setValue(Msg.getMsg(Env.getCtx(), "SortBy"));
lGroup.setValue(Msg.getMsg(Env.getCtx(), "GroupBy"));
row.appendChild(lSort);
row.appendChild(lGroup);
row = rows.newRow();
sortBy1.setMold("select");
sortBy1.setRows(1);
row.appendChild(sortBy1);
row.appendChild(group1);
row = rows.newRow();
sortBy2.setMold("select");
sortBy2.setRows(1);
row.appendChild(sortBy2);
row.appendChild(group2);
row = rows.newRow();
sortBy3.setMold("select");
sortBy3.setRows(1);
row.appendChild(sortBy3);
row.appendChild(group3);
row = rows.newRow();
sortBy4.setMold("select");
sortBy4.setRows(1);
row.appendChild(sortBy4);
row.appendChild(group4);
//"images/InfoAccount16.png"
@ -479,80 +435,84 @@ public class WAcctViewer extends Window implements EventListener
groupSelection.appendChild(capSelection);
groupSelection.appendChild(selectionPanel);
Hbox boxQueryPanel = new Hbox();
boxQueryPanel.setWidth("98%");
boxQueryPanel.setWidths("63%,1%,36%");
Hlayout boxQueryPanel = new Hlayout();
boxQueryPanel.setHflex("3");
boxQueryPanel.appendChild(groupSelection);
groupSelection.setHflex("2");
Separator separator = new Separator();
separator.setOrient("vertical");
boxQueryPanel.appendChild(separator);
boxQueryPanel.appendChild(groupDisplay);
groupDisplay.setHflex("1");
// South Panel
bRePost.setLabel(Msg.getMsg(Env.getCtx(), "RePost"));
bRePost.setTooltiptext(Msg.getMsg(Env.getCtx(), "RePostInfo"));
bRePost.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "RePost")));
bRePost.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "RePostInfo")));
bRePost.addEventListener(Events.ON_CLICK, this);
bRePost.setVisible(false);
forcePost.setLabel(Msg.getMsg(Env.getCtx(), "Force"));
forcePost.setTooltiptext(Msg.getMsg(Env.getCtx(), "ForceInfo"));
forcePost.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Force")));
forcePost.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "ForceInfo")));
forcePost.setVisible(false);
// Elaine 2009/07/29
bZoom.setImage("/images/Zoom16.png");
bZoom.setTooltiptext(Msg.getMsg(Env.getCtx(), "Zoom"));
bZoom.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Zoom")));
bZoom.setVisible(tabbedPane.getSelectedIndex() == 1);
bZoom.addEventListener(Events.ON_CLICK, this);
//
bQuery.setImage("/images/Refresh16.png");
bQuery.setTooltiptext(Msg.getMsg(Env.getCtx(), "Refresh"));
bQuery.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Refresh")));
bQuery.addEventListener(Events.ON_CLICK, this);
bExport.setImage("/images/Export16.png");
bExport.setTooltiptext(Msg.getMsg(Env.getCtx(), "Export"));
bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export")));
bExport.addEventListener(Events.ON_CLICK, this);
bExport.setVisible(false);
southPanel.setWidth("100%");
southPanel.setWidths("80%, 20%");
southPanel.setHflex("5");
Grid southLeftGrid = new Grid();
southLeftGrid.setInnerWidth("");
southLeftGrid.setHeight("");
southLeftGrid.makeNoStrip();
southLeftGrid.setStyle("border: none; margin: none");
southLeftGrid.setSclass("grid-layout");
southPanel.appendChild(southLeftGrid);
Rows rows = southLeftGrid.newRows();
southLeftGrid.setHflex("4");
rows = southLeftGrid.newRows();
Row southLeft = rows.newRow();
southLeft.appendChild(bRePost);
southLeft.appendChild(forcePost);
Hlayout repostLayout = new Hlayout();
southLeft.appendChild(repostLayout);
repostLayout.appendChild(bRePost);
repostLayout.appendChild(new Separator());
repostLayout.appendChild(forcePost);
repostLayout.setHeight("24px");
southLeft.appendChild(statusLine);
Hbox southRight = new Hbox();
southRight.setWidth("100%");
southRight.setPack("end");
Grid southRight = new Grid();
southRight.setSclass("grid-layout");
southRight.setHflex("1");
southPanel.appendChild(southRight);
Panel southRightPanel = new Panel();
southRightPanel.appendChild(bZoom); // Elaine 2009/07/29
southRightPanel.appendChild(bExport);
southRightPanel.appendChild(bQuery);
southRight.appendChild(southRightPanel);
rows = southRight.newRows();
row = rows.newRow();
row.setAlign("right");
row.appendChild(southRightPanel);
// Result Tab
resultPanel = new Borderlayout();
resultPanel.setStyle("position: absolute");
resultPanel.setWidth("97%");
resultPanel.setHeight("96%");
resultPanel.setWidth("99%");
resultPanel.setHeight("99%");
result.appendChild(resultPanel);
Center resultCenter = new Center();
resultCenter.setFlex(true);
resultPanel.appendChild(resultCenter);
table.setWidth("99%;");
table.setHflex("1");
table.setVflex(true);
table.setHeight("99%");
table.setStyle("position: absolute;");
@ -562,7 +522,7 @@ public class WAcctViewer extends Window implements EventListener
resultPanel.appendChild(pagingPanel);
pagingPanel.appendChild(paging);
result.setWidth("100%");
result.setHflex("1");
result.setHeight("100%");
result.setStyle("position: relative");
@ -572,7 +532,7 @@ public class WAcctViewer extends Window implements EventListener
// Query Tab
query.setWidth("100%");
query.setHflex("1");
query.appendChild(boxQueryPanel);
// Tabbox
@ -586,12 +546,12 @@ public class WAcctViewer extends Window implements EventListener
tabs.appendChild(tabQuery);
tabs.appendChild(tabResult);
tabpanels.setWidth("100%");
tabpanels.setHflex("1");
tabpanels.appendChild(query);
tabpanels.appendChild(result);
tabbedPane.setWidth("100%");
tabbedPane.setHeight("100%");
tabbedPane.setHflex("1");
tabbedPane.setVflex("1");
tabbedPane.appendChild(tabs);
tabbedPane.appendChild(tabpanels);
@ -599,23 +559,23 @@ public class WAcctViewer extends Window implements EventListener
layout.setParent(this);
layout.setHeight("100%");
layout.setWidth("100%");
layout.setStyle("background-color: transparent");
layout.setStyle("background-color: transparent; margin: 0; position: absolute; padding: 0;");
Center center = new Center();
center.setParent(layout);
center.setFlex(true);
center.setStyle("background-color: transparent");
center.setStyle("background-color: transparent; padding: 2px;");
tabbedPane.setParent(center);
South south = new South();
south.setParent(layout);
south.setFlex(true);
south.setStyle("background-color: transparent");
south.setHeight("26px");
south.setHeight("36px");
southPanel.setParent(south);
southPanel.setVflex("1");
this.setTitle(TITLE);
this.setBorder("normal");
this.setClosable(true);
this.setStyle("position: absolute; width: 100%; height: 100%;");
this.setSizable(true);
@ -1190,9 +1150,9 @@ public class WAcctViewer extends Window implements EventListener
* @throws Exception
*/
private int actionButton(Button button) throws Exception
private void actionButton(final Button button) throws Exception
{
String keyColumn = button.getName();
final String keyColumn = button.getName();
log.info(keyColumn);
String whereClause = "(IsSummary='N' OR IsSummary IS NULL)";
String lookupColumn = keyColumn;
@ -1247,45 +1207,48 @@ public class WAcctViewer extends Window implements EventListener
else if (selDocument.isChecked())
whereClause = "";
String tableName = lookupColumn.substring(0, lookupColumn.length()-3);
final String tableName = lookupColumn.substring(0, lookupColumn.length()-3);
InfoPanel info = InfoPanel.create(m_data.WindowNo, tableName, lookupColumn, "", false, whereClause);
final InfoPanel info = InfoPanel.create(m_data.WindowNo, tableName, lookupColumn, "", false, whereClause);
if (!info.loadedOK())
{
//info.dispose();
info = null;
button.setLabel("");
m_data.whereInfo.put(keyColumn, "");
return 0;
return;
}
info.setVisible(true);
final String lookupColumnRef = lookupColumn;
info.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
String selectSQL = info.getSelectedSQL(); // C_Project_ID=100 or ""
Integer key = (Integer)info.getSelectedKey();
if (selectSQL == null || selectSQL.length() == 0 || key == null)
{
button.setLabel("");
m_data.whereInfo.put(keyColumn, ""); // no query
return;
}
// Save for query
log.config(keyColumn + " - " + key);
if (button == selRecord) // Record_ID
m_data.Record_ID = key.intValue();
else
m_data.whereInfo.put(keyColumn, keyColumn + "=" + key.intValue());
// Display Selection and resize
button.setLabel(m_data.getButtonText(tableName, lookupColumnRef, selectSQL));
//pack();
}
});
AEnv.showWindow(info);
String selectSQL = info.getSelectedSQL(); // C_Project_ID=100 or ""
Integer key = (Integer)info.getSelectedKey();
info = null;
if (selectSQL == null || selectSQL.length() == 0 || key == null)
{
button.setLabel("");
m_data.whereInfo.put(keyColumn, ""); // no query
return 0;
}
// Save for query
log.config(keyColumn + " - " + key);
if (button == selRecord) // Record_ID
m_data.Record_ID = key.intValue();
else
m_data.whereInfo.put(keyColumn, keyColumn + "=" + key.intValue());
// Display Selection and resize
button.setLabel(m_data.getButtonText(tableName, lookupColumn, selectSQL));
//pack();
return key.intValue();
} // actionButton
/**

View File

@ -109,6 +109,10 @@ public class ADButtonTabList extends Panel implements IADTabList, EventListener
button.setParent(this);
button.addEventListener(Events.ON_CLICK, this);
if (i == 0) {
button.setSclass(button.getSclass() + " " + "adwindow-navbtn-first");
}
}
//set width

View File

@ -61,8 +61,6 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
private static final String BTNPREFIX = "Btn";
private static final String TOOLBAR_BUTTON_STYLE = "background-color: transparent; display:inline-block; margin-left: 1px; margin-right: 1px; width: 26px; height: 24px;";
private static final String EMBEDDED_TOOLBAR_BUTTON_STYLE = "background-color: transparent; display:inline-block; margin-left: 1px; margin-right: 1px; width: 20px; height: 18px;";
private static CLogger log = CLogger.getCLogger(CWindowToolbar.class);
@ -235,7 +233,6 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
}
else
{
btn.setStyle(TOOLBAR_BUTTON_STYLE);
btn.setSclass("toolbar-button");
}
buttons.put(name, btn);

View File

@ -229,28 +229,23 @@ public final class ConfirmPanel extends Hbox
private void init()
{
pnlBtnLeft = new Panel();
pnlBtnLeft.setStyle("text-align:left");
pnlBtnLeft.setSclass("confirm-panel-left");
pnlBtnRight = new Panel();
pnlBtnRight.setStyle("text-align:right");
pnlBtnRight.setSclass("confirm-panel-right");
hboxBtnRight = new Hbox();
hboxBtnRight.appendChild(pnlBtnRight);
hboxBtnRight.setWidth("100%");
// hboxBtnRight.setStyle("text-align:right");
hboxBtnRight.setPack("end");
hboxBtnRight.setHflex("1");
hboxBtnLeft = new Hbox();
hboxBtnLeft.appendChild(pnlBtnLeft);
hboxBtnLeft.setWidth("100%");
// hboxBtnLeft.setStyle("text-align:left");
hboxBtnLeft.setPack("start");
hboxBtnLeft.setHflex("1");
this.appendChild(hboxBtnLeft);
this.appendChild(hboxBtnRight);
this.setWidth("100%");
this.setSclass("confirm-panel");
}
/**

View File

@ -15,7 +15,6 @@ package org.adempiere.webui.component;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.adempiere.webui.apps.AEnv;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Timebox;
@ -35,22 +34,19 @@ public class DatetimeBox extends Panel {
public DatetimeBox() {
dateBox = new Datebox();
dateBox.setCols(10);
timeBox = new Timebox();
timeBox.setCols(10);
timeBox.setButtonVisible(false);
appendChild(dateBox);
appendChild(timeBox);
appendChild(timeBox);
this.setHflex("1");
initComponents();
}
private void initComponents() {
dateBox.setStyle("display: inline;");
timeBox.setStyle("display: inline;");
timeBox.setButtonVisible(false);
timeBox.setZclass(dateBox.getZclass());
String style = AEnv.isFirefox2() ? "display: inline" : "display: inline-block";
style = style + ";white-space:nowrap";
this.setStyle(style);
this.setSclass("datetime-box");
}
/**

View File

@ -16,13 +16,10 @@ import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv;
import org.zkoss.zhtml.Table;
import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Tr;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Div;
import org.zkoss.zul.Hlayout;
/**
* @author Low Heng Sin
@ -36,7 +33,6 @@ public class EditorBox extends Div {
this);
protected Textbox txt;
protected Button btn;
protected Td btnColumn;
public EditorBox() {
initComponents();
@ -58,34 +54,18 @@ public class EditorBox extends Div {
}
private void initComponents() {
Table grid = new Table();
appendChild(grid);
this.setWidth("100%");
grid.setStyle("border: none; padding: 0px; margin: 0px;");
grid.setDynamicProperty("width", "100%");
grid.setDynamicProperty("border", "0");
grid.setDynamicProperty("cellpadding", "0");
grid.setDynamicProperty("cellspacing", "0");
Tr tr = new Tr();
grid.appendChild(tr);
tr.setStyle("width: 100%; border: none; padding: 0px; margin: 0px; white-space:nowrap; ");
Td td = new Td();
tr.appendChild(td);
td.setStyle("border: none; padding: 0px; margin: 0px;");
Hlayout hlayout = new Hlayout();
this.appendChild(hlayout);
hlayout.setHflex("1");
txt = new Textbox();
txt.setStyle("display: inline; width: 99%;");
td.appendChild(txt);
hlayout.appendChild(txt);
txt.setHflex("1");
btnColumn = new Td();
tr.appendChild(btnColumn);
btnColumn.setStyle("border: none; padding: 0px; margin: 0px;");
btnColumn.setSclass("editor-button");
btn = new Button();
btn.setTabindex(-1);
LayoutUtils.addSclass("editor-button", btn);
btnColumn.appendChild(btn);
btn.setSclass("editor-button");
btn.setHflex("0");
hlayout.appendChild(btn);
LayoutUtils.addSclass("editor-box", this);
}
@ -118,11 +98,12 @@ public class EditorBox extends Div {
txt.setReadonly(!enabled);
btn.setEnabled(enabled);
btn.setVisible(enabled);
btnColumn.setVisible(enabled);
if (enabled)
btnColumn.setSclass("editor-button");
else
btnColumn.setSclass("");
if (enabled) {
btn.setSclass("editor-button");
btn.setParent(this.getFirstChild());
} else {
btn.detach();
}
}
/**

View File

@ -32,7 +32,7 @@ public class Grid extends org.zkoss.zul.Grid
}
public void makeNoStrip() {
setOddRowSclass("dummy");
setOddRowSclass("z-dummy");
}
public Rows newRows() {

View File

@ -25,7 +25,7 @@ public class GridFactory {
*/
public static Grid newGridLayout() {
Grid grid = new Grid();
grid.makeNoStrip();
grid.setSclass("grid-layout");
return grid;
}
}

View File

@ -412,6 +412,7 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
paging.setTotalSize(tableModel.getRowCount());
paging.setDetailed(true);
south.appendChild(paging);
south.setSclass("adtab-grid-south");
paging.addEventListener(ZulEvents.ON_PAGING, this);
renderer.setPaging(paging);
}

View File

@ -140,6 +140,7 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
btnFavItem.setAttribute(NODE_ID_ATTR, String.valueOf(nd.getNode_ID()));
hbox.appendChild(btnFavItem);
btnFavItem.setLabel(label);
btnFavItem.setTooltiptext(nd.getDescription());
btnFavItem.setImage(getIconFile(nd));
btnFavItem.setDraggable(DELETE_FAV_DROPPABLE);
btnFavItem.addEventListener(Events.ON_CLICK, this);
@ -163,9 +164,10 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
{
Toolbarbutton newBtn = new Toolbarbutton(null, "/images/New10.png");
newBtn.setAttribute(NODE_ID_ATTR, String.valueOf(nd.getNode_ID()));
newBtn.setStyle("margin-bottom:5px");
hbox.appendChild(newBtn);
newBtn.addEventListener(Events.ON_CLICK, this);
newBtn.addEventListener(Events.ON_CLICK, this);
newBtn.setSclass("fav-new-btn");
newBtn.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "New")));
}
}
}

View File

@ -96,13 +96,12 @@ public class DashboardController implements EventListener<Event> {
public DashboardController() {
dashboardLayout = new Anchorlayout();
dashboardLayout.setWidth("99%");
dashboardLayout.setHeight("99%");
dashboardLayout.setStyle("position: absolute;");
dashboardLayout.setVflex("true");
dashboardLayout.setSclass("dashboard-layout");
dashboardLayout.setVflex("1");
maximizedHolder = new Anchorchildren();
maximizedHolder.setAnchor("99% 99%");
maximizedHolder.setAnchor("100% 100%");
maximizedHolder.setStyle("overflow: hidden; border: none; margin: 0; padding: 0;");
}
public void render(Component parent, IDesktop desktopImpl, boolean isShowInDashboard) {
@ -166,7 +165,7 @@ public class DashboardController implements EventListener<Event> {
panel.setAttribute("PA_DashboardPreference_ID", dp.getPA_DashboardPreference_ID());
panelList.add(panel);
panel.addEventListener(Events.ON_MAXIMIZE, this);
panel.setStyle("margin: 2px; position: relative;");
panel.setSclass("dashboard-widget");
panel.setTitle(dc.get_Translation(MDashboardContent.COLUMNNAME_Name));
panel.setMaximizable(true);
@ -420,6 +419,7 @@ public class DashboardController implements EventListener<Event> {
}
dashboardLayout.appendChild(maximizedHolder);
maximizedHolder.appendChild(panel);
panel.setSclass("");
} else {
maximizedHolder.detach();
panel.detach();
@ -427,6 +427,7 @@ public class DashboardController implements EventListener<Event> {
for (Anchorchildren anchorChildren : columnList) {
dashboardLayout.appendChild(anchorChildren);
}
panel.setSclass("dashboard-widget");
//following 2 line needed for restore to size the panel correctly
panel.setWidth(null);
panel.setHeight(null);
@ -686,9 +687,7 @@ public class DashboardController implements EventListener<Event> {
ReportEngine re = runReport(AD_Process_ID, parameters);
Iframe iframe = new Iframe();
iframe.setWidth("99%");
iframe.setHeight("90%");
iframe.setStyle("min-height:300px; border: 1px solid lightgray; margin:auto");
iframe.setSclass("dashboard-report-iframe");
File file = File.createTempFile(re.getName(), ".html");
re.createHTML(file, false, AEnv.getLanguage(Env.getCtx()), new HTMLExtension(Executions.getCurrent().getContextPath(), "rp", parent.getUuid()));
AMedia media = new AMedia(re.getName(), "html", "text/html", file, false);

View File

@ -102,7 +102,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
layout.setParent(parent);
layout.setWidth("100%");
layout.setHeight("100%");
layout.setStyle("position: absolute");
layout.setSclass("desktop-layout");
}
else
layout.setPage(page);
@ -110,15 +110,18 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
North n = new North();
layout.appendChild(n);
n.setCollapsible(false);
n.setSclass("desktop-north");
pnlHead.setParent(n);
West w = new West();
w.setTitle(" ");
w.setId("desktop-left-column");
layout.appendChild(w);
w.setSclass("desktop-left-column");
w.setCollapsible(true);
w.setSplittable(true);
w.setFlex(false);
w.setHflex("min");
w.addEventListener(Events.ON_OPEN, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
@ -137,11 +140,13 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
windowArea = new Center();
windowArea.setParent(layout);
windowArea.setFlex(true);
windowArea.setSclass("desktop-center");
windowContainer.createPart(windowArea);
homeTab = new Tabpanel();
windowContainer.addWindow(homeTab, Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Home")), false);
homeTab.getLinkedTab().setSclass("desktop-hometab");
BusyDialog busyDialog = new BusyDialog();
busyDialog.setShadow(false);
homeTab.appendChild(busyDialog);

View File

@ -168,8 +168,7 @@ DataStatusListener, IADTabpanel
grid.setHflex("1");
grid.setHeight("100%");
grid.setVflex(true);
grid.setStyle("margin:0; padding:0; position: absolute");
grid.makeNoStrip();
grid.setSclass("grid-layout");
listPanel = new GridPanel();
listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this);
@ -202,8 +201,8 @@ DataStatusListener, IADTabpanel
{
Borderlayout layout = new Borderlayout();
layout.setParent(this);
layout.setStyle("width: 100%; height: 100%; position: absolute;");
layout.setSclass("adtab-tree-layout");
treePanel = new ADTreePanel(windowNo, gridTab.getTabNo());
West west = new West();
west.appendChild(treePanel);
@ -216,6 +215,7 @@ DataStatusListener, IADTabpanel
Center center = new Center();
center.setFlex(true);
center.appendChild(grid);
center.setSclass("adtab-form");
layout.appendChild(center);
formComponent = layout;
@ -230,7 +230,7 @@ DataStatusListener, IADTabpanel
else
{
Div div = new Div();
div.setStyle("width:100%;height:100%;border:none;margin:none;padding:none");
div.setSclass("adtab-form");
div.appendChild(grid);
this.appendChild(div);
formComponent = div;

View File

@ -97,9 +97,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
layout = new Borderlayout();
if (parent != null) {
layout.setParent(parent);
layout.setStyle("position:absolute");
layout.setHeight("100%");
layout.setWidth("100%");
layout.setSclass("adwindow-layout");
} else {
layout.setPage(page);
}
@ -110,8 +108,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
North n = new North();
n.setParent(layout);
n.setCollapsible(false);
n.setHeight("30px");
toolbar.setHeight("30px");
n.setSclass("adwindow-north");
toolbar.setParent(n);
toolbar.setWindowNo(getWindowNo());
}
@ -122,6 +119,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
South s = new South();
layout.appendChild(s);
s.setCollapsible(false);
s.setSclass("adwindow-south");
statusBar.setParent(s);
}
else

View File

@ -131,19 +131,15 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
protected void initComponents()
{
this.setWidth("100%");
this.setHeight("100%");
this.setStyle("position: relative");
this.setSclass("menu-panel");
this.setVflex("1");
menuTree = new Tree();
menuTree.setMultiple(false);
menuTree.setId("mnuMain");
menuTree.setWidth("100%");
menuTree.setVflex(true);
menuTree.setVflex("1");
menuTree.setSizedByContent(false);
menuTree.setPageSize(-1); // Due to bug in the new paging functionality
menuTree.setStyle("border: none");
menuTree.setPageSize(-1); // Due to bug in the new paging functionality
}
private void initMenu(MTreeNode rootNode)

View File

@ -30,6 +30,7 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Button;
import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Image;
@ -50,7 +51,7 @@ public class HeaderPanel extends Panel implements EventListener<Event>
private static final long serialVersionUID = -2351317624519209484L;
private Image image;
private ToolBarButton btnMenu;
private Button btnMenu;
private Popup popMenu;
public HeaderPanel()
@ -90,18 +91,16 @@ public class HeaderPanel extends Panel implements EventListener<Event>
popMenu = new Popup();
popMenu.setId("menuTreePopup");
new MenuTreePanel(popMenu);
popMenu.setWidth("600px");
popMenu.setHeight("90%");
popMenu.setSclass("desktop-menu-popup");
popMenu.setHeight("90%");
popMenu.setWidth("600px");
btnMenu = new ToolBarButton();
btnMenu = new Button();
btnMenu.setLabel(Util.cleanAmp(Msg.getMsg(Env.getCtx(),"Menu")));
LayoutUtils.addSclass("desktop-header-font", btnMenu);
btnMenu.setParent(hbox);
btnMenu.addEventListener(Events.ON_CLICK, this);
btnMenu.addEventListener(Events.ON_CLICK, this);
LayoutUtils.addSclass("desktop-header-left", west);
//the following doesn't work when declare as part of the header-left style
west.setStyle("background-color: transparent; border: none;");
// Elaine 2009/03/02
Center center = new Center();
@ -112,8 +111,6 @@ public class HeaderPanel extends Panel implements EventListener<Event>
userPanel.setStyle("position: absolute; text-align:right;");
center.setFlex(true);
LayoutUtils.addSclass("desktop-header-right", center);
//the following doesn't work when declare as part of the header-right style
center.setStyle("background-color: transparent; border: none;");
}
public void onEvent(Event event) throws Exception {
@ -124,7 +121,7 @@ public class HeaderPanel extends Panel implements EventListener<Event>
w.setPage(this.getPage());
w.doHighlighted();
}
else if(event.getTarget() == btnMenu)
else if(event.getTarget() == btnMenu )
{
popMenu.open(btnMenu, "after_start");
}

View File

@ -151,8 +151,8 @@ public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, Ev
private void statInit()
{
fieldValue.setWidth("100%");
fieldName.setWidth("100%");
fieldValue.setHflex("1");
fieldName.setHflex("1");
labelValue.setValue(Msg.getMsg(Env.getCtx(), "Value"));
fieldValue.addEventListener(Events.ON_CHANGE, this);
@ -220,8 +220,8 @@ public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, Ev
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -200,13 +200,13 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
private void init()
{
fieldValue.setWidth("100%");
fieldContact.setWidth("100%");
fieldPhone.setWidth("100%");
fieldValue.setHflex("1");
fieldContact.setHflex("1");
fieldPhone.setHflex("1");
fieldName.setWidth("100%");
fieldEMail.setWidth("100%");
fieldPostal.setWidth("100%");
fieldName.setHflex("1");
fieldEMail.setHflex("1");
fieldPostal.setHflex("1");
Grid grid = GridFactory.newGridLayout();
@ -264,8 +264,8 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -279,8 +279,8 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -88,7 +88,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
public InfoGeneralPanel(String queryValue, int windowNo,String tableName,String keyColumn, boolean isSOTrx, String whereClause, boolean lookup)
{
super(windowNo, tableName, keyColumn, false,whereClause);
super(windowNo, tableName, keyColumn, false,whereClause, lookup);
setTitle(Msg.getMsg(Env.getCtx(), "Info"));
@ -134,12 +134,16 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
rows.appendChild(row);
row.appendChild(lbl1.rightAlign());
row.appendChild(txt1);
txt1.setHflex("1");
row.appendChild(lbl2.rightAlign());
row.appendChild(txt2);
txt2.setHflex("1");
row.appendChild(lbl3.rightAlign());
row.appendChild(txt3);
txt3.setHflex("1");
row.appendChild(lbl4.rightAlign());
row.appendChild(txt4);
txt4.setHflex("1");
layout = new Borderlayout();
layout.setWidth("100%");
@ -172,8 +176,8 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -164,9 +164,9 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
private void statInit() throws Exception
{
fDocumentNo.setWidth("100%");
fDescription.setWidth("100%");
fPOReference.setWidth("100%");
fDocumentNo.setHflex("1");
fDescription.setHflex("1");
fPOReference.setHflex("1");
fDateFrom.setWidth("165px");
fDateTo.setWidth("165px");
@ -246,8 +246,8 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -188,18 +188,20 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
editorBPartner = new WSearchEditor(lookupBP, Msg.translate(
Env.getCtx(), "C_BPartner_ID"), "", false, false, true);
editorBPartner.addValueChangeListener(this);
editorBPartner.getComponent().setHflex("1");
MLookup lookupOrder = MLookupFactory.get(Env.getCtx(), p_WindowNo,
0, 4247, DisplayType.Search);
editorOrder = new WSearchEditor(lookupOrder, Msg.translate(
Env.getCtx(), "C_Order_ID"), "", false, false, true);
editorOrder.addValueChangeListener(this);
editorOrder.getComponent().setHflex("1");
}
private void init()
{
txtDocumentNo.setWidth("100%");
txtDescription.setWidth("100%");
txtDocumentNo.setHflex("1");
txtDescription.setHflex("1");
dateFrom.setWidth("165px");
dateTo.setWidth("165px");
amountFrom.getDecimalbox().setWidth("155px");
@ -274,8 +276,8 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -177,9 +177,9 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
public void init()
{
txtDocumentNo.setWidth("100%");
txtDescription.setWidth("100%");
txtOrderRef.setWidth("100%");
txtDocumentNo.setHflex("1");
txtDescription.setHflex("1");
txtOrderRef.setHflex("1");
dateFrom.setWidth("165px");
dateTo.setWidth("165px");
amountFrom.getDecimalbox().setWidth("155px");
@ -253,8 +253,8 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -210,6 +210,7 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
{
InfoPanel info = InfoManager.create(WindowNo,
I_S_ResourceAssignment.Table_Name, I_S_ResourceAssignment.COLUMNNAME_S_ResourceAssignment_ID, "", false, "", false);
info.setAttribute(Window.MODE_KEY, Window.MODE_EMBEDDED);
AEnv.showWindow(info);
} // showAssignment
@ -291,7 +292,6 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
confirmPanel = new ConfirmPanel(true, true, false, true, true, true); // Elaine 2008/12/16
confirmPanel.addActionListener(Events.ON_CLICK, this);
confirmPanel.setStyle("border-top: 2px groove #444; padding-top: 4px");
// Elaine 2008/12/16
confirmPanel.getButton(ConfirmPanel.A_CUSTOMIZE).setVisible(hasCustomize());
@ -310,6 +310,8 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
contentPanel.setOddRowSclass(null);
contentPanel.setSizedByContent(true);
this.setSclass("info-panel");
} // init
protected ConfirmPanel confirmPanel;
/** Master (owning) Window */

View File

@ -180,7 +180,7 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
private void statInit() throws Exception
{
fDocumentNo.setWidth("100%");
fDocumentNo.setHflex("1");
fDateFrom.setWidth("165px");
fDateTo.setWidth("165px");
fAmtFrom.setWidth("180px");
@ -261,8 +261,8 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
southBody = new Vbox();
southBody.setWidth("100%");
south.appendChild(southBody);
southBody.appendChild(confirmPanel);
southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel);
southBody.appendChild(statusBar);
}

View File

@ -495,11 +495,12 @@ public class InfoProductPanel extends InfoPanel implements EventListener
borderlayout.setWidth("100%");
borderlayout.setHeight("100%");
if (isLookup())
borderlayout.setStyle("border: none; position: relative");
borderlayout.setStyle("border: none; position: relative; ");
else
borderlayout.setStyle("border: none; position: absolute");
borderlayout.setStyle("border: none; position: absolute; ");
Center center = new Center();
center.setAutoscroll(true);
//true will conflict with listbox scrolling
center.setAutoscroll(false);
center.setFlex(true);
borderlayout.appendChild(center);
center.appendChild(contentPanel);
@ -512,6 +513,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener
south.setTitle(Msg.translate(Env.getCtx(), "WarehouseStock"));
south.setTooltiptext(Msg.translate(Env.getCtx(), "WarehouseStock"));
borderlayout.appendChild(south);
tabbedPane.setSclass("info-product-tabbedpane");
south.appendChild(tabbedPane);
Borderlayout mainPanel = new Borderlayout();

View File

@ -76,9 +76,7 @@ public class MenuSearchPanel extends AbstractMenuPanel
this.appendChild(toolbar);
pnlSearch = new TreeSearchPanel(getMenuTree());
Style style = new Style();
style.setContent(".z-comboitem-img{ vertical-align:top; padding-right:2px; padding-bottom:4px; }");
pnlSearch.insertBefore(style, pnlSearch.getFirstChild());
pnlSearch.setSclass("menu-search-panel");
toolbar.appendChild(pnlSearch);
}
}

View File

@ -117,9 +117,12 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
parent.getTreechildren().appendChild(treeItem);
break;
}
//not working with search
/*
String t = parent.getLabel();
label.insert(0, " > ");
label.insert(0, t);
*/
parent = parent.getParentItem();
}
treeItem.setLabel(label.toString());

View File

@ -90,7 +90,7 @@ public class MenuTreePanel extends AbstractMenuPanel
// Elaine 2009/02/27 - expand tree
Toolbar toolbar = new Toolbar();
toolbar.setStyle("background-color: #ffffff; verticle-align: middle; padding: 2px");
toolbar.setSclass("desktop-menu-toolbar");
this.appendChild(toolbar);
expandToggle = new ToolBarButton();
@ -128,7 +128,7 @@ public class MenuTreePanel extends AbstractMenuPanel
}
//
else if (event.getName().equals(Events.ON_CLICK) && event.getTarget() == filterBtn)
filterPanel.open(filterBtn);
filterPanel.open(filterBtn, "before_start");
}
/**

View File

@ -36,6 +36,7 @@ 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.util.Clients;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Vbox;
@ -103,10 +104,21 @@ public class StatusBarPanel extends Panel implements EventListener, IStatusBar
Hbox hbox = new Hbox();
hbox.setWidth("100%");
hbox.setHeight("100%");
hbox.setHflex("1");
Cell leftCell = new Cell();
hbox.appendChild(leftCell);
Cell rightCell = new Cell();
hbox.appendChild(rightCell);
if (embedded)
hbox.setWidths("90%,10%");
{
leftCell.setWidth("90%");
rightCell.setWidth("10%");
}
else
hbox.setWidths("50%,50%");
{
leftCell.setWidth("50%");
rightCell.setWidth("50%");
}
west = new Div();
west.setStyle("text-align: left; ");
west.appendChild(statusLine);
@ -114,7 +126,7 @@ public class StatusBarPanel extends Panel implements EventListener, IStatusBar
vbox.setPack("center");
LayoutUtils.addSclass("status", vbox);
vbox.appendChild(west);
hbox.appendChild(vbox);
leftCell.appendChild(vbox);
east = new Div();
east.setWidth("100%");
@ -135,7 +147,7 @@ public class StatusBarPanel extends Panel implements EventListener, IStatusBar
vbox.setPack("center");
LayoutUtils.addSclass("status", vbox);
vbox.appendChild(east);
hbox.appendChild(vbox);
rightCell.appendChild(vbox);
this.appendChild(hbox);

View File

@ -131,7 +131,6 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
hLayout.appendChild(lblSearch);
hLayout.appendChild(cmbSearch);
this.appendChild(hLayout);
this.setStyle("padding: 2px");
}
private void addTreeItem(Treeitem treeItem)

View File

@ -69,12 +69,14 @@ public class UserPanel extends Vbox implements EventListener<Event>
private void init()
{
this.setSclass("desktop-user-panel");
Vbox vbox = new Vbox();
this.appendChild(vbox);
lblUserNameValue.setValue(getUserName() + "@" + getClientName() + "." + getOrgName()+"/"+this.getRoleName());
lblUserNameValue.addEventListener(Events.ON_CLICK, this);
lblUserNameValue.setStyle("text-align:right");
LayoutUtils.addSclass("desktop-header-font", lblUserNameValue);
vbox.appendChild(lblUserNameValue);
@ -83,27 +85,26 @@ public class UserPanel extends Vbox implements EventListener<Event>
preference.setLabel(Msg.getMsg(Env.getCtx(), "Preference"));
preference.addEventListener(Events.ON_CLICK, this);
preference.setStyle("text-align:right");
LayoutUtils.addSclass("desktop-header-font", preference);
preference.setParent(hbox);
Separator sep = new Separator("vertical");
sep.setBar(true);
sep.setHeight("13px");
sep.setParent(hbox);
changeRole.setLabel(Msg.getMsg(Env.getCtx(), "changeRole"));
changeRole.addEventListener(Events.ON_CLICK, this);
changeRole.setStyle("text-align:right");
LayoutUtils.addSclass("desktop-header-font", changeRole);
changeRole.setParent(hbox);
sep = new Separator("vertical");
sep.setBar(true);
sep.setHeight("13px");
sep.setParent(hbox);
logout.setLabel(Msg.getMsg(Env.getCtx(),"Logout"));
logout.addEventListener(Events.ON_CLICK, this);
logout.setStyle("text-align:right");
LayoutUtils.addSclass("desktop-header-font", logout);
logout.setParent(hbox);
}

View File

@ -54,6 +54,7 @@ public class WindowContainer extends AbstractUIPart
protected Component doCreatePart(Component parent)
{
tabbox = new Tabbox();
tabbox.setSclass("desktop-tabbox");
Tabpanels tabpanels = new Tabpanels();
Tabs tabs = new Tabs();
@ -62,7 +63,6 @@ public class WindowContainer extends AbstractUIPart
tabbox.appendChild(tabpanels);
tabbox.setWidth("100%");
tabbox.setHeight("100%");
tabbox.setStyle("margin-top: 2px;");
if (parent != null)
tabbox.setParent(parent);
@ -136,7 +136,6 @@ public class WindowContainer extends AbstractUIPart
tabpanel.setHeight("100%");
tabpanel.setWidth("100%");
tabpanel.setZclass("desktop-tabpanel");
tabpanel.setStyle("position: absolute;");
if (refTab == null)
{

View File

@ -439,6 +439,8 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
**/
private void initPanel()
{
setShadow(true);
Vlayout layout = new Vlayout();
layout.setStyle("height: 100%; width: 100%; position: relative;");
layout.setVflex("1");

View File

@ -173,8 +173,11 @@ public class WAssignmentDialog extends Window implements EventListener
row.setSpans("1, 2");
row.appendChild(LayoutUtils.makeRightAlign(lDate));
Div div = new Div();
div.setHflex("1");
div.appendChild(fDateFrom);
fDateFrom.setCols(10);
div.appendChild(fTimeFrom);
fTimeFrom.setCols(10);
fTimeFrom.setStyle("margin-left: 1px");
row.appendChild(div);
rows.appendChild(row);

View File

@ -58,6 +58,10 @@ html,body {
width: 660px;
}
.login-box-footer .confirm-panel {
width: 600px !important;
}
.login-box-footer-pnl {
width: 604px;
margin-left: 10px;
@ -92,12 +96,16 @@ html,body {
margin: 0;
margin-left: 5px;
margin-top: 3px;
background-color: transparent !important;
border: none !important;
}
.desktop-header-right {
margin: 0;
margin-top: 3px;
padding-right: 5px;
background-color: transparent !important;
border: none !important;
}
.desktop-header {
@ -106,7 +114,7 @@ html,body {
background-position: bottom left;
background-color: white;
width: 100%;
height: 35px;
height: 38px;
}
.desktop-header-font {
@ -129,6 +137,11 @@ html,body {
padding: 2px;
}
.fav-new-btn {
margin-top: 4px;
margin-left: 2px;
}
.disableFilter img {
opacity: 0.2;
filter: progid : DXImageTransform . Microsoft . Alpha(opacity = 20);
@ -143,6 +156,15 @@ html,body {
padding: 0px;
}
.toolbar-button {
background-color: transparent;
display:inline-block;
margin-left: 1px;
margin-right: 1px;
width: 26px;
height: 24px;
}
.toolbar-button .z-toolbarbutton-body .z-toolbarbutton-cnt img {
width: 22px;
height: 22px;
@ -170,48 +192,128 @@ html,body {
<%-- button --%>
.action-button {
height: 32px;
height: 30px;
width: 48px;
}
.action-text-button {
height: 32px;
height: 30px;
width: 80px;
}
.action-image-text-button {
height: 32px;
height: 30px;
width: 80px;
}
.editor-button {
width: 26px;
padding: 0px;
}
.editor-button img {
vertical-align: middle;
text-align: center;
}
<%-- desktop --%>
div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
background-color: white;
}
.desktop-user-panel {
text-align: right;
}
.desktop-layout {
position: absolute;
border: none;
}
.desktop-tabbox {
padding-top: 0px;
background-color: #D1E7F6;
}
.desktop-north, .desktop-center {
border: none;
}
.desktop-tabpanel {
margin: 0;
padding: 0;
border: 0;
position: absolute;
position: absolute !important;
background-color: #FFFFFF
}
.menu-search {
background-color: #E0EAF7;
.menu-search-panel .z-comboitem-img {
vertical-align:top;
padding-bottom:4px;
}
.menu-panel .z-toolbar-panel {
padding-right: 0;
}
.desktop-left-column {
width: 310px;
border: none;
background-color: #D2E0EB;
}
.desktop-left-column + .z-west-splt {
border-top: 1px solid #c5c5c5;
border-right: 1px solid #c5c5c5;
}
.desktop-left-column + .z-west-splt .z-west-splt-btn {
display: none;
}
.desktop-left-column .z-west-body {
border-right: 1px solid #c5c5c5;
}
.desktop-left-column .z-west-header {
border-top: 1px solid #c5c5c5;
}
.desktop-hometab {
margin-left: 2px !important;
}
.desktop-menu-popup {
z-index: 9999;
background-color: #fff;
}
.desktop-menu-toolbar {
background-color: #ffffff;
verticle-align: middle;
padding: 2px;
border-top: 1px solid #c5c5c5;
}
.menu-panel {
width: 100% !important;
height: 100% !important;
position: relative !important;
}
.menu-panel .z-tree {
border: none !important;
width: 100%;
}
.dashboard-layout {
width: 99%;
height: 99%;
position: absolute;
}
.dashboard-widget {
margin-top: 4px;
margin-left: 8px;
position: relative;
}
.dashboard-report-iframe {
min-height:300px;
border: 1px solid lightgray;
margin:auto;
width: 99%;
height: 90%;
}
<%-- adwindow and form --%>
@ -222,8 +324,32 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
margin: 3px;
}
.adwindow-layout {
position:absolute;
border: none;
width: 100%;
height: 100%;
}
.adwindow-layout .z-center {
border: none;
}
.adwindow-north {
border: none;
}
.adwindow-south {
border-left: none;
border-right: none;
}
.adwindow-layout .z-south {
border-top: 1px solid #C5C5C5 !important;
}
.adwindow-status {
background-color: #E0EAF7;
background-color: #D2E0EB;
height: 20px;
}
@ -233,22 +359,31 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
.adwindow-left-nav {
border-right: 1px solid #7EAAC6;
border-left: none;
border-top: none;
border-bottom: none;
}
.adwindow-right-nav {
border-left: 1px solid #7EAAC6;
border-right: none;
border-top: none;
border-bottom: none;
}
.adwindow-nav-content {
background-color: #E0EAF7;
background-color: #D2E0EB;
height: 100%;
padding-top: 2px;
}
.adwindow-toolbar {
border: 0px;
}
.adwindow-navbtn-first {
margin-top: 8px !important;
}
.adwindow-navbtn-dis, .adwindow-navbtn-sel, .adwindow-navbtn-uns {
border: 0px;
margin-top: 3px;
@ -271,9 +406,11 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
text-align: right;
-moz-border-radius-topleft: 5px;
-moz-border-radius-bottomleft: 5px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
-webkit-border-top-left-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
background-color: #d1e7f6 !important;
background-color: #D2E0EB !important;
background-image: url(../images/adtab-left-bg.png);
background-repeat: repeat-y;
background-position: top right;
@ -285,9 +422,11 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
text-align: left;
-moz-border-radius-topright: 5px;
-moz-border-radius-bottomright: 5px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
-webkit-border-top-right-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
background-color: #d1e7f6 !important;
background-color: #D2E0EB !important;
background-image: url(../images/adtab-right-bg.png);
background-repeat: repeat-y;
background-position: top left;
@ -315,6 +454,8 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
text-align: right;
-moz-border-radius-topleft: 5px;
-moz-border-radius-bottomleft: 5px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
-webkit-border-top-left-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
}
@ -325,6 +466,8 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
text-align: left;
-moz-border-radius-topright: 5px;
-moz-border-radius-bottomright: 5px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
-webkit-border-top-right-radius: 5px;
-webkit-border-bottom-right-radius: 5px;
}
@ -349,11 +492,33 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
position: absolute;
}
.adtab-form {
width:100%;
height:100%;
border:none !important;
margin:0;
padding:0;
}
.adtab-form .z-grid {
border:none !important;
}
.adtab-grid-panel {
position: absolute;
overflow: hidden;
width: 100%;
height: 100%;
border: none;
}
.adtab-grid-panel .z-grid {
border: none;
}
.adtab-grid-panel .z-center {
border: none;
}
.adtab-grid {
@ -361,6 +526,14 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
position: absolute;
}
.adtab-grid-south {
border: none;
}
.adtab-grid-south .z-paging {
border: none;
}
.adtab-tabpanels {
width: 80%;
border-top: 1px solid #9CBDFF;
@ -369,6 +542,12 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
border-right: 2px solid #9CBDFF;
}
.adtab-tree-layout {
width: 100%;
height: 100%;
position: absolute;
}
.current-row-indicator {
background-color: #FA962F !important;
background-image: none !important;
@ -468,13 +647,71 @@ span.z-tree-tee, span.z-tree-last {
<%-- Editor --%>
.editor-box {
display: inline-block;
border: none; padding: 0px; margin: 0px; background-color: transparent;
border: none;
padding: 0px;
margin: 0px;
background-color: transparent;
width: 100%;
}
.editor-box table {
border: none;
padding: 0px;
margin: 0px;
width: 100%;
border: none;
}
.editor-box tr {
width: 100%;
border: none;
padding: 0px;
margin: 0px;
white-space:nowrap;
}
.editor-box td {
border: none;
padding: 0px;
margin: 0px;
}
.editor-box .z-textbox {
display: inline;
width: 99%;
}
.editor-box .editor-button {
width: 26px;
padding: 0px;
}
.editor-box .editor-button img {
vertical-align: middle;
text-align: center;
}
.editor-box .editor-button-column {
width: 28px !important;
}
.number-box {
display: inline-block; white-space:nowrap;
}
.datetime-box {
display: inline-block;
white-space:nowrap;
}
.datetime-box .z-datebox {
display: inline;
}
.datetime-box .z-timebox {
display: inline;
}
<%-- Group --%>
tr.z-group {
background: #E9F2FB repeat-x 0 0;
@ -600,4 +837,74 @@ div.z-vfiletree-body td.menu-tree-cell {
div.simileAjax-bubble-container {
z-index: 2800 !important;
}
.info-panel .z-grid {
border: none !important;
}
.info-panel .z-center {
text-align: -webkit-center;
text-align: -moz-center;
}
.info-panel .z-listbox {
width: 99% !important;
}
.info-panel .z-south {
margin-top: 2px;
border-top: 1px solid #C5C5C5;
background-color: #D2E0EB;
}
.info-panel .z-window-highlighted-cnt {
padding: 0px;
}
.z-borderlayout, .z-north, .z-center, .z-south {
border: none;
}
.z-window-embedded-cnt, .z-window-embedded-cm {
border: none;
}
.z-window-embedded-tl, .z-window-embedded-tr, .z-window-embedded-hl, .z-window-embedded-hr,
.z-window-embedded-hm, .z-window-embedded-cl, .z-window-embedded-cr,
.z-window-embedded-bl, .z-window-embedded-br {
background-image: none;
}
.grid-layout {
border: none !important;
margin: 0 !important;
padding: 0 !important;
background-color: transparent !important;
}
.grid-layout .z-row-inner {
border: none !important;
background-color: transparent !important;
}
.confirm-panel {
width: 100%;
height: 36px;
}
.confirm-panel .z-hbox {
margin: 2px;
}
.confirm-panel-right .z-button-os {
margin-left: 3px;
}
.confirm-panel-left .z-button-os {
margin-right: 3px;
}
.info-product-tabbedpane {
background-color: #FFFFFF;
}