From 364382b1b58db8bf1bd2c8866e21c869a7a5d6d0 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 13 Feb 2015 17:50:20 -0500
Subject: Add task links (Merge pull-request #610)

---
 app/Template/task/public.php  | 7 +++++++
 app/Template/task/show.php    | 3 ++-
 app/Template/task/sidebar.php | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'app/Template/task')

diff --git a/app/Template/task/public.php b/app/Template/task/public.php
index 2d95e6db..c66b2433 100644
--- a/app/Template/task/public.php
+++ b/app/Template/task/public.php
@@ -16,6 +16,13 @@
         'not_editable' => true
     )) ?>
 
+    <?= $this->render('tasklink/show', array(
+        'task' => $task,
+        'links' => $links,
+        'project' => $project,
+        'not_editable' => true
+    )) ?>
+    
     <?= $this->render('task/comments', array(
         'task' => $task,
         'comments' => $comments,
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index b8243cc6..f968a409 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -3,5 +3,6 @@
 <?= $this->render('task/show_description', array('task' => $task)) ?>
 <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
 <?= $this->render('task/timesheet', array('task' => $task)) ?>
+<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'link_list' => $link_list, 'task_list' => $task_list)) ?>
 <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>
-<?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file
+<?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index e85a1671..f41be14d 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -18,6 +18,9 @@
         <li>
             <?= $this->a(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
+        <li>
+            <?= $this->a(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
         <li>
             <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
-- 
cgit v1.2.3