From e4efc73a90b0ef62b5d828db53a365184be40137 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Thu, 13 Nov 2014 20:04:34 -0500
Subject: Move category template to a subfolder

---
 app/Controller/Category.php      | 10 +++++-----
 app/Template/category/edit.php   | 18 ++++++++++++++++++
 app/Template/category/index.php  | 41 ++++++++++++++++++++++++++++++++++++++++
 app/Template/category/remove.php | 17 +++++++++++++++++
 app/Template/category_edit.php   | 16 ----------------
 app/Template/category_index.php  | 41 ----------------------------------------
 app/Template/category_remove.php | 16 ----------------
 7 files changed, 81 insertions(+), 78 deletions(-)
 create mode 100644 app/Template/category/edit.php
 create mode 100644 app/Template/category/index.php
 create mode 100644 app/Template/category/remove.php
 delete mode 100644 app/Template/category_edit.php
 delete mode 100644 app/Template/category_index.php
 delete mode 100644 app/Template/category_remove.php

(limited to 'app')

diff --git a/app/Controller/Category.php b/app/Controller/Category.php
index 4a0128f3..d69ed115 100644
--- a/app/Controller/Category.php
+++ b/app/Controller/Category.php
@@ -38,7 +38,7 @@ class Category extends Base
     {
         $project = $this->getProjectManagement();
 
-        $this->response->html($this->projectLayout('category_index', array(
+        $this->response->html($this->projectLayout('category/index', array(
             'categories' => $this->category->getList($project['id'], false),
             'values' => array('project_id' => $project['id']),
             'errors' => array(),
@@ -70,7 +70,7 @@ class Category extends Base
             }
         }
 
-        $this->response->html($this->projectLayout('category_index', array(
+        $this->response->html($this->projectLayout('category/index', array(
             'categories' => $this->category->getList($project['id'], false),
             'values' => $values,
             'errors' => $errors,
@@ -89,7 +89,7 @@ class Category extends Base
         $project = $this->getProjectManagement();
         $category = $this->getCategory($project['id']);
 
-        $this->response->html($this->projectLayout('category_edit', array(
+        $this->response->html($this->projectLayout('category/edit', array(
             'values' => $category,
             'errors' => array(),
             'project' => $project,
@@ -120,7 +120,7 @@ class Category extends Base
             }
         }
 
-        $this->response->html($this->projectLayout('category_edit', array(
+        $this->response->html($this->projectLayout('category/edit', array(
             'values' => $values,
             'errors' => $errors,
             'project' => $project,
@@ -138,7 +138,7 @@ class Category extends Base
         $project = $this->getProjectManagement();
         $category = $this->getCategory($project['id']);
 
-        $this->response->html($this->projectLayout('category_remove', array(
+        $this->response->html($this->projectLayout('category/remove', array(
             'project' => $project,
             'category' => $category,
             'title' => t('Remove a category')
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
new file mode 100644
index 00000000..05fe288a
--- /dev/null
+++ b/app/Template/category/edit.php
@@ -0,0 +1,18 @@
+<div class="page-header">
+    <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
+</div>
+
+<form method="post" action="<?= Helper\u('category', 'update', array('project_id' => $project['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+
+    <?= Helper\form_hidden('id', $values) ?>
+    <?= Helper\form_hidden('project_id', $values) ?>
+
+    <?= Helper\form_label(t('Category Name'), 'name') ?>
+    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
+
+    <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/category/index.php b/app/Template/category/index.php
new file mode 100644
index 00000000..8a3eb4f1
--- /dev/null
+++ b/app/Template/category/index.php
@@ -0,0 +1,41 @@
+<div class="page-header">
+    <h2><?= t('Categories') ?></h2>
+</div>
+
+<?php if (! empty($categories)): ?>
+<table>
+    <tr>
+        <th><?= t('Category Name') ?></th>
+        <th><?= t('Actions') ?></th>
+    </tr>
+    <?php foreach ($categories as $category_id => $category_name): ?>
+    <tr>
+        <td><?= Helper\escape($category_name) ?></td>
+        <td>
+            <ul>
+                <li>
+                    <?= Helper\a(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                </li>
+                <li>
+                    <?= Helper\a(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                </li>
+            </ul>
+        </td>
+    </tr>
+    <?php endforeach ?>
+</table>
+<?php endif ?>
+
+<h3><?= t('Add a new category') ?></h3>
+<form method="post" action="<?= Helper\u('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+    <?= Helper\form_hidden('project_id', $values) ?>
+
+    <?= Helper\form_label(t('Category Name'), 'name') ?>
+    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
+
+    <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/category/remove.php b/app/Template/category/remove.php
new file mode 100644
index 00000000..39e5c1db
--- /dev/null
+++ b/app/Template/category/remove.php
@@ -0,0 +1,17 @@
+<section id="main">
+    <div class="page-header">
+        <h2><?= t('Remove a category') ?></h2>
+    </div>
+
+    <div class="confirm">
+        <p class="alert alert-info">
+            <?= t('Do you really want to remove this category: "%s"?', $category['name']) ?>
+        </p>
+
+        <div class="form-actions">
+            <?= Helper\a(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
+            <?= t('or') ?>
+            <?= Helper\a(t('cancel'), 'category', 'index', array('project_id' => $project['id'])) ?>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/app/Template/category_edit.php b/app/Template/category_edit.php
deleted file mode 100644
index 278d7e12..00000000
--- a/app/Template/category_edit.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
-</div>
-
-<form method="post" action="?controller=category&amp;action=update&amp;project_id=<?= $project['id'] ?>" autocomplete="off">
-    <?= Helper\form_csrf() ?>
-    <?= Helper\form_hidden('id', $values) ?>
-    <?= Helper\form_hidden('project_id', $values) ?>
-
-    <?= Helper\form_label(t('Category Name'), 'name') ?>
-    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
-
-    <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/category_index.php b/app/Template/category_index.php
deleted file mode 100644
index 4635406e..00000000
--- a/app/Template/category_index.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Categories') ?></h2>
-</div>
-
-<?php if (! empty($categories)): ?>
-<table>
-    <tr>
-        <th><?= t('Category Name') ?></th>
-        <th><?= t('Actions') ?></th>
-    </tr>
-    <?php foreach ($categories as $category_id => $category_name): ?>
-    <tr>
-        <td><?= Helper\escape($category_name) ?></td>
-        <td>
-            <ul>
-                <li>
-                    <a href="?controller=category&amp;action=edit&amp;project_id=<?= $project['id'] ?>&amp;category_id=<?= $category_id ?>"><?= t('Edit') ?></a>
-                </li>
-                <li>
-                    <a href="?controller=category&amp;action=confirm&amp;project_id=<?= $project['id'] ?>&amp;category_id=<?= $category_id ?>"><?= t('Remove') ?></a>
-                </li>
-            </ul>
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
-<?php endif ?>
-
-<h3><?= t('Add a new category') ?></h3>
-<form method="post" action="?controller=category&amp;action=save&amp;project_id=<?= $project['id'] ?>" autocomplete="off">
-
-    <?= Helper\form_csrf() ?>
-    <?= Helper\form_hidden('project_id', $values) ?>
-
-    <?= Helper\form_label(t('Category Name'), 'name') ?>
-    <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
-
-    <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/category_remove.php b/app/Template/category_remove.php
deleted file mode 100644
index cfc23e07..00000000
--- a/app/Template/category_remove.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Remove a category') ?></h2>
-    </div>
-
-    <div class="confirm">
-        <p class="alert alert-info">
-            <?= t('Do you really want to remove this category: "%s"?', $category['name']) ?>
-        </p>
-
-        <div class="form-actions">
-            <a href="?controller=category&amp;action=remove&amp;project_id=<?= $project['id'] ?>&amp;category_id=<?= $category['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-            <?= t('or') ?> <a href="?controller=category&amp;project_id=<?= $project['id'] ?>"><?= t('cancel') ?></a>
-        </div>
-    </div>
-</section>
\ No newline at end of file
-- 
cgit v1.2.3