7 files changed, 15 insertions, 3 deletions
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index cdb75a1f..08af52a2 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -25,7 +25,7 @@
     <div class="task-tags">
         <ul>
         <?php foreach ($task['tags'] as $tag): ?>
-            <li><?= $this->text->e($tag['name']) ?></li>
+            <li class="task-tag <?= $tag['color_id'] ? "color-{$tag['color_id']}" : '' ?>"><?= $this->text->e($tag['name']) ?></li>
         <?php endforeach ?>
         </ul>
     </div>
diff --git a/app/Template/project_tag/create.php b/app/Template/project_tag/create.php
index d665aa76..61b6e670 100644
--- a/app/Template/project_tag/create.php
+++ b/app/Template/project_tag/create.php
@@ -7,5 +7,8 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="191"')) ?>
 
+    <?= $this->form->label(t('Color'), 'color_id') ?>
+    <?= $this->form->select('color_id', array('' => t('No color')) + $colors, $values, $errors, array(), 'color-picker') ?>
+
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/project_tag/edit.php b/app/Template/project_tag/edit.php
index 39b08326..0fab036b 100644
--- a/app/Template/project_tag/edit.php
+++ b/app/Template/project_tag/edit.php
@@ -7,5 +7,8 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="191"')) ?>
 
+    <?= $this->form->label(t('Color'), 'color_id') ?>
+    <?= $this->form->select('color_id', array('' => t('No color')) + $colors, $values, $errors, array(), 'color-picker') ?>
+
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/tag/create.php b/app/Template/tag/create.php
index c376eb28..f080f8d8 100644
--- a/app/Template/tag/create.php
+++ b/app/Template/tag/create.php
@@ -8,5 +8,8 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="191"')) ?>
 
+    <?= $this->form->label(t('Color'), 'color_id') ?>
+    <?= $this->form->select('color_id', array('' => t('No color')) + $colors, $values, $errors, array(), 'color-picker') ?>
+
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/tag/edit.php b/app/Template/tag/edit.php
index a0e54843..93ce0c94 100644
--- a/app/Template/tag/edit.php
+++ b/app/Template/tag/edit.php
@@ -9,5 +9,8 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="191"')) ?>
 
+    <?= $this->form->label(t('Color'), 'color_id') ?>
+    <?= $this->form->select('color_id', array('' => t('No color')) + $colors, $values, $errors, array(), 'color-picker') ?>
+
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 2712d49b..f3c6d896 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -156,7 +156,7 @@
             <div class="task-tags">
                 <ul>
                     <?php foreach ($tags as $tag): ?>
-                        <li><?= $this->text->e($tag) ?></li>
+                        <li class="task-tag <?= $tag['color_id'] ? "color-{$tag['color_id']}" : '' ?>"><?= $this->text->e($tag['name']) ?></li>
                     <?php endforeach ?>
                 </ul>
             </div>
diff --git a/app/Template/task_list/task_details.php b/app/Template/task_list/task_details.php
index 9afd9f55..03e1d3eb 100644
--- a/app/Template/task_list/task_details.php
+++ b/app/Template/task_list/task_details.php
@@ -25,7 +25,7 @@
     <?php endif ?>
 
     <?php foreach ($task['tags'] as $tag): ?>
-        <span class="table-list-category task-list-tag">
+        <span class="table-list-category task-list-tag <?= $tag['color_id'] ? "color-{$tag['color_id']}" : '' ?>">
             <?= $this->text->e($tag['name']) ?>
         </span>
     <?php endforeach ?>