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

IDEMPIERE-4740 Fix EMail panel : Attachment is cut at bottom (#1354) 

* IDEMPIERE-4740 Fix EMail panel : Attachment is cut at bottom
This commit is contained in:
Anozi Mada 2022-06-02 16:02:37 +07:00 committed by GitHub
parent bf32da5738
commit 5971d6dee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
View File

@ -56,6 +56,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
<!-- this js module doesn't actually exists and it is here for default theme version --> <!-- this js module doesn't actually exists and it is here for default theme version -->
<!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it --> <!-- since loading of js module is on demand, it doesn't cause any error as long as you don't try to load it -->
<javascript-module name="idempiere.theme.default" version="202205121159" /> <javascript-module name="idempiere.theme.default" version="202206021402" />
</language> </language>

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AttachmentItem.java
View File

@ -23,29 +23,29 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.A; import org.zkoss.zul.A;
import org.zkoss.zul.Hlayout; import org.zkoss.zul.Span;
/** /**
* *
* @author hengsin * @author hengsin
* *
*/ */
public class AttachmentItem extends Hlayout implements EventListener<Event>{ public class AttachmentItem extends Span implements EventListener<Event>{
/** /**
* generate serial id * generate serial id
*/ */
private static final long serialVersionUID = 9105759170502414466L; private static final long serialVersionUID = -7599391160210459080L;
private DataSource ds; private DataSource ds;
private List<DataSource> list; private List<DataSource> list;
public AttachmentItem(DataSource ds, List<DataSource> list, boolean removable) { public AttachmentItem(DataSource ds, List<DataSource> list, boolean removable) {
setStyle("border: 1px solid #dcdcdc; background-color: #f5f5f5; " + setSclass("z-attachment-item");
"width: auto !important;display: inline-block; height: 21px; " + Label label = new Label(ds.getName());
"margin-right: 5px; margin-bottom: 5px;padding-left: 5px; padding-right: 5px;"); label.setSclass("z-attachment-item-text");
appendChild(new Label(ds.getName())); appendChild(label);
if (removable) { if (removable) {
A x = new A("", ThemeManager.getThemeResource("images/X8.png")); A x = new A("", ThemeManager.getThemeResource("images/X8.png"));
x.setStyle("float: right; background-color: #f5f5f5"); x.setSclass("z-attachment-item-del-button");
appendChild(x); appendChild(x);
this.ds = ds; this.ds = ds;
this.list = list; this.list = list;

18
org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/input-element.css.dsp
View File

@ -1,3 +1,21 @@
<%-- Attachment Item --%>
.z-attachment-item {
border: 1px solid #dcdcdc;
border-radius: 4px;
background-color: #f5f5f5;
width: auto !important;
display: inline-block;
margin-right: 5px;
margin-bottom: 5px;
padding-left: 5px;
padding-right: 5px;
}
.z-attachment-item-del-button {
float: right;
background-color: #f5f5f5;
}
<%-- Combobox --%> <%-- Combobox --%>
.z-combobox-disabled, .z-combobox[disabled], .z-datebox-disabled { .z-combobox-disabled, .z-combobox[disabled], .z-datebox-disabled {
color: black !important; cursor: default !important; opacity: 1; -moz-opacity: 1; -khtml-opacity: 1; filter: alpha(opacity=100); color: black !important; cursor: default !important; opacity: 1; -moz-opacity: 1; -khtml-opacity: 1; filter: alpha(opacity=100);