extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

no longer load TinyMCE styles for preview and change TinyMCE margin to 10px we have in preview

Browse Source
This commit is contained in:
ralf 2022-06-09 09:48:52 +02:00
parent 19eb40555a
commit c3f4d130b6
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_htmlarea.js
View File

@ -141,8 +141,8 @@ var et2_htmlarea = /** @class */ (function (_super) {
"Wingdings=wingdings,zapf dingbats",
fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt',
content_css: egw.webserverUrl + '/api/tinymce.php?' + // use the 3 prefs as cache-buster
btoa(egw.preference('rte_font', 'common') + ':' +
egw.preference('rte_font_size', 'common') + ':' +
btoa(egw.preference('rte_font', 'common') + '::' +
egw.preference('rte_font_size', 'common') + '::' +
egw.preference('rte_font_unit', 'common')),
};
var rte_formatblock = (egw.preference('rte_formatblock', 'common') || 'p');

4
api/js/etemplate/et2_widget_htmlarea.ts
View File

@ -271,8 +271,8 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
"Wingdings=wingdings,zapf dingbats",
fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt',
content_css: egw.webserverUrl+'/api/tinymce.php?'+ // use the 3 prefs as cache-buster
btoa(egw.preference('rte_font', 'common')+':'+
egw.preference('rte_font_size', 'common')+':'+
btoa(egw.preference('rte_font', 'common')+'::'+
egw.preference('rte_font_size', 'common')+'::'+
egw.preference('rte_font_unit', 'common')),
};
const rte_formatblock = <string>(egw.preference('rte_formatblock', 'common') || 'p');

8
api/src/Etemplate/Widget/HtmlArea.php
View File

@ -257,13 +257,13 @@ code {
}
.mce-content-body:not([dir=rtl]) blockquote {
border-left: 2px solid #ccc;
margin-left: 1.5rem;
padding-left: 1rem;
margin-left: 0;
padding-left: 10px;
}
.mce-content-body[dir=rtl] blockquote {
border-right: 2px solid #ccc;
margin-right: 1.5rem;
padding-right: 1rem;
margin-right: 0;
padding-right: 10px;
}
fieldset {
border: 2px solid silver;

5
mail/inc/class.mail_ui.inc.php
View File

@ -3356,11 +3356,6 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$GLOBALS['egw_info']['flags']['nonavbar']=true;
// do NOT include any default CSS
Framework::includeCSS('mail', 'preview', true, true);
// include TinyMCE CSS prefs after preview CSS
Framework::includeCSS('/api/tinymce.php?'. // use the 3 prefs as cache-buster
base64_encode($GLOBALS['egw_info']['user']['preferences']['common']['rte_font'].':'.
$GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'].':'.
$GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit']));
// load preview.js to activate mailto links
Framework::includeJS('/mail/js/preview.js');