From d0f4afa224a9edc2428996239dd19143d1f87853 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 8 Feb 2020 12:26:58 +0300
Subject: [PATCH] feat(admin-plugin): add html field #360

---
 .../form/app/Controllers/FormController.php    | 18 +++++-------------
 .../form/templates/fields/html/field.html      |  7 +++++++
 2 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 site/plugins/form/templates/fields/html/field.html

diff --git a/site/plugins/form/app/Controllers/FormController.php b/site/plugins/form/app/Controllers/FormController.php
index 87a3acf4..c8140ce7 100644
--- a/site/plugins/form/app/Controllers/FormController.php
+++ b/site/plugins/form/app/Controllers/FormController.php
@@ -430,21 +430,13 @@ class FormController extends Controller
     protected function htmlField(string $field_id, string $field_name, $field_value, array $properties) : string
     {
         $title = isset($properties['title']) ? $properties['title'] : '';
-        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
         $help  = isset($properties['help'])  ? $properties['help'] : '';
+        $class = isset($properties['class']) ? $properties['class'] : $this->field_class;
+        $size  = isset($properties['size'])  ? $this->sizes[$properties['size']] : $this->sizes['12'];
+        $id    = isset($properties['id'])    ? $properties['id'] : $field_id;
+        $name  = isset($properties['name'])  ? $properties['name'] : $field_name;
 
-        $attributes = isset($properties['attributes']) ? $properties['attributes'] : [];
-        $attributes['id'] = isset($attributes['id']) ? $attributes['id'] : $field_id;
-        $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : $this->field_class;
-        $attributes['class'] .= ' js-html-editor';
-
-        $field  = '<div class="form-group ' . $size . '">';
-        $field .= ($title ? Form::label($field_id, __($title)) : '');
-        $field .= Form::textarea($field_name, $field_value, $attributes);
-        $field .= ($help ? '<small class="form-text text-muted">' . __($help) . '</small>' : '');
-        $field .= '</div>';
-
-        return $field;
+        return $this->flextype['view']->fetch('plugins/form/templates/fields/html/field.html', ['title' => $title, 'size' => $size, 'name' => $name, 'id' => $id, 'class' => $class, 'help' => $help , 'value' => $field_value]);
     }
 
     /**
diff --git a/site/plugins/form/templates/fields/html/field.html b/site/plugins/form/templates/fields/html/field.html
new file mode 100644
index 00000000..45925a9c
--- /dev/null
+++ b/site/plugins/form/templates/fields/html/field.html
@@ -0,0 +1,7 @@
+<div class="form-group {{ size }}">
+    <label for="{{ id }}" class="form-control-title">{{ tr(title) }}</label>
+    <textarea id="{{ id }}" name="{{ name }}" rows="0" cols="0" class="js-html-editor {{ class }}">{{ value }}</textarea>
+    {% if help %}
+        <small>{{ help }}</small>
+    {% endif %}
+</div>
\ No newline at end of file