4 files changed, 63 insertions, 12 deletions
diff --git a/app/Template/config/board.php b/app/Template/config/board.php
index 15e2b422..c55003de 100644
--- a/app/Template/config/board.php
+++ b/app/Template/config/board.php
@@ -18,18 +18,6 @@
     <?= $this->formNumber('board_private_refresh_interval', $values, $errors) ?><br/>
     <p class="form-help"><?= t('Frequency in second (0 to disable this feature, 10 seconds by default)') ?></p>
 
-    <?= $this->formLabel(t('Default columns for new projects (Comma-separated)'), 'board_columns') ?>
-    <?= $this->formText('board_columns', $values, $errors) ?><br/>
-    <p class="form-help"><?= t('Default values are "%s"', $default_columns) ?></p>
-
-    <?= $this->formLabel(t('Default categories for new projects (Comma-separated)'), 'project_categories') ?>
-    <?= $this->formText('project_categories', $values, $errors) ?><br/>
-    <p class="form-help"><?= t('Example: "Bug, Feature Request, Improvement"') ?></p>
-
-    <?= $this->formCheckbox('subtask_restriction', t('Allow only one subtask in progress at the same time for a user'), 1, $values['subtask_restriction'] == 1) ?>
-    <?= $this->formCheckbox('subtask_time_tracking', t('Enable time tracking for subtasks'), 1, $values['subtask_time_tracking'] == 1) ?>
-    <?= $this->formCheckbox('subtask_forecast', t('Show subtask estimates in the user calendar'), 1, $values['subtask_forecast'] == 1) ?>
-
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
     </div>
diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php
new file mode 100644
index 00000000..300d3419
--- /dev/null
+++ b/app/Template/config/calendar.php
@@ -0,0 +1,33 @@
+<div class="page-header">
+    <h2><?= t('Calendar settings') ?></h2>
+</div>
+<section>
+<form method="post" action="<?= $this->u('config', 'calendar') ?>" autocomplete="off">
+
+    <?= $this->formCsrf() ?>
+
+    <h3><?= t('Project calendar view') ?></h3>
+    <div class="listing">
+        <?= $this->formRadios('calendar_project_tasks', array(
+                'date_creation' => t('Show tasks based on the creation date'),
+                'date_started' => t('Show tasks based on the start date'),
+            ), $values) ?>
+    </div>
+
+    <h3><?= t('User calendar view') ?></h3>
+    <div class="listing">
+        <?= $this->formRadios('calendar_user_tasks', array(
+                'date_creation' => t('Show tasks based on the creation date'),
+                'date_started' => t('Show tasks based on the start date'),
+            ), $values) ?>
+
+        <h4><?= t('Subtasks time tracking') ?></h4>
+        <?= $this->formCheckbox('calendar_user_subtasks_time_tracking', t('Show subtasks based on the time tracking'), 1, $values['calendar_user_subtasks_time_tracking'] == 1) ?>
+        <?= $this->formCheckbox('calendar_user_subtasks_forecast', t('Show subtask estimates (forecast of future work)'), 1, $values['calendar_user_subtasks_forecast'] == 1) ?>
+    </div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
+</section>
+\ No newline at end of file
diff --git a/app/Template/config/project.php b/app/Template/config/project.php
new file mode 100644
index 00000000..b559d632
--- /dev/null
+++ b/app/Template/config/project.php
@@ -0,0 +1,24 @@
+<div class="page-header">
+    <h2><?= t('Project settings') ?></h2>
+</div>
+<section>
+<form method="post" action="<?= $this->u('config', 'project') ?>" autocomplete="off">
+
+    <?= $this->formCsrf() ?>
+
+    <?= $this->formLabel(t('Default columns for new projects (Comma-separated)'), 'board_columns') ?>
+    <?= $this->formText('board_columns', $values, $errors) ?><br/>
+    <p class="form-help"><?= t('Default values are "%s"', $default_columns) ?></p>
+
+    <?= $this->formLabel(t('Default categories for new projects (Comma-separated)'), 'project_categories') ?>
+    <?= $this->formText('project_categories', $values, $errors) ?><br/>
+    <p class="form-help"><?= t('Example: "Bug, Feature Request, Improvement"') ?></p>
+
+    <?= $this->formCheckbox('subtask_restriction', t('Allow only one subtask in progress at the same time for a user'), 1, $values['subtask_restriction'] == 1) ?>
+    <?= $this->formCheckbox('subtask_time_tracking', t('Enable time tracking for subtasks'), 1, $values['subtask_time_tracking'] == 1) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
+</section>
+\ No newline at end of file
diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php
index a4f9d8e3..4bae9e2e 100644
--- a/app/Template/config/sidebar.php
+++ b/app/Template/config/sidebar.php
@@ -8,9 +8,15 @@
             <?= $this->a(t('Application settings'), 'config', 'application') ?>
         </li>
         <li>
+            <?= $this->a(t('Project settings'), 'config', 'project') ?>
+        </li>
+        <li>
             <?= $this->a(t('Board settings'), 'config', 'board') ?>
         </li>
         <li>
+            <?= $this->a(t('Calendar settings'), 'config', 'calendar') ?>
+        </li>
+        <li>
             <?= $this->a(t('Link settings'), 'link', 'index') ?>
         </li>
         <li>