From 0f4517b1ba8a7c507ac9d26f1836d7149b9a602c Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 16 Oct 2012 06:45:47 +0800 Subject: [PATCH] IDEMPIERE-270 Reports should inherit search filter from window. Fixed layout issue with Firefox and added visual cue that the popup dialog is for the report toolbar button. --- .../webui/panel/action/ReportAction.java | 3 ++ .../theme/default/css/theme.css.dsp | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java index d3c70b7f0f..742cdf8031 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java @@ -132,6 +132,9 @@ public class ReportAction implements EventListener Vbox vb = new Vbox(); vb.setWidth("100%"); winReport.appendChild(vb); + winReport.setSclass("toolbar-popup-window"); + vb.setSclass("toolbar-popup-window-cnt"); + vb.setAlign("stretch"); Hbox hb = new Hbox(); hb.setAlign("center"); diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 4f9477b31f..ff7fadbce4 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -826,8 +826,42 @@ tbody.z-grid-empty-body td { text-align: left; } +<%-- notification message --%> .z-notification .z-notification-cl, .z-notification .z-notification-cnt { width: 300px; } +<%-- toolbar popup dialog --%> +.toolbar-popup-window .z-window-popup-cnt { + margin-top: 6px; +} + +.toolbar-popup-window-cnt { +} + +.toolbar-popup-window::before { + content: ''; + position: absolute; + width: 0px; + height: 0px; + top: -7px; + left: 6px; + border-top: 7px dashed transparent; + border-left: 7px dashed transparent; + border-right: 7px dashed transparent; + border-bottom: 7px solid #ACACAC; +} + +.toolbar-popup-window-cnt::before { + content: ''; + position: absolute; + width: 0px; + height: 0px; + top: -5px; + left: 7px; + border-top: 6px dashed transparent; + border-left: 6px dashed transparent; + border-right: 6px dashed transparent; + border-bottom: 6px solid #FFF; +} \ No newline at end of file