Add column description (merge/change pull-request #549)

3 files changed, 70 insertions, 43 deletions

diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php
index f30a65c1..25a8eded 100644
--- a/app/Template/board/edit.php
+++ b/app/Template/board/edit.php
@@ -1,50 +1,44 @@
 <div class="page-header">
     <h2><?= t('Edit the board for "%s"', $project['name']) ?></h2>
 </div>
-<section>
 
 <h3><?= t('Change columns') ?></h3>
-<form method="post" action="<?= $this->u('board', 'update', array('project_id' => $project['id'])) ?>" autocomplete="off">
-    <?= $this->formCsrf() ?>
-    <?php $i = 0; ?>
-    <table>
-        <tr>
-            <th><?= t('Position') ?></th>
-            <th><?= t('Column title') ?></th>
-            <th><?= t('Task limit') ?></th>
-            <th><?= t('Actions') ?></th>
-        </tr>
-        <?php foreach ($columns as $column): ?>
-        <tr>
-            <td><?= $this->formLabel('#'.++$i, 'title['.$column['id'].']', array('title="column_id='.$column['id'].'"')) ?></td>
-            <td><?= $this->formText('title['.$column['id'].']', $values, $errors, array('required', 'maxlength="50"')) ?></td>
-            <td><?= $this->formNumber('task_limit['.$column['id'].']', $values, $errors, array('placeholder="'.t('limit').'"')) ?></td>
-            <td>
-                <ul>
-                    <?php if ($column['position'] != 1): ?>
-                    <li>
-                        <?= $this->a(t('Move Up'), 'board', 'moveColumn', array('project_id' => $project['id'], 'column_id' => $column['id'], 'direction' => 'up'), true) ?>
-                    </li>
-                    <?php endif ?>
-                    <?php if ($column['position'] != count($columns)): ?>
-                    <li>
-                        <?= $this->a(t('Move Down'), 'board', 'moveColumn', array('project_id' => $project['id'], 'column_id' => $column['id'], 'direction' => 'down'), true) ?>
-                    </li>
-                    <?php endif ?>
-                    <li>
-                        <?= $this->a(t('Remove'), 'board', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
-                    </li>
-                </ul>
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
+<table>
+    <tr>
+        <th><?= t('Column title') ?></th>
+        <th><?= t('Description') ?></th>
+        <th><?= t('Task limit') ?></th>
+        <th><?= t('Actions') ?></th>
+    </tr>
+    <?php foreach ($columns as $column): ?>
+    <tr>
+        <td class="column-30"><?= $this->e($column['title']) ?></td>
+        <td><?= $this->e($column['description']) ?></td>
+        <td class="column-10"><?= $this->e($column['task_limit']) ?></td>
+        <td class="column-20">
+            <ul>
+                <li>
+                    <?= $this->a(t('Edit'), 'board', 'editColumn', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                </li>
+                <?php if ($column['position'] != 1): ?>
+                <li>
+                    <?= $this->a(t('Move Up'), 'board', 'moveColumn', array('project_id' => $project['id'], 'column_id' => $column['id'], 'direction' => 'up'), true) ?>
+                </li>
+                <?php endif ?>
+                <?php if ($column['position'] != count($columns)): ?>
+                <li>
+                    <?= $this->a(t('Move Down'), 'board', 'moveColumn', array('project_id' => $project['id'], 'column_id' => $column['id'], 'direction' => 'down'), true) ?>
+                </li>
+                <?php endif ?>
+                <li>
+                    <?= $this->a(t('Remove'), 'board', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                </li>
+            </ul>
+        </td>
+    </tr>
+    <?php endforeach ?>
+</table>
 
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Update') ?>" class="btn btn-blue"/>
-    </div>
-</form>
-<hr/>
 <h3><?= t('Add a new column') ?></h3>
 <form method="post" action="<?= $this->u('board', 'add', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
@@ -54,6 +48,9 @@
 
     <?= $this->formLabel(t('Title'), 'title') ?>
     <?= $this->formText('title', $values, $errors, array('required', 'maxlength="50"')) ?>
+    <?= $this->formLabel(t('Description'), 'description') ?>
+    <?= $this->formTextarea('description', $values, $errors) ?>
+    <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Add this column') ?>" class="btn btn-blue"/>
diff --git a/app/Template/board/edit_column.php b/app/Template/board/edit_column.php
new file mode 100644
index 00000000..0d41bfbe
--- /dev/null
+++ b/app/Template/board/edit_column.php
@@ -0,0 +1,24 @@
+<div class="page-header">
+    <h2><?= t('Edit column "%s"', $column['title']) ?></h2>
+</div>
+
+<form method="post" action="<?= $this->u('board', 'updateColumn', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
+
+    <?= $this->formCsrf() ?>
+
+    <?= $this->formHidden('id', $values) ?>
+    <?= $this->formHidden('project_id', $values) ?>
+
+    <?= $this->formLabel(t('Title'), 'title') ?>
+    <?= $this->formText('title', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
+
+    <?= $this->formLabel(t('Task limit'), 'task_limit') ?>
+    <?= $this->formNumber('task_limit', $values, $errors) ?>
+
+    <?= $this->formLabel(t('Description'), 'description') ?>
+    <?= $this->formTextarea('description', $values, $errors) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
index 77bc4114..3e808bf2 100644
--- a/app/Template/board/swimlane.php
+++ b/app/Template/board/swimlane.php
@@ -25,8 +25,14 @@
             </div>
         <?php endif ?>
 
-        <?= $this->e($column['title']) ?>
-
+        <?php if (! empty($column['description'])): ?>
+            <span class="column-tooltip" title="<?= $this->e($column['description']) ?>">
+                <?= $this->e($column['title']) ?>
+            </span>
+        <?php else: ?>
+            <?= $this->e($column['title']) ?>
+        <?php endif ?>
+        
         <?php if ($column['task_limit']): ?>
             <span title="<?= t('Task limit') ?>" class="task-limit">
                 (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>/<?= $this->e($column['task_limit']) ?>)