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

IDEMPIERE-5389 - improve Status Line as Dashboard Content height (#1468) 

* IDEMPIERE-5389 - improve Status Line as Dashboard Content height

* IDEMPIERE-5389 - fix firefox issue, refactor fixed widget same height
This commit is contained in:
Peter Takács 2022-09-07 16:50:35 +02:00 committed by GitHub
parent 8c5c0ecbfa
commit 8589601b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,7 +468,6 @@ public class DashboardController implements EventListener<Event> {
panel = newGadgetPanel(dp, dc);
panel.setAttribute(FLEX_GROW_ATTRIBUTE, String.valueOf(flexGrow));
ZKUpdateUtil.setHflex(panel, String.valueOf(flexGrow));
ZKUpdateUtil.setHeight(panel, "100%");
}
if (panel != null && panel.getAttribute(PANEL_EMPTY_ATTRIBUTE) == null) {
dashboardLineLayout.appendChild(panel);
@ -770,10 +769,8 @@ public class DashboardController implements EventListener<Event> {
statusLineHtml.setContent(sl.parseLine(0));
Div div = new Div();
div.appendChild(statusLineHtml);
if(content instanceof HtmlBasedComponent)
((HtmlBasedComponent) content).setSclass("statusline-gadget");
else
div.setSclass("statusline-gadget");
div.setSclass("statusline-gadget");
((HtmlBasedComponent) content.getParent()).setSclass("statusline-wrapper");
content.appendChild(div);
empty = false;
}

26
org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp
View File

@ -10,10 +10,27 @@
background-image: none; background-color: #FFFFFF;
}
.statusline-wrapper > .z-panel-head {
position: absolute;
top: 1;
z-index: 1;
width: calc(100% - 8px);
}
.dashboard-widget > .z-panel-body {
height: 100%;
}
.statusline-wrapper {
height: 100%;
}
.statusline-wrapper > .z-panel-body {
position: relative;
top: 0;
height: 100%;
}
.z-panel {
border-radius: 5px;
border: 1px solid #d8d8d8;
@ -26,6 +43,7 @@
.z-panelchildren {
border: none;
height: 100%;
}
.z-panel-head {
@ -61,6 +79,7 @@
margin-right: auto;
position: relative;
width: 99%;
height: 100%;
}
.dashboard-widget-max {
@ -72,10 +91,6 @@
overflow: auto;
}
.dashboard-widget > .z-panel-body > .z-panelchildren {
height: 100% !important;
}
.dashboard-report-iframe {
min-height:300px;
border: 1px solid lightgray;
@ -252,8 +267,11 @@
.statusline-gadget {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 40px 0px 10px;
height: 100%;
}
.help-content