# HG changeset patch
# User hieplq@hasuvimex.vn
# Date 1491307941 -25200
# Tue Apr 04 19:12:21 2017 +0700
# Branch release-4.1
# Node ID 53b9c8bbf9f83a83185ba79ef25733c00dcdd4b8
# Parent fb1d8e07dbdd22fe73336844e9b4d3e0ee7e9982
IDEMPIERE-2310:Improve description field with inline Html editor and html rendering
support new version of ckeditor (4.6.2)
refine location of toolbar by css
diff -r fb1d8e07dbdd -r 53b9c8bbf9f8 org.adempiere.ui.zk/theme/default/css/theme.css.dsp
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp Sat Apr 01 08:49:30 2017 +0200
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp Tue Apr 04 19:12:21 2017 +0700
@@ -87,3 +87,20 @@
+
+.cke_editable.cke_editable_inline{
+ padding-top:4px;
+ padding-left:5px;
+
+}
+
+.cke_editable.cke_editable_inline > p{
+ margin-top:0px;
+ margin-bottom:0px;
+
+}
+
+.cke_editable_cke_editable_inline_parent{
+ padding-top:0;
+ padding-left:0;
+}
\ No newline at end of file
diff -r fb1d8e07dbdd -r 53b9c8bbf9f8 org.idempiere.zk.extra/META-INF/MANIFEST.MF
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF Sat Apr 01 08:49:30 2017 +0200
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF Tue Apr 04 19:12:21 2017 +0700
@@ -49,6 +49,8 @@
web.js.ckez.ext.CKeditor.plugins.about.dialogs.hidpi,
web.js.ckez.ext.CKeditor.plugins.clipboard.dialogs,
web.js.ckez.ext.CKeditor.plugins.colordialog.dialogs,
+ web.js.ckez.ext.CKeditor.plugins.copyformatting.cursors,
+ web.js.ckez.ext.CKeditor.plugins.copyformatting.styles,
web.js.ckez.ext.CKeditor.plugins.dialog,
web.js.ckez.ext.CKeditor.plugins.div.dialogs,
web.js.ckez.ext.CKeditor.plugins.find.dialogs,
@@ -71,6 +73,7 @@
web.js.ckez.ext.CKeditor.plugins.preview,
web.js.ckez.ext.CKeditor.plugins.scayt,
web.js.ckez.ext.CKeditor.plugins.scayt.dialogs,
+ web.js.ckez.ext.CKeditor.plugins.scayt.skins.moonolisa,
web.js.ckez.ext.CKeditor.plugins.showblocks.images,
web.js.ckez.ext.CKeditor.plugins.smiley.dialogs,
web.js.ckez.ext.CKeditor.plugins.smiley.images,
@@ -83,9 +86,13 @@
web.js.ckez.ext.CKeditor.plugins.templates.templates.images,
web.js.ckez.ext.CKeditor.plugins.wsc,
web.js.ckez.ext.CKeditor.plugins.wsc.dialogs,
+ web.js.ckez.ext.CKeditor.plugins.wsc.skins.moonolisa,
web.js.ckez.ext.CKeditor.skins.moono,
web.js.ckez.ext.CKeditor.skins.moono.images,
web.js.ckez.ext.CKeditor.skins.moono.images.hidpi,
+ web.js.ckez.ext.CKeditor.skins.moonolisa,
+ web.js.ckez.ext.CKeditor.skins.moonolisa.images,
+ web.js.ckez.ext.CKeditor.skins.moonolisa.images.hidpi,
web.js.gmaps,
web.js.gmaps.css,
web.js.gmaps.ext,