From ae3ade0908bae350488260ee5d878a2ffbff605a Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Thu, 9 Aug 2018 19:45:51 +0200
Subject: Allow to associate project categories to colors

The color is then used as background in the board and list views
---
 app/Template/board/task_footer.php      | 2 +-
 app/Template/category/create.php        | 3 +++
 app/Template/category/edit.php          | 3 +++
 app/Template/task_list/task_details.php | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 95ffd8fd..cdb75a1f 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -1,6 +1,6 @@
 <?php if (! empty($task['category_id'])): ?>
 <div class="task-board-category-container task-board-category-container-color">
-    <span class="task-board-category category-<?= $this->text->e($task['category_name']) ?>">
+    <span class="task-board-category category-<?= $this->text->e($task['category_name']) ?> <?= $task['category_color_id'] ? "color-{$task['category_color_id']}" : '' ?>">
         <?php if ($not_editable): ?>
             <?= $this->text->e($task['category_name']) ?>
         <?php else: ?>
diff --git a/app/Template/category/create.php b/app/Template/category/create.php
index f065305a..32501b8d 100644
--- a/app/Template/category/create.php
+++ b/app/Template/category/create.php
@@ -7,5 +7,8 @@
     <?= $this->form->label(t('Category Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required')) ?>
 
+    <?= $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/category/edit.php b/app/Template/category/edit.php
index cd8ee7ba..446ce7b5 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -11,5 +11,8 @@
     <?= $this->form->label(t('Description'), 'description') ?>
     <?= $this->form->textEditor('description', $values, $errors, array('tabindex' => 2)) ?>
 
+    <?= $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_list/task_details.php b/app/Template/task_list/task_details.php
index b68be2dc..9afd9f55 100644
--- a/app/Template/task_list/task_details.php
+++ b/app/Template/task_list/task_details.php
@@ -4,7 +4,7 @@
     <?= $this->text->e($task['column_name']) ?>
 
     <?php if (! empty($task['category_id'])): ?>
-        <span class="table-list-category">
+        <span class="table-list-category <?= $task['category_color_id'] ? "color-{$task['category_color_id']}" : '' ?>">
             <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
                 <?= $this->url->link(
                     $this->text->e($task['category_name']),
-- 
cgit v1.2.3