From 8477da26437cd927b47fbac8874e2a7e02b580ca Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 14 Feb 2016 15:49:59 -0500
Subject: Rename File controller to TaskFile

---
 app/Controller/BoardPopover.php                |   2 +-
 app/Controller/File.php                        | 186 -------------------------
 app/Controller/TaskFile.php                    | 186 +++++++++++++++++++++++++
 app/ServiceProvider/AuthenticationProvider.php |   2 +-
 app/ServiceProvider/RouteProvider.php          |   2 -
 app/Template/board/tooltip_files.php           |   4 +-
 app/Template/file/new.php                      |  33 -----
 app/Template/file/open.php                     |   6 -
 app/Template/file/remove.php                   |  15 --
 app/Template/file/screenshot.php               |  19 ---
 app/Template/file/show.php                     |  84 -----------
 app/Template/task/menu.php                     |   4 +-
 app/Template/task/show.php                     |   2 +-
 app/Template/task_file/new.php                 |  33 +++++
 app/Template/task_file/open.php                |   6 +
 app/Template/task_file/remove.php              |  15 ++
 app/Template/task_file/screenshot.php          |  19 +++
 app/Template/task_file/show.php                |  84 +++++++++++
 18 files changed, 350 insertions(+), 352 deletions(-)
 delete mode 100644 app/Controller/File.php
 create mode 100644 app/Controller/TaskFile.php
 delete mode 100644 app/Template/file/new.php
 delete mode 100644 app/Template/file/open.php
 delete mode 100644 app/Template/file/remove.php
 delete mode 100644 app/Template/file/screenshot.php
 delete mode 100644 app/Template/file/show.php
 create mode 100644 app/Template/task_file/new.php
 create mode 100644 app/Template/task_file/open.php
 create mode 100644 app/Template/task_file/remove.php
 create mode 100644 app/Template/task_file/screenshot.php
 create mode 100644 app/Template/task_file/show.php

diff --git a/app/Controller/BoardPopover.php b/app/Controller/BoardPopover.php
index f2b39d8d..965669ff 100644
--- a/app/Controller/BoardPopover.php
+++ b/app/Controller/BoardPopover.php
@@ -93,7 +93,7 @@ class BoardPopover extends Base
     {
         $task = $this->getTask();
 
-        $this->response->html($this->template->render('file/screenshot', array(
+        $this->response->html($this->template->render('task_file/screenshot', array(
             'task' => $task,
         )));
     }
diff --git a/app/Controller/File.php b/app/Controller/File.php
deleted file mode 100644
index c5517df8..00000000
--- a/app/Controller/File.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-namespace Kanboard\Controller;
-
-use Kanboard\Core\ObjectStorage\ObjectStorageException;
-
-/**
- * File controller
- *
- * @package  controller
- * @author   Frederic Guillot
- */
-class File extends Base
-{
-    /**
-     * Screenshot
-     *
-     * @access public
-     */
-    public function screenshot()
-    {
-        $task = $this->getTask();
-
-        if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
-            $this->flash->success(t('Screenshot uploaded successfully.'));
-            return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
-        }
-
-        $this->response->html($this->helper->layout->task('file/screenshot', array(
-            'task' => $task,
-        )));
-    }
-
-    /**
-     * File upload form
-     *
-     * @access public
-     */
-    public function create()
-    {
-        $task = $this->getTask();
-
-        $this->response->html($this->helper->layout->task('file/new', array(
-            'task' => $task,
-            'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
-        )));
-    }
-
-    /**
-     * File upload (save files)
-     *
-     * @access public
-     */
-    public function save()
-    {
-        $task = $this->getTask();
-
-        if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
-            $this->flash->failure(t('Unable to upload the file.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
-    }
-
-    /**
-     * File download
-     *
-     * @access public
-     */
-    public function download()
-    {
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-            if ($file['task_id'] != $task['id']) {
-                $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-            }
-
-            $this->response->forceDownload($file['name']);
-            $this->objectStorage->output($file['path']);
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Open a file (show the content in a popover)
-     *
-     * @access public
-     */
-    public function open()
-    {
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        if ($file['task_id'] == $task['id']) {
-            $this->response->html($this->template->render('file/open', array(
-                'file' => $file,
-                'task' => $task,
-            )));
-        }
-    }
-
-    /**
-     * Display image
-     *
-     * @access public
-     */
-    public function image()
-    {
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-            if ($file['task_id'] == $task['id']) {
-                $this->response->contentType($this->taskFile->getImageMimeType($file['name']));
-                $this->objectStorage->output($file['path']);
-            }
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Display image thumbnails
-     *
-     * @access public
-     */
-    public function thumbnail()
-    {
-        $this->response->contentType('image/jpeg');
-
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-            if ($file['task_id'] == $task['id']) {
-                $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
-            }
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-
-            // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19
-            $data = $this->objectStorage->get($file['path']);
-            $this->taskFile->generateThumbnailFromData($file['path'], $data);
-            $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
-        }
-    }
-
-    /**
-     * Remove a file
-     *
-     * @access public
-     */
-    public function remove()
-    {
-        $this->checkCSRFParam();
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) {
-            $this->flash->success(t('File removed successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to remove this file.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-    }
-
-    /**
-     * Confirmation dialog before removing a file
-     *
-     * @access public
-     */
-    public function confirm()
-    {
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        $this->response->html($this->helper->layout->task('file/remove', array(
-            'task' => $task,
-            'file' => $file,
-        )));
-    }
-}
diff --git a/app/Controller/TaskFile.php b/app/Controller/TaskFile.php
new file mode 100644
index 00000000..102fdc5c
--- /dev/null
+++ b/app/Controller/TaskFile.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Core\ObjectStorage\ObjectStorageException;
+
+/**
+ * File File Controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class TaskFile extends Base
+{
+    /**
+     * Screenshot
+     *
+     * @access public
+     */
+    public function screenshot()
+    {
+        $task = $this->getTask();
+
+        if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
+            $this->flash->success(t('Screenshot uploaded successfully.'));
+            return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+        }
+
+        $this->response->html($this->helper->layout->task('task_file/screenshot', array(
+            'task' => $task,
+        )));
+    }
+
+    /**
+     * File upload form
+     *
+     * @access public
+     */
+    public function create()
+    {
+        $task = $this->getTask();
+
+        $this->response->html($this->helper->layout->task('task_file/new', array(
+            'task' => $task,
+            'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
+        )));
+    }
+
+    /**
+     * File upload (save files)
+     *
+     * @access public
+     */
+    public function save()
+    {
+        $task = $this->getTask();
+
+        if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
+            $this->flash->failure(t('Unable to upload the file.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+    }
+
+    /**
+     * File download
+     *
+     * @access public
+     */
+    public function download()
+    {
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] != $task['id']) {
+                $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+            }
+
+            $this->response->forceDownload($file['name']);
+            $this->objectStorage->output($file['path']);
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Open a file (show the content in a popover)
+     *
+     * @access public
+     */
+    public function open()
+    {
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        if ($file['task_id'] == $task['id']) {
+            $this->response->html($this->template->render('task_file/open', array(
+                'file' => $file,
+                'task' => $task,
+            )));
+        }
+    }
+
+    /**
+     * Display image
+     *
+     * @access public
+     */
+    public function image()
+    {
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] == $task['id']) {
+                $this->response->contentType($this->taskFile->getImageMimeType($file['name']));
+                $this->objectStorage->output($file['path']);
+            }
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Display image thumbnails
+     *
+     * @access public
+     */
+    public function thumbnail()
+    {
+        $this->response->contentType('image/jpeg');
+
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] == $task['id']) {
+                $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
+            }
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+
+            // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19
+            $data = $this->objectStorage->get($file['path']);
+            $this->taskFile->generateThumbnailFromData($file['path'], $data);
+            $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
+        }
+    }
+
+    /**
+     * Remove a file
+     *
+     * @access public
+     */
+    public function remove()
+    {
+        $this->checkCSRFParam();
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) {
+            $this->flash->success(t('File removed successfully.'));
+        } else {
+            $this->flash->failure(t('Unable to remove this file.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+    }
+
+    /**
+     * Confirmation dialog before removing a file
+     *
+     * @access public
+     */
+    public function confirm()
+    {
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        $this->response->html($this->helper->layout->task('task_file/remove', array(
+            'task' => $task,
+            'file' => $file,
+        )));
+    }
+}
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index c2f7a5c4..cc7b9302 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -76,7 +76,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('Comment', '*', Role::PROJECT_MEMBER);
         $acl->add('Customfilter', '*', Role::PROJECT_MEMBER);
         $acl->add('Export', '*', Role::PROJECT_MANAGER);
-        $acl->add('File', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
+        $acl->add('TaskFile', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
         $acl->add('Gantt', '*', Role::PROJECT_MANAGER);
         $acl->add('Project', array('share', 'integrations', 'notifications', 'duplicate', 'disable', 'enable', 'remove'), Role::PROJECT_MANAGER);
         $acl->add('ProjectPermission', '*', Role::PROJECT_MANAGER);
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 5003eb88..c723140e 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -94,8 +94,6 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('public/task/:task_id/:token', 'task', 'readonly');
 
             $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'activity', 'task');
-            $container['route']->addRoute('project/:project_id/task/:task_id/screenshot', 'file', 'screenshot');
-            $container['route']->addRoute('project/:project_id/task/:task_id/upload', 'file', 'create');
             $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'task', 'transitions');
             $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'task', 'analytics');
             $container['route']->addRoute('project/:project_id/task/:task_id/subtasks', 'subtask', 'show');
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php
index 407309b3..4fa14b57 100644
--- a/app/Template/board/tooltip_files.php
+++ b/app/Template/board/tooltip_files.php
@@ -8,9 +8,9 @@
     </tr>
     <tr>
         <td>
-            <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'file', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+            <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'TaskFile', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
             <?php if ($file['is_image'] == 1): ?>
-                &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'file', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'TaskFile', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
             <?php endif ?>
         </td>
     </tr>
diff --git a/app/Template/file/new.php b/app/Template/file/new.php
deleted file mode 100644
index e84ef839..00000000
--- a/app/Template/file/new.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Attach a document') ?></h2>
-</div>
-<div id="file-done" style="display:none">
-    <p class="alert alert-success">
-        <?= t('All files have been uploaded successfully.') ?>
-        <?= $this->url->link(t('View uploaded files'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
-    </p>
-</div>
-
-<div id="file-error-max-size" style="display:none">
-    <p class="alert alert-error">
-        <?= t('The maximum allowed file size is %sB.', $this->text->bytes($max_size)) ?>
-        <a href="#" id="file-browser"><?= t('Choose files again') ?></a>
-    </p>
-</div>
-
-<div
-    id="file-dropzone"
-    data-max-size="<?= $max_size ?>"
-    data-url="<?= $this->url->href('file', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
-    <div id="file-dropzone-inner">
-        <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
-    </div>
-</div>
-
-<input type="file" name="files[]" multiple style="display:none" id="file-form-element">
-
-<div class="form-actions">
-    <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue" id="file-upload-button" disabled>
-    <?= t('or') ?>
-    <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-</div>
diff --git a/app/Template/file/open.php b/app/Template/file/open.php
deleted file mode 100644
index 3df012b6..00000000
--- a/app/Template/file/open.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="page-header">
-    <h2><?= $this->e($file['name']) ?></h2>
-    <div class="task-file-viewer">
-        <img src="<?= $this->url->href('file', 'image', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" alt="<?= $this->e($file['name']) ?>"/>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/file/remove.php b/app/Template/file/remove.php
deleted file mode 100644
index 24844835..00000000
--- a/app/Template/file/remove.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove a file') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to remove this file: "%s"?', $this->e($file['name'])) ?>
-    </p>
-
-    <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'file', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/file/screenshot.php b/app/Template/file/screenshot.php
deleted file mode 100644
index 58b93ac3..00000000
--- a/app/Template/file/screenshot.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Add a screenshot') ?></h2>
-</div>
-
-<div id="screenshot-zone">
-    <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p>
-</div>
-
-<form class="popover-form" action="<?= $this->url->href('file', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
-    <input type="hidden" name="screenshot"/>
-    <?= $this->form->csrf() ?>
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</form>
-
-<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p>
\ No newline at end of file
diff --git a/app/Template/file/show.php b/app/Template/file/show.php
deleted file mode 100644
index ed006299..00000000
--- a/app/Template/file/show.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php if (! empty($files) || ! empty($images)): ?>
-<div id="attachments" class="task-show-section">
-
-    <div class="page-header">
-        <h2><?= t('Attachments') ?></h2>
-    </div>
-    <?php if (! empty($images)): ?>
-        <div class="file-thumbnails">
-            <?php foreach ($images as $file): ?>
-                <div class="file-thumbnail">
-                    <a href="<?= $this->url->href('file', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('file', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->e($file['name']) ?>" alt="<?= $this->e($file['name']) ?>"></a>
-                    <div class="file-thumbnail-content">
-                        <div class="file-thumbnail-title">
-                            <div class="dropdown">
-                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
-                            <ul>
-                                <?php if ($this->user->hasProjectAccess('file', 'remove', $task['project_id'])): ?>
-                                <li>
-                                    <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'file', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
-                                </li>
-                                <?php endif ?>
-                                <li>
-                                    <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'file', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
-                                </li>
-                            </ul>
-                            </div>
-                        </div>
-                        <div class="file-thumbnail-description">
-                            <span class="tooltip" title='<?= t('Uploaded: %s', $this->dt->datetime($file['date'])).'<br>'.t('Size: %s', $this->text->bytes($file['size'])) ?>'>
-                                <i class="fa fa-info-circle"></i>
-                            </span>
-                            <?= t('Uploaded by %s', $file['user_name'] ?: $file['username']) ?>
-                        </div>
-                    </div>
-                </div>
-            <?php endforeach ?>
-        </div>
-    <?php endif ?>
-
-    <?php if (! empty($files)): ?>
-        <table class="table-stripped">
-            <tr>
-                <th><?= t('Filename') ?></th>
-                <th><?= t('Creator') ?></th>
-                <th><?= t('Date') ?></th>
-                <th><?= t('Size') ?></th>
-            </tr>
-            <?php foreach ($files as $file): ?>
-                <tr>
-                    <td>
-                        <i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i>
-                        <div class="dropdown">
-                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
-                            <ul>
-                                <?php if ($this->user->hasProjectAccess('file', 'remove', $task['project_id'])): ?>
-                                <li>
-                                    <i class="fa fa-trash fa-fw"></i>
-                                    <?= $this->url->link(t('Remove'), 'file', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
-                                </li>
-                                <?php endif ?>
-                                <li>
-                                    <i class="fa fa-download fa-fw"></i>
-                                    <?= $this->url->link(t('Download'), 'file', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
-                                </li>
-                            </ul>
-                        </div>
-                    </td>
-                    <td>
-                        <?= $this->e($file['user_name'] ?: $file['username']) ?>
-                    </td>
-                    <td>
-                        <?= $this->dt->date($file['date']) ?>
-                    </td>
-                    <td>
-                        <?= $this->text->bytes($file['size']) ?>
-                    </td>
-                </tr>
-            <?php endforeach ?>
-        </table>
-    <?php endif ?>
-</div>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/task/menu.php b/app/Template/task/menu.php
index e997a6ad..cddd930a 100644
--- a/app/Template/task/menu.php
+++ b/app/Template/task/menu.php
@@ -38,11 +38,11 @@
         </li>
         <li>
             <i class="fa fa-file fa-fw"></i>
-            <?= $this->url->link(t('Attach a document'), 'file', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-camera fa-fw"></i>
-            <?= $this->url->link(t('Add a screenshot'), 'file', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+            <?= $this->url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
         </li>
         <li>
             <i class="fa fa-files-o fa-fw"></i>
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index 43906a81..a32232ae 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -25,7 +25,7 @@
 
 <?= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
 
-<?= $this->render('file/show', array(
+<?= $this->render('task_file/show', array(
     'task' => $task,
     'files' => $files,
     'images' => $images
diff --git a/app/Template/task_file/new.php b/app/Template/task_file/new.php
new file mode 100644
index 00000000..f03ce8dc
--- /dev/null
+++ b/app/Template/task_file/new.php
@@ -0,0 +1,33 @@
+<div class="page-header">
+    <h2><?= t('Attach a document') ?></h2>
+</div>
+<div id="file-done" style="display:none">
+    <p class="alert alert-success">
+        <?= t('All files have been uploaded successfully.') ?>
+        <?= $this->url->link(t('View uploaded files'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+    </p>
+</div>
+
+<div id="file-error-max-size" style="display:none">
+    <p class="alert alert-error">
+        <?= t('The maximum allowed file size is %sB.', $this->text->bytes($max_size)) ?>
+        <a href="#" id="file-browser"><?= t('Choose files again') ?></a>
+    </p>
+</div>
+
+<div
+    id="file-dropzone"
+    data-max-size="<?= $max_size ?>"
+    data-url="<?= $this->url->href('TaskFile', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
+    <div id="file-dropzone-inner">
+        <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
+    </div>
+</div>
+
+<input type="file" name="files[]" multiple style="display:none" id="file-form-element">
+
+<div class="form-actions">
+    <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue" id="file-upload-button" disabled>
+    <?= t('or') ?>
+    <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+</div>
diff --git a/app/Template/task_file/open.php b/app/Template/task_file/open.php
new file mode 100644
index 00000000..e3721b59
--- /dev/null
+++ b/app/Template/task_file/open.php
@@ -0,0 +1,6 @@
+<div class="page-header">
+    <h2><?= $this->e($file['name']) ?></h2>
+    <div class="task-file-viewer">
+        <img src="<?= $this->url->href('TaskFile', 'image', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" alt="<?= $this->e($file['name']) ?>"/>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php
new file mode 100644
index 00000000..5e6c83f2
--- /dev/null
+++ b/app/Template/task_file/remove.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Remove a file') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to remove this file: "%s"?', $this->e($file['name'])) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= $this->url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
new file mode 100644
index 00000000..72214362
--- /dev/null
+++ b/app/Template/task_file/screenshot.php
@@ -0,0 +1,19 @@
+<div class="page-header">
+    <h2><?= t('Add a screenshot') ?></h2>
+</div>
+
+<div id="screenshot-zone">
+    <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p>
+</div>
+
+<form class="popover-form" action="<?= $this->url->href('TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post">
+    <input type="hidden" name="screenshot"/>
+    <?= $this->form->csrf() ?>
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+    </div>
+</form>
+
+<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p>
\ No newline at end of file
diff --git a/app/Template/task_file/show.php b/app/Template/task_file/show.php
new file mode 100644
index 00000000..98f26c33
--- /dev/null
+++ b/app/Template/task_file/show.php
@@ -0,0 +1,84 @@
+<?php if (! empty($files) || ! empty($images)): ?>
+<div id="attachments" class="task-show-section">
+
+    <div class="page-header">
+        <h2><?= t('Attachments') ?></h2>
+    </div>
+    <?php if (! empty($images)): ?>
+        <div class="file-thumbnails">
+            <?php foreach ($images as $file): ?>
+                <div class="file-thumbnail">
+                    <a href="<?= $this->url->href('TaskFile', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('TaskFile', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->e($file['name']) ?>" alt="<?= $this->e($file['name']) ?>"></a>
+                    <div class="file-thumbnail-content">
+                        <div class="file-thumbnail-title">
+                            <div class="dropdown">
+                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
+                            <ul>
+                                <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                                <li>
+                                    <i class="fa fa-trash fa-fw"></i>
+                                    <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                </li>
+                                <?php endif ?>
+                                <li>
+                                    <i class="fa fa-download fa-fw"></i>
+                                    <?= $this->url->link(t('Download'), 'TaskFile', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                </li>
+                            </ul>
+                            </div>
+                        </div>
+                        <div class="file-thumbnail-description">
+                            <span class="tooltip" title='<?= t('Uploaded: %s', $this->dt->datetime($file['date'])).'<br>'.t('Size: %s', $this->text->bytes($file['size'])) ?>'>
+                                <i class="fa fa-info-circle"></i>
+                            </span>
+                            <?= t('Uploaded by %s', $file['user_name'] ?: $file['username']) ?>
+                        </div>
+                    </div>
+                </div>
+            <?php endforeach ?>
+        </div>
+    <?php endif ?>
+
+    <?php if (! empty($files)): ?>
+        <table class="table-stripped">
+            <tr>
+                <th><?= t('Filename') ?></th>
+                <th><?= t('Creator') ?></th>
+                <th><?= t('Date') ?></th>
+                <th><?= t('Size') ?></th>
+            </tr>
+            <?php foreach ($files as $file): ?>
+                <tr>
+                    <td>
+                        <i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i>
+                        <div class="dropdown">
+                            <a href="#" class="dropdown-menu dropdown-menu-link-text"><?= $this->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
+                            <ul>
+                                <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?>
+                                <li>
+                                    <i class="fa fa-trash fa-fw"></i>
+                                    <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
+                                </li>
+                                <?php endif ?>
+                                <li>
+                                    <i class="fa fa-download fa-fw"></i>
+                                    <?= $this->url->link(t('Download'), 'TaskFile', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
+                                </li>
+                            </ul>
+                        </div>
+                    </td>
+                    <td>
+                        <?= $this->e($file['user_name'] ?: $file['username']) ?>
+                    </td>
+                    <td>
+                        <?= $this->dt->date($file['date']) ?>
+                    </td>
+                    <td>
+                        <?= $this->text->bytes($file['size']) ?>
+                    </td>
+                </tr>
+            <?php endforeach ?>
+        </table>
+    <?php endif ?>
+</div>
+<?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3