extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-14 17:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Html Editor: Add a custom paragraph into block formating in order to get paragraph lines with no line-height

Browse Source
This commit is contained in:
Hadi Nategh 2019-12-05 16:04:40 +01:00
parent ef3b5d1470
commit c17f83d531
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,9 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
mobile: { mobile: {
theme: 'silver' theme: 'silver'
}, },
formats: {
customparagraph: { block: 'p', styles: {"margin-block-start": "0px", "margin-block-end": "0px"}}
},
min_height: 100, min_height: 100,
convert_urls: false, convert_urls: false,
language: et2_htmlarea.LANGUAGE_CODE[egw.preference('lang', 'common')], language: et2_htmlarea.LANGUAGE_CODE[egw.preference('lang', 'common')],
@ -166,7 +169,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([
], ],
toolbar: et2_htmlarea.TOOLBAR_SIMPLE, toolbar: et2_htmlarea.TOOLBAR_SIMPLE,
block_formats: "Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;"+ block_formats: "Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;"+
"Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre", "Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre;Custom Paragraph=customparagraph",
font_formats: "Andale Mono=andale mono,times;Arial=arial,helvetica,"+ font_formats: "Andale Mono=andale mono,times;Arial=arial,helvetica,"+
"sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book "+ "sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book "+
"antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;"+ "antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;"+

3
preferences/inc/class.preferences_hooks.inc.php
View File

@ -429,7 +429,8 @@ class preferences_hooks
'h4' => lang("Heading %1", '4'), 'h4' => lang("Heading %1", '4'),
'h5' => lang("Heading %1", '5'), 'h5' => lang("Heading %1", '5'),
'h6' => lang("Heading %1", '6'), 'h6' => lang("Heading %1", '6'),
'pre' => lang("Preformatted") 'pre' => lang("Preformatted"),
'customparagraph' => lang("Custom Paragraph")
), ),
'help' => 'Automatically start with this format block', 'help' => 'Automatically start with this format block',
'xmlrpc' => True, 'xmlrpc' => True,