From c7b7c060a6f0c6866e05199e828053e6690e9413 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 18 Feb 2017 14:01:54 -0500
Subject: Improve category section

---
 app/Template/category/create.php | 12 +++++++
 app/Template/category/index.php  | 77 +++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100644 app/Template/category/create.php

(limited to 'app/Template')

diff --git a/app/Template/category/create.php b/app/Template/category/create.php
new file mode 100644
index 00000000..b12ff7fa
--- /dev/null
+++ b/app/Template/category/create.php
@@ -0,0 +1,12 @@
+<div class="page-header">
+    <h2><?= t('Add a new category') ?></h2>
+</div>
+<form method="post" action="<?= $this->url->href('CategoryController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+
+    <?= $this->form->label(t('Category Name'), 'name') ?>
+    <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+
+    <?= $this->modal->submitButtons() ?>
+</form>
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index e93138fd..f7657be2 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -1,45 +1,42 @@
-<?php if (! empty($categories)): ?>
 <div class="page-header">
     <h2><?= t('Categories') ?></h2>
+    <ul>
+        <li>
+            <?= $this->modal->medium('plus', t('Add a new category'), 'CategoryController', 'create', array('project_id' => $project['id'])) ?>
+        </li>
+    </ul>
 </div>
-<table class="table-striped">
-    <tr>
-        <th><?= t('Category Name') ?></th>
-        <th class="column-8"><?= t('Actions') ?></th>
-    </tr>
-    <?php foreach ($categories as $category_id => $category_name): ?>
-    <tr>
-        <td><?= $this->text->e($category_name) ?></td>
-        <td>
-            <div class="dropdown">
-            <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
-            <ul>
-                <li>
-                    <?= $this->modal->medium('edit', t('Edit'), 'CategoryController', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
-                </li>
-                <li>
-                    <?= $this->modal->confirm('trash-o', t('Remove'), 'CategoryController', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
-                </li>
-            </ul>
-            </div>
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
-<?php endif ?>
-
-<div class="page-header">
-    <h2><?= t('Add a new category') ?></h2>
-</div>
-<form method="post" action="<?= $this->url->href('CategoryController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
-    <?= $this->form->csrf() ?>
-    <?= $this->form->hidden('project_id', $values) ?>
+<?php if (empty($categories)): ?>
+    <p class="alert"><?= t('There is no category in this project.') ?></p>
+<?php else: ?>
+    <table class="table-striped">
+        <tr>
+            <th><?= t('Category Name') ?></th>
+        </tr>
+        <?php foreach ($categories as $category): ?>
+        <tr>
+            <td>
+                <div class="dropdown">
+                    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
+                    <ul>
+                        <li>
+                            <?= $this->modal->medium('edit', t('Edit'), 'CategoryController', 'edit', array('project_id' => $project['id'], 'category_id' => $category['id'])) ?>
+                        </li>
+                        <li>
+                            <?= $this->modal->confirm('trash-o', t('Remove'), 'CategoryController', 'confirm', array('project_id' => $project['id'], 'category_id' => $category['id'])) ?>
+                        </li>
+                    </ul>
+                </div>
 
-    <?= $this->form->label(t('Category Name'), 'name') ?>
-    <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+                <?= $this->text->e($category['name']) ?>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-    </div>
-</form>
+                <?php if (! empty($category['description'])): ?>
+                    <span class="tooltip" title="<?= $this->text->markdownAttribute($category['description']) ?>">
+                        <i class="fa fa-info-circle"></i>
+                    </span>
+                <?php endif ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+<?php endif ?>
-- 
cgit v1.2.3