From 3022ca1f3e1bfa83bbbdd9448ab584ae11675534 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 22 Mar 2020 17:04:55 +0100
Subject: [PATCH] fix tag selector

---
 .../Components/TagSelector/BaseView.php       | 23 ++++++++++++++++++-
 .../Components/TagSelector/base.tpl.php       |  4 ++--
 Theme/Backend/tag-create.tpl.php              |  2 +-
 Theme/Backend/tag-single.tpl.php              |  2 +-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Theme/Backend/Components/TagSelector/BaseView.php b/Theme/Backend/Components/TagSelector/BaseView.php
index a268189..7c9a9b3 100644
--- a/Theme/Backend/Components/TagSelector/BaseView.php
+++ b/Theme/Backend/Components/TagSelector/BaseView.php
@@ -46,6 +46,14 @@ class BaseView extends View
      */
     private bool $isRequired = false;
 
+    /**
+     * Dom form
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    private string $form = '';
+
     /**
      * Dom name
      *
@@ -87,6 +95,18 @@ class BaseView extends View
         return $this->name;
     }
 
+    /**
+     * Get form
+     *
+     * @return string
+     *
+     * @since 1.0.0
+     */
+    public function getForm() : string
+    {
+        return $this->form;
+    }
+
     /**
      * Is required?
      *
@@ -106,7 +126,8 @@ class BaseView extends View
     {
         $this->id         = $data[0];
         $this->name       = $data[1];
-        $this->isRequired = $data[2] ?? false;
+        $this->form       = $data[2];
+        $this->isRequired = $data[3] ?? false;
         return parent::render();
     }
 }
diff --git a/Theme/Backend/Components/TagSelector/base.tpl.php b/Theme/Backend/Components/TagSelector/base.tpl.php
index ba6c972..c9e98e3 100644
--- a/Theme/Backend/Components/TagSelector/base.tpl.php
+++ b/Theme/Backend/Components/TagSelector/base.tpl.php
@@ -38,9 +38,9 @@
     </div>
     <div class="ipt-second"><button><?= $this->getHtml('Select', '0', '0'); ?></button></div>
 </div>
-<div class="box" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
+<div class="box" data-form="<?= $this->printHtml($this->getForm()); ?>" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate">
-        <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>" style="background: {/color};">
+        <span class="tag" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>" style="background: {/color};">
             <i class="fa fa-times"></i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/title" data-tpl-value="/title" data-value=""></span>
diff --git a/Theme/Backend/tag-create.tpl.php b/Theme/Backend/tag-create.tpl.php
index 4603ce3..d4cad23 100644
--- a/Theme/Backend/tag-create.tpl.php
+++ b/Theme/Backend/tag-create.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iTitle"><?= $this->getHtml('Title') ?></label>
                         <tr><td><input type="text" name="title" id="iTitle" placeholder="&#xf040; oms" required>
                         <tr><td><label for="iColor"><?= $this->getHtml('Color') ?></label>
-                        <tr><td><input type="text" name="color" id="iColor" placeholder="#ff0000ff" required>
+                        <tr><td><input type="color" name="color" id="iColor"required>
                     </table>
                 </div>
                 <div class="portlet-foot">
diff --git a/Theme/Backend/tag-single.tpl.php b/Theme/Backend/tag-single.tpl.php
index 09bc338..ecc6608 100644
--- a/Theme/Backend/tag-single.tpl.php
+++ b/Theme/Backend/tag-single.tpl.php
@@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iTitle"><?= $this->getHtml('Title') ?></label>
                         <tr><td><input type="text" name="title" id="iTitle" placeholder="&#xf040; oms" value="<?= $this->printHtml($tag->getTitle()); ?>" required>
                         <tr><td><label for="iColor"><?= $this->getHtml('Color') ?></label>
-                        <tr><td><input type="text" name="color" id="iColor" placeholder="#ff0000ff" value="<?= $this->printHtml($tag->getColor()); ?>" required>
+                        <tr><td><input type="color" name="color" id="iColor" value="<?= $this->printHtml(\substr($tag->getColor(), 0, 7)); ?>" required>
                     </table>
                 </div>
                 <div class="portlet-foot">