Move event and notification templates to a subfolder

app/Template/notification/comment_creation.php

@@ -4,4 +4,4 @@
 
 <?= Helper\markdown($comment['comment']) ?>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/comment_update.php

@@ -4,4 +4,4 @@
 
 <?= Helper\markdown($comment['comment']) ?>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/file_creation.php

@@ -0,0 +1,5 @@
+<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+
+<p><?= t('New attachment added "%s"', $file['name']) ?></p>
+
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/subtask_creation.php

@@ -14,4 +14,4 @@
     </li>
 </ul>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/subtask_update.php

@@ -18,4 +18,4 @@
     </li>
 </ul>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_assignee_change.php

@@ -17,4 +17,4 @@
     <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
 <?php endif ?>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_close.php

@@ -2,4 +2,4 @@
 
 <p><?= t('The task #%d have been closed.', $task['id']) ?></p>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_creation.php

@@ -40,4 +40,4 @@
     <?= Helper\markdown($task['description']) ?>
 <?php endif ?>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_due.php

@@ -17,4 +17,4 @@
     <?php endforeach ?>
 </ul>
 
-<?= Helper\template('notification_footer', array('task' => $task)) ?>
+<?= Helper\template('notification/footer', array('task' => $task)) ?>

app/Template/notification/task_move_column.php

@@ -8,4 +8,4 @@
     <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
 </ul>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_move_position.php

@@ -8,4 +8,4 @@
     <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
 </ul>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_open.php

@@ -2,4 +2,4 @@
 
 <p><?= t('The task #%d have been opened.', $task['id']) ?></p>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification/task_update.php

@@ -40,4 +40,4 @@
     <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
 <?php endif ?>
 
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= Helper\template('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/notification_file_creation.php

@@ -1,5 +0,0 @@
-<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
-
-<h3><?= t('New attachment added "%s"', $file['name']) ?></h3>
-
-<?= Helper\template('notification_footer', array('task' => $task, 'application_url' => $application_url)) ?>

app/Template/user_notifications.php

@@ -8,13 +8,16 @@
 
     <?= Helper\form_checkbox('notifications_enabled', t('Enable email notifications'), '1', $notifications['notifications_enabled'] == 1) ?><br/>
 
-    <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
+    <?php if (! empty($projects)): ?>
+        <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
+
+        <div class="form-checkbox-group">
+        <?php foreach ($projects as $project_id => $project_name): ?>
+            <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?>
+        <?php endforeach ?>
+        </div>
+    <?php endif ?>
 
-    <div class="form-checkbox-group">
-    <?php foreach ($projects as $project_id => $project_name): ?>
-        <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?>
-    <?php endforeach ?>
-    </div>
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>