diff --git a/Makefile b/Makefile index ba6d17c91..3c60d31af 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BUILD_DIR = /tmp -CSS_APP = $(addprefix assets/css/src/, $(addsuffix .css, base links title table form button alert tooltip header board task comment subtask markdown listing activity dashboard pagination popover confirm sidebar responsive dropdown upload filters gantt project files views)) -CSS_PRINT = $(addprefix assets/css/src/, $(addsuffix .css, print links table board task comment subtask markdown)) +CSS_APP = $(addprefix assets/css/src/, $(addsuffix .css, base links title table form button alert tooltip header board task comment subtask tasklink markdown listing activity dashboard pagination popover confirm sidebar responsive dropdown upload filters gantt project files views)) +CSS_PRINT = $(addprefix assets/css/src/, $(addsuffix .css, print links table board task comment subtask tasklink markdown)) CSS_VENDOR = $(addprefix assets/css/vendor/, $(addsuffix .css, jquery-ui.min jquery-ui-timepicker-addon.min chosen.min fullcalendar.min font-awesome.min c3.min)) JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Popover Dropdown Tooltip Markdown Search App Screenshot FileUpload Calendar Board Column Swimlane Gantt Task Project Subtask TaskRepartitionChart UserRepartitionChart CumulativeFlowDiagram BurndownChart AvgTimeColumnChart TaskTimeColumnChart LeadCycleTimeChart CompareHoursColumnChart Router)) diff --git a/app/Controller/Tasklink.php b/app/Controller/Tasklink.php index dac10f8b8..b051caad4 100644 --- a/app/Controller/Tasklink.php +++ b/app/Controller/Tasklink.php @@ -42,6 +42,7 @@ class Tasklink extends Base 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), 'task' => $task, 'project' => $project, + 'link_label_list' => $this->link->getList(0, false), 'editable' => true, 'is_public' => false, 'show_title' => true, diff --git a/app/Template/task/public.php b/app/Template/task/public.php index 7edf097cc..0052214ad 100644 --- a/app/Template/task/public.php +++ b/app/Template/task/public.php @@ -10,6 +10,12 @@ 'is_public' => true, )) ?> + = $this->render('subtask/show', array( + 'task' => $task, + 'subtasks' => $subtasks, + 'editable' => false + )) ?> + = $this->render('tasklink/show', array( 'task' => $task, 'links' => $links, @@ -18,12 +24,6 @@ 'is_public' => true, )) ?> - = $this->render('subtask/show', array( - 'task' => $task, - 'subtasks' => $subtasks, - 'editable' => false - )) ?> - = $this->render('task/comments', array( 'task' => $task, 'comments' => $comments, diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 56ecdf764..5dc27ca1d 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -25,6 +25,7 @@ = $this->render('tasklink/show', array( 'task' => $task, 'links' => $links, + 'project' => $project, 'link_label_list' => $link_label_list, 'editable' => true, 'is_public' => false, diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php index cd255877c..1aa141a45 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -7,111 +7,31 @@
= t('There is no internal link for the moment.') ?>
- -= t('There is no internal link for the moment.') ?>
+ +