From 9902308540a345d1e38fa11c32ab302bd17ad7a6 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 5 Dec 2019 16:04:40 +0100 Subject: [PATCH] * Html Editor: Add a custom paragraph into block formating in order to get paragraph lines with no line-height --- api/js/etemplate/et2_widget_htmlarea.js | 5 ++++- preferences/inc/class.preferences_hooks.inc.php | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js index 865c6ab425..d9cf2b5b46 100644 --- a/api/js/etemplate/et2_widget_htmlarea.js +++ b/api/js/etemplate/et2_widget_htmlarea.js @@ -144,6 +144,9 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([ mobile: { theme: 'silver' }, + formats: { + customparagraph: { block: 'p', styles: {"margin-block-start": "0px", "margin-block-end": "0px"}} + }, min_height: 100, convert_urls: false, language: et2_htmlarea.LANGUAGE_CODE[egw.preference('lang', 'common')], @@ -167,7 +170,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([ ], toolbar: et2_htmlarea.TOOLBAR_SIMPLE, 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,"+ "sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book "+ "antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;"+ diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 58816af85c..55282aa254 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -429,7 +429,8 @@ class preferences_hooks 'h4' => lang("Heading %1", '4'), 'h5' => lang("Heading %1", '5'), 'h6' => lang("Heading %1", '6'), - 'pre' => lang("Preformatted") + 'pre' => lang("Preformatted"), + 'customparagraph' => lang("Custom Paragraph") ), 'help' => 'Automatically start with this format block', 'xmlrpc' => True,