From 8936792f6f7a408dae7e0a6a41274202822acd9c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 16 Feb 2016 21:12:43 -0500
Subject: Add file attachements to projects

---
 app/Template/task_file/create.php | 33 +++++++++++++++++++++++++++++++++
 app/Template/task_file/new.php    | 33 ---------------------------------
 app/Template/task_file/open.php   |  6 ------
 app/Template/task_file/show.php   |  6 +++---
 4 files changed, 36 insertions(+), 42 deletions(-)
 create mode 100644 app/Template/task_file/create.php
 delete mode 100644 app/Template/task_file/new.php
 delete mode 100644 app/Template/task_file/open.php

(limited to 'app/Template/task_file')

diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php
new file mode 100644
index 00000000..f03ce8dc
--- /dev/null
+++ b/app/Template/task_file/create.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/new.php b/app/Template/task_file/new.php
deleted file mode 100644
index f03ce8dc..00000000
--- a/app/Template/task_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('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
deleted file mode 100644
index e3721b59..00000000
--- a/app/Template/task_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('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/show.php b/app/Template/task_file/show.php
index 98f26c33..67d7a99c 100644
--- a/app/Template/task_file/show.php
+++ b/app/Template/task_file/show.php
@@ -8,7 +8,7 @@
         <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>
+                    <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', '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">
@@ -22,7 +22,7 @@
                                 <?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'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                                 </li>
                             </ul>
                             </div>
@@ -62,7 +62,7 @@
                                 <?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'])) ?>
+                                    <?= $this->url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
                                 </li>
                             </ul>
                         </div>
-- 
cgit v1.2.3