From c115e762b18ad0ab82937967dcc32b6f401a0d83 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 6 Dec 2021 10:14:37 +0100
Subject: [PATCH] Add underline button into html editor's toolbar

---
 api/js/etemplate/et2_widget_htmlarea.ts             | 6 +++---
 api/src/Etemplate/Widget/HtmlArea.php               | 4 ++--
 api/templates/default/images/htmlarea/underline.svg | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 api/templates/default/images/htmlarea/underline.svg

diff --git a/api/js/etemplate/et2_widget_htmlarea.ts b/api/js/etemplate/et2_widget_htmlarea.ts
index 67a05b12f3..e3d87e0c98 100644
--- a/api/js/etemplate/et2_widget_htmlarea.ts
+++ b/api/js/etemplate/et2_widget_htmlarea.ts
@@ -118,7 +118,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
 	 * arranged toolbars as simple mode
 	 * @constant
 	 */
-	public static readonly TOOLBAR_SIMPLE : string = "undo redo|formatselect fontselect fontsizeselect | bold italic removeformat forecolor backcolor | "+
+	public static readonly TOOLBAR_SIMPLE : string = "undo redo|formatselect fontselect fontsizeselect | bold italic underline removeformat forecolor backcolor | "+
 	"alignleft aligncenter alignright alignjustify | bullist "+
 	"numlist outdent indent| link image pastetext | table";
 
@@ -126,7 +126,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
 	 * arranged toolbars as extended mode
 	 * @constant
 	 */
-	public static readonly TOOLBAR_EXTENDED : string = "fontselect fontsizeselect | bold italic strikethrough forecolor backcolor | "+
+	public static readonly TOOLBAR_EXTENDED : string = "fontselect fontsizeselect | bold italic underline strikethrough forecolor backcolor | "+
 	"link | alignleft aligncenter alignright alignjustify  | numlist "+
 	"bullist outdent indent | removeformat | image | fullscreen | table";
 
@@ -134,7 +134,7 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
 	 * arranged toolbars as advanced mode
 	 * @constant
 	 */
-	public static readonly TOOLBAR_ADVANCED : string = "undo redo| formatselect | fontselect fontsizeselect | bold italic strikethrough forecolor backcolor | "+
+	public static readonly TOOLBAR_ADVANCED : string = "undo redo| formatselect | fontselect fontsizeselect | bold italic underline strikethrough forecolor backcolor | "+
 	"alignleft aligncenter alignright alignjustify | bullist "+
 	"numlist outdent indent ltr rtl | removeformat code| link image pastetext | searchreplace | fullscreen | table";
 
diff --git a/api/src/Etemplate/Widget/HtmlArea.php b/api/src/Etemplate/Widget/HtmlArea.php
index e9c921ecc3..a058ec3d83 100644
--- a/api/src/Etemplate/Widget/HtmlArea.php
+++ b/api/src/Etemplate/Widget/HtmlArea.php
@@ -84,7 +84,7 @@ class HtmlArea extends Etemplate\Widget
 	 * @var array
 	 */
 	public static $toolbar_list = [
-		'undo', 'redo', 'bold', 'italic', 'strikethrough', 'forecolor', 'backcolor',
+		'undo', 'redo', 'bold', 'italic', 'underline', 'strikethrough', 'forecolor', 'backcolor',
 		'link', 'alignleft', 'aligncenter', 'alignright', 'alignjustify',
 		'numlist', 'bullist', 'outdent', 'indent', 'ltr', 'rtl','pastetext',
 		'removeformat', 'code', 'image', 'searchreplace','formatselect', 'fontselect', 'fontsizeselect', 'fullscreen', 'table'
@@ -96,7 +96,7 @@ class HtmlArea extends Etemplate\Widget
 	 */
 	public static $toolbar_default_list = [
 		'undo', 'redo','formatselect', 'fontselect', 'fontsizeselect',
-		'bold' ,'italic', 'removeformat', 'forecolor', 'backcolor', 'alignleft',
+		'bold' ,'italic', 'underline', 'removeformat', 'forecolor', 'backcolor', 'alignleft',
 		'aligncenter', 'alignright', 'alignjustify', 'numlist', 'bullist', 'outdent',
 		'indent', 'link', 'image', 'pastetext', 'table'
 	];
diff --git a/api/templates/default/images/htmlarea/underline.svg b/api/templates/default/images/htmlarea/underline.svg
new file mode 100644
index 0000000000..851029c82d
--- /dev/null
+++ b/api/templates/default/images/htmlarea/underline.svg
@@ -0,0 +1 @@
+<svg  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  width="24" height="24"><path d="M16 5c.6 0 1 .4 1 1v5.5a4 4 0 01-.4 1.8l-1 1.4a5.3 5.3 0 01-5.5 1 5 5 0 01-1.6-1c-.5-.4-.8-.9-1.1-1.4a4 4 0 01-.4-1.8V6c0-.6.4-1 1-1s1 .4 1 1v5.5c0 .3 0 .6.2 1l.6.7a3.3 3.3 0 002.2.8 3.4 3.4 0 002.2-.8c.3-.2.4-.5.6-.8l.2-.9V6c0-.6.4-1 1-1zM8 17h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 010-2z" fill-rule="evenodd"/></svg>
\ No newline at end of file