Move project templates to a subfolder

app/Template/app/dashboard.php

@@ -20,7 +20,7 @@
         </div>
         <div class="dashboard-right-column">
             <h2><?= t('Activity stream') ?></h2>
-            <?= Helper\template('project_events', array('events' => $events)) ?>
+            <?= Helper\template('project/events', array('events' => $events)) ?>
         </div>
     </section>
 </section>

app/Template/project/activity.php

@@ -11,6 +11,6 @@
             <p class="pull-right"><i class="fa fa-rss-square"></i> <?= Helper\a(t('RSS feed'), 'project', 'feed', array('token' => $project['token'])) ?></p>
         <?php endif ?>
 
-        <?= Helper\template('project_events', array('events' => $events)) ?>
+        <?= Helper\template('project/events', array('events' => $events)) ?>
     </section>
 </section>

app/Template/project/layout.php

@@ -7,7 +7,7 @@
     </div>
     <section class="sidebar-container" id="project-section">
 
-        <?= Helper\template('project_sidebar', array('project' => $project)) ?>
+        <?= Helper\template('project/sidebar', array('project' => $project)) ?>
 
         <div class="sidebar-content">
             <?= $project_content_for_layout ?>

app/Template/project/sidebar.php

@@ -0,0 +1,56 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Summary'), 'project', 'show', array('project_id' => $project['id'])) ?>
+        </li>
+
+        <?php if (Helper\is_admin() || $project['is_private']): ?>
+        <li>
+            <?= Helper\a(t('Public access'), 'project', 'share', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit board'), 'board', 'edit', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Category management'), 'category', 'index', array('project_id' => $project['id'])) ?>
+        </li>
+        <?php if (Helper\is_admin()): ?>
+            <li>
+                <?= Helper\a(t('User management'), 'project', 'users', array('project_id' => $project['id'])) ?>
+            </li>
+        <?php endif ?>
+        <li>
+            <?= Helper\a(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Duplicate'), 'project', 'duplicate', array('project_id' => $project['id']), true) ?>
+        </li>
+        <li>
+            <?php if ($project['is_active']): ?>
+                <?= Helper\a(t('Disable'), 'project', 'disable', array('project_id' => $project['id']), true) ?>
+            <?php else: ?>
+                <?= Helper\a(t('Enable'), 'project', 'enable', array('project_id' => $project['id']), true) ?>
+            <?php endif ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Remove'), 'project', 'remove', array('project_id' => $project['id'])) ?>
+        </li>
+        <?php endif ?>
+    </ul>
+
+    <?php if (Helper\is_admin() || $project['is_private']): ?>
+    <h2><?= t('Exports') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
+        </li>
+    </li>
+    <?php endif ?>
+</div>

app/Template/project/users.php

@@ -26,6 +26,7 @@
     <?php endif ?>
 
     <?php if ($project['is_private'] == 0 && ! empty($users['not_allowed'])): ?>
+        <hr/>
         <form method="post" action="<?= Helper\u('project', 'allow', array('project_id' => $project['id'])) ?>" autocomplete="off">
 
             <?= Helper\form_csrf() ?>
@@ -44,6 +45,7 @@
 <?php endif ?>
 
 <?php if ($project['is_private'] == 0): ?>
+<hr/>
 <form method="post" action="<?= Helper\u('project', 'allowEverybody', array('project_id' => $project['id'])) ?>">
     <?= Helper\form_csrf() ?>
 

app/Template/project_sidebar.php

@@ -1,56 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-    <ul>
-        <li>
-            <a href="?controller=project&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('Summary') ?></a>
-        </li>
-
-        <?php if (Helper\is_admin() || $project['is_private']): ?>
-        <li>
-            <a href="?controller=project&amp;action=share&amp;project_id=<?= $project['id'] ?>"><?= t('Public access') ?></a>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=edit&amp;project_id=<?= $project['id'] ?>"><?= t('Edit project') ?></a>
-        </li>
-        <li>
-            <a href="?controller=board&amp;action=edit&amp;project_id=<?= $project['id'] ?>"><?= t('Edit board') ?></a>
-        </li>
-        <li>
-            <a href="?controller=category&amp;action=index&amp;project_id=<?= $project['id'] ?>"><?= t('Category management') ?></a>
-        </li>
-        <?php if (Helper\is_admin()): ?>
-            <li>
-                <a href="?controller=project&amp;action=users&amp;project_id=<?= $project['id'] ?>"><?= t('User management') ?></a>
-            </li>
-        <?php endif ?>
-        <li>
-            <a href="?controller=action&amp;action=index&amp;project_id=<?= $project['id'] ?>"><?= t('Automatic actions') ?></a>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=duplicate&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Duplicate') ?></a>
-        </li>
-        <li>
-            <?php if ($project['is_active']): ?>
-                <a href="?controller=project&amp;action=disable&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Disable') ?></a>
-            <?php else: ?>
-                <a href="?controller=project&amp;action=enable&amp;project_id=<?= $project['id'].Helper\param_csrf() ?>"><?= t('Enable') ?></a>
-            <?php endif ?>
-        </li>
-        <li>
-            <a href="?controller=project&amp;action=remove&amp;project_id=<?= $project['id'] ?>"><?= t('Remove') ?></a>
-        </li>
-        <?php endif ?>
-    </ul>
-
-    <?php if (Helper\is_admin() || $project['is_private']): ?>
-    <h2><?= t('Exports') ?></h2>
-    <ul>
-        <li>
-            <?= Helper\a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
-        </li>
-        <li>
-            <?= Helper\a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
-        </li>
-    </li>
-    <?php endif ?>
-</div>

app/Template/task_public.php

@@ -10,7 +10,7 @@
         'is_public' => true
     )) ?>
 
-    <?= Helper\template('subtask_show', array(
+    <?= Helper\template('subtask/show', array(
         'task' => $task,
         'subtasks' => $subtasks,
         'not_editable' => true