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

IDEMPIERE-405 Zk: Replace hardcoded style with css class. Fixed desktop left column not resizable. Use css standard approach for centering of dashboard widget. Fixed confirm panel not using available width on firefox.

This commit is contained in:
Heng Sin Low 2012-09-03 12:22:31 +08:00
parent ba024fa231
commit f2c61f9054
7 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
View File

@ -98,6 +98,7 @@ public class DashboardController implements EventListener<Event> {
dashboardLayout = new Anchorlayout(); dashboardLayout = new Anchorlayout();
dashboardLayout.setSclass("dashboard-layout"); dashboardLayout.setSclass("dashboard-layout");
dashboardLayout.setVflex("1"); dashboardLayout.setVflex("1");
dashboardLayout.setHflex("1");
maximizedHolder = new Anchorchildren(); maximizedHolder = new Anchorchildren();
maximizedHolder.setAnchor("100% 100%"); maximizedHolder.setAnchor("100% 100%");
@ -136,26 +137,34 @@ public class DashboardController implements EventListener<Event> {
dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role
noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID); noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID);
width = noOfCols <= 0 ? 100 : (100-1) / noOfCols; width = noOfCols <= 0 ? 100 : 100 / noOfCols;
int useWidth = 0;
for (final MDashboardPreference dp : dps) for (final MDashboardPreference dp : dps)
{ {
MDashboardContent dc = new MDashboardContent(dp.getCtx(), dp.getPA_DashboardContent_ID(), dp.get_TrxName()); MDashboardContent dc = new MDashboardContent(dp.getCtx(), dp.getPA_DashboardContent_ID(), dp.get_TrxName());
int columnNo = dp.getColumnNo(); int columnNo = dp.getColumnNo();
if(dashboardColumnLayout == null || currentColumnNo != columnNo) if(dashboardColumnLayout == null || currentColumnNo != columnNo)
{ {
int anchorWidth = width;
if (columnNo == noOfCols) {
anchorWidth = 100 - useWidth;
} else {
useWidth = useWidth + width;
}
dashboardColumnLayout = new Vlayout(); dashboardColumnLayout = new Vlayout();
dashboardColumnLayout.setAttribute("ColumnNo", columnNo); dashboardColumnLayout.setAttribute("ColumnNo", columnNo);
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard); dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", false); dashboardColumnLayout.setAttribute("IsAdditionalColumn", false);
Anchorchildren dashboardColumn = new Anchorchildren(); Anchorchildren dashboardColumn = new Anchorchildren();
dashboardColumn.setAnchor((width-2) + "%" + " 100%"); dashboardColumn.setAnchor(anchorWidth + "%" + " 100%");
dashboardColumn.setDroppable("true"); dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this); dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout); dashboardColumn.appendChild(dashboardColumnLayout);
columnList.add(dashboardColumn); columnList.add(dashboardColumn);
dashboardLayout.appendChild(dashboardColumn); dashboardLayout.appendChild(dashboardColumn);
dashboardColumnLayout.setWidth("100%"); dashboardColumnLayout.setHflex("1");
currentColumnNo = columnNo; currentColumnNo = columnNo;
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
View File

@ -121,7 +121,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
w.setCollapsible(true); w.setCollapsible(true);
w.setSplittable(true); w.setSplittable(true);
w.setFlex(false); w.setFlex(false);
w.setHflex("min"); w.setHflex("1");
w.addEventListener(Events.ON_OPEN, new EventListener<Event>() { w.addEventListener(Events.ON_OPEN, new EventListener<Event>() {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
View File

@ -262,7 +262,7 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);
southBody = new Vbox(); southBody = new Vbox();
southBody.setWidth("100%"); southBody.setHflex("1");
south.appendChild(southBody); south.appendChild(southBody);
southBody.appendChild(new Separator()); southBody.appendChild(new Separator());
southBody.appendChild(confirmPanel); southBody.appendChild(confirmPanel);

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
View File

@ -292,6 +292,7 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
confirmPanel = new ConfirmPanel(true, true, false, true, true, true); // Elaine 2008/12/16 confirmPanel = new ConfirmPanel(true, true, false, true, true, true); // Elaine 2008/12/16
confirmPanel.addActionListener(Events.ON_CLICK, this); confirmPanel.addActionListener(Events.ON_CLICK, this);
confirmPanel.setHflex("1");
// Elaine 2008/12/16 // Elaine 2008/12/16
confirmPanel.getButton(ConfirmPanel.A_CUSTOMIZE).setVisible(hasCustomize()); confirmPanel.getButton(ConfirmPanel.A_CUSTOMIZE).setVisible(hasCustomize());

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
View File

@ -173,6 +173,7 @@ public class WLocationDialog extends Window implements EventListener
this.setWidth("380px"); this.setWidth("380px");
this.setClosable(true); this.setClosable(true);
this.setBorder("normal"); this.setBorder("normal");
this.setShadow(true);
this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED); this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
} }

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
View File

@ -283,6 +283,7 @@ public class WLocatorDialog extends Window implements EventListener
this.setClosable(true); this.setClosable(true);
this.setBorder("normal"); this.setBorder("normal");
this.setWidth("260Px"); this.setWidth("260Px");
this.setShadow(true);
this.setSizable(true); // Elaine 2009/02/02 - window set to resizable this.setSizable(true); // Elaine 2009/02/02 - window set to resizable
} }

17
org.adempiere.ui.zk/theme/default/css/theme.css.dsp
View File

@ -269,6 +269,10 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
border-top: 1px solid #c5c5c5; border-top: 1px solid #c5c5c5;
} }
.desktop-left-column .z-anchorlayout-body {
overflow-x: hidden;
}
.desktop-hometab { .desktop-hometab {
margin-left: 2px !important; margin-left: 2px !important;
} }
@ -297,15 +301,17 @@ div.wc-modal, div.wc-modal-none, div.wc-highlighted, div.wc-highlighted-none {
} }
.dashboard-layout { .dashboard-layout {
width: 99%; width: 100%;
height: 99%; height: 100%;
position: absolute; position: absolute;
} }
.dashboard-widget { .dashboard-widget {
margin-top: 4px; margin-top: 4px;
margin-left: 8px; margin-left: auto;
margin-right: auto;
position: relative; position: relative;
width: 92%;
} }
.dashboard-report-iframe { .dashboard-report-iframe {
@ -844,12 +850,12 @@ div.simileAjax-bubble-container {
} }
.info-panel .z-center { .info-panel .z-center {
text-align: -webkit-center;
text-align: -moz-center;
} }
.info-panel .z-listbox { .info-panel .z-listbox {
width: 99% !important; width: 99% !important;
position: relative;
margin: auto;
} }
.info-panel .z-south { .info-panel .z-south {
@ -899,6 +905,7 @@ div.simileAjax-bubble-container {
.confirm-panel { .confirm-panel {
width: 100%; width: 100%;
height: 36px; height: 36px;
position: relative;
} }
.confirm-panel .z-hbox { .confirm-panel .z-hbox {