From ea9d402587d6fbcb39080a5d9a26e94ff4575443 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Apr 2015 17:38:41 -0400
Subject: Add column controller

---
 app/Template/board/edit.php        | 82 --------------------------------------
 app/Template/board/edit_column.php | 42 -------------------
 app/Template/board/remove.php      | 15 -------
 app/Template/column/edit.php       | 42 +++++++++++++++++++
 app/Template/column/index.php      | 82 ++++++++++++++++++++++++++++++++++++++
 app/Template/column/remove.php     | 15 +++++++
 app/Template/project/sidebar.php   |  2 +-
 7 files changed, 140 insertions(+), 140 deletions(-)
 delete mode 100644 app/Template/board/edit.php
 delete mode 100644 app/Template/board/edit_column.php
 delete mode 100644 app/Template/board/remove.php
 create mode 100644 app/Template/column/edit.php
 create mode 100644 app/Template/column/index.php
 create mode 100644 app/Template/column/remove.php

(limited to 'app/Template')

diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php
deleted file mode 100644
index a6df1000..00000000
--- a/app/Template/board/edit.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit the board for "%s"', $project['name']) ?></h2>
-</div>
-
-<h3><?= t('Change columns') ?></h3>
-<table>
-    <tr>
-        <th><?= t('Column title') ?></th>
-        <th><?= t('Task limit') ?></th>
-        <th><?= t('Actions') ?></th>
-    </tr>
-    <?php foreach ($columns as $column): ?>
-    <tr>
-        <td class="column-60"><?= $this->e($column['title']) ?>
-         <?php if (! empty($column['description'])): ?>
-            <span class="column-tooltip" title='<?= $this->e($this->markdown($column['description'])) ?>'>
-                <i class="fa fa-info-circle"></i>
-            </span>
-        <?php endif ?>
-        </td>
-        <td class="column-10"><?= $this->e($column['task_limit']) ?></td>
-        <td class="column-30">
-            <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>
-
-<h3><?= t('Add a new column') ?></h3>
-<form method="post" action="<?= $this->u('board', 'add', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
-    <?= $this->formCsrf() ?>
-
-    <?= $this->formHidden('project_id', $values) ?>
-
-    <?= $this->formLabel(t('Title'), 'title') ?>
-    <?= $this->formText('title', $values, $errors, array('required', 'maxlength="50"')) ?>
-
-    <?= $this->formLabel(t('Task limit'), 'task_limit') ?>
-    <?= $this->formNumber('task_limit', $values, $errors) ?>
-
-    <?= $this->formLabel(t('Description'), 'description') ?>
-
-    <div class="form-tabs">
-        <div class="write-area">
-          <?= $this->formTextarea('description', $values, $errors) ?>
-        </div>
-        <div class="preview-area">
-            <div class="markdown"></div>
-        </div>
-        <ul class="form-tabs-nav">
-            <li class="form-tab form-tab-selected">
-                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
-            </li>
-            <li class="form-tab">
-                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
-            </li>
-        </ul>
-    </div>
-    <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"/>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/board/edit_column.php b/app/Template/board/edit_column.php
deleted file mode 100644
index ef76b180..00000000
--- a/app/Template/board/edit_column.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<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') ?>
-    
-    <div class="form-tabs">
-        
-        <div class="write-area">
-          <?= $this->formTextarea('description', $values, $errors) ?>
-        </div>
-        <div class="preview-area">
-            <div class="markdown"></div>
-        </div>
-        <ul class="form-tabs-nav">
-            <li class="form-tab form-tab-selected">
-                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
-            </li>
-            <li class="form-tab">
-                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
-            </li>
-        </ul>
-    </div>
-    <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('Save') ?>" class="btn btn-blue"/>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/board/remove.php b/app/Template/board/remove.php
deleted file mode 100644
index 4b0370eb..00000000
--- a/app/Template/board/remove.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove a column') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to remove this column: "%s"?', $column['title']) ?>
-        <?= t('This action will REMOVE ALL TASKS associated to this column!') ?>
-    </p>
-
-    <div class="form-actions">
-        <?= $this->a(t('Yes'), 'board', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
-        <?= t('or') ?> <?= $this->a(t('cancel'), 'board', 'edit', array('project_id' => $project['id'])) ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
new file mode 100644
index 00000000..7e16c326
--- /dev/null
+++ b/app/Template/column/edit.php
@@ -0,0 +1,42 @@
+<div class="page-header">
+    <h2><?= t('Edit column "%s"', $column['title']) ?></h2>
+</div>
+
+<form method="post" action="<?= $this->u('column', 'update', 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') ?>
+
+    <div class="form-tabs">
+
+        <div class="write-area">
+          <?= $this->formTextarea('description', $values, $errors) ?>
+        </div>
+        <div class="preview-area">
+            <div class="markdown"></div>
+        </div>
+        <ul class="form-tabs-nav">
+            <li class="form-tab form-tab-selected">
+                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
+            </li>
+            <li class="form-tab">
+                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
+            </li>
+        </ul>
+    </div>
+    <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('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
new file mode 100644
index 00000000..d55aa3a8
--- /dev/null
+++ b/app/Template/column/index.php
@@ -0,0 +1,82 @@
+<div class="page-header">
+    <h2><?= t('Edit the board for "%s"', $project['name']) ?></h2>
+</div>
+
+<h3><?= t('Change columns') ?></h3>
+<table>
+    <tr>
+        <th><?= t('Column title') ?></th>
+        <th><?= t('Task limit') ?></th>
+        <th><?= t('Actions') ?></th>
+    </tr>
+    <?php foreach ($columns as $column): ?>
+    <tr>
+        <td class="column-60"><?= $this->e($column['title']) ?>
+         <?php if (! empty($column['description'])): ?>
+            <span class="column-tooltip" title='<?= $this->e($this->markdown($column['description'])) ?>'>
+                <i class="fa fa-info-circle"></i>
+            </span>
+        <?php endif ?>
+        </td>
+        <td class="column-10"><?= $this->e($column['task_limit']) ?></td>
+        <td class="column-30">
+            <ul>
+                <li>
+                    <?= $this->a(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                </li>
+                <?php if ($column['position'] != 1): ?>
+                <li>
+                    <?= $this->a(t('Move Up'), 'column', 'move', 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'), 'column', 'move', array('project_id' => $project['id'], 'column_id' => $column['id'], 'direction' => 'down'), true) ?>
+                </li>
+                <?php endif ?>
+                <li>
+                    <?= $this->a(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
+                </li>
+            </ul>
+        </td>
+    </tr>
+    <?php endforeach ?>
+</table>
+
+<h3><?= t('Add a new column') ?></h3>
+<form method="post" action="<?= $this->u('column', 'create', array('project_id' => $project['id'])) ?>" autocomplete="off">
+
+    <?= $this->formCsrf() ?>
+
+    <?= $this->formHidden('project_id', $values) ?>
+
+    <?= $this->formLabel(t('Title'), 'title') ?>
+    <?= $this->formText('title', $values, $errors, array('required', 'maxlength="50"')) ?>
+
+    <?= $this->formLabel(t('Task limit'), 'task_limit') ?>
+    <?= $this->formNumber('task_limit', $values, $errors) ?>
+
+    <?= $this->formLabel(t('Description'), 'description') ?>
+
+    <div class="form-tabs">
+        <div class="write-area">
+          <?= $this->formTextarea('description', $values, $errors) ?>
+        </div>
+        <div class="preview-area">
+            <div class="markdown"></div>
+        </div>
+        <ul class="form-tabs-nav">
+            <li class="form-tab form-tab-selected">
+                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
+            </li>
+            <li class="form-tab">
+                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
+            </li>
+        </ul>
+    </div>
+    <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"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php
new file mode 100644
index 00000000..3dcbd62f
--- /dev/null
+++ b/app/Template/column/remove.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Remove a column') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to remove this column: "%s"?', $column['title']) ?>
+        <?= t('This action will REMOVE ALL TASKS associated to this column!') ?>
+    </p>
+
+    <div class="form-actions">
+        <?= $this->a(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?> <?= $this->a(t('cancel'), 'column', 'index', array('project_id' => $project['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index 47458144..31e3ff04 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -16,7 +16,7 @@
             <?= $this->a(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?>
         </li>
         <li>
-            <?= $this->a(t('Edit board'), 'board', 'edit', array('project_id' => $project['id'])) ?>
+            <?= $this->a(t('Edit board'), 'column', 'index', array('project_id' => $project['id'])) ?>
         </li>
         <li>
             <?= $this->a(t('Category management'), 'category', 'index', array('project_id' => $project['id'])) ?>
-- 
cgit v1.2.3