From 25f21eb7d821a9944bc05f73e3448c28b62b6516 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 26 Dec 2017 15:59:37 +0200
Subject: [PATCH] Clean up kanban

---
 app/Http/Controllers/TaskKanbanController.php |  3 +++
 app/Models/Project.php                        |  5 +++++
 resources/views/projects/show.blade.php       |  4 +++-
 resources/views/tasks/kanban.blade.php        | 16 ++++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TaskKanbanController.php b/app/Http/Controllers/TaskKanbanController.php
index 4d05fa17c89a..0de8d0e98bef 100644
--- a/app/Http/Controllers/TaskKanbanController.php
+++ b/app/Http/Controllers/TaskKanbanController.php
@@ -79,13 +79,16 @@ class TaskKanbanController extends BaseController
         }
 
         $data = [
+            'showBreadcrumbs' => false,
             'title' => trans('texts.kanban'),
             'statuses' => $statuses,
             'tasks' => $tasks,
             'clients' => $clients,
             'projects' => $projects,
             'clientPublicId' => $clientPublicId,
+            'client' => $clientPublicId ? Client::scope($clientPublicId)->first() : null,
             'projectPublicId' => $projectPublicId,
+            'project' => $projectPublicId ? Project::scope($projectPublicId)->first() : null,
         ];
 
         return view('tasks.kanban', $data);
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 7b9fac89578e..7b694a42b419 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -81,6 +81,11 @@ class Project extends EntityModel
             $query->whereBetween('due_date', [$startDate, $endDate]);
         });
     }
+
+    public function getDisplayName()
+    {
+        return $this->name;
+    }
 }
 
 Project::creating(function ($project) {
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index 52b7755544bd..2cf877879165 100644
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -59,7 +59,9 @@
 	<div class="row">
         <div class="col-md-3">
 			<h3>{{ trans('texts.details') }}</h3>
-            {{ trans('texts.client') }}: {!! $project->client->present()->link !!}<br/>
+            <h4>
+                {!! $project->client->present()->link !!}<br/>
+            </h4>
             @if ($project->due_date)
                 {{ trans('texts.due_date') . ': ' . Utils::fromSqlDate($project->due_date) }}<br/>
             @endif
diff --git a/resources/views/tasks/kanban.blade.php b/resources/views/tasks/kanban.blade.php
index 7d65326824da..2b05ed8be923 100644
--- a/resources/views/tasks/kanban.blade.php
+++ b/resources/views/tasks/kanban.blade.php
@@ -134,6 +134,7 @@
 
 @section('content')
 
+
     <script type="text/javascript">
 
         var statuses = {!! $statuses !!};
@@ -678,6 +679,21 @@
 
     </script>
 
+    <ol class="breadcrumb">
+        @if ($project)
+            <li>{!! link_to('/projects', trans('texts.projects')) !!}</li>
+            <li>{!! $project->present()->link !!}</li>
+        @elseif ($client)
+            <li>{!! link_to('/tasks', trans('texts.tasks')) !!}</li>
+            <li>{!! $client->present()->link !!}</li>
+        @else
+            <li>{!! link_to('/tasks', trans('texts.tasks')) !!}</li>
+
+        @endif
+        <li class="active">{{ trans('texts.kanban') }}</li>
+    </ol>
+
+
     <div class="kanban" style="display: none">
         <div data-bind="sortable: { data: statuses, as: 'status', afterMove: onStatusDragged, allowDrop: true, connectClass: 'connect-column' }" style="float:left">
             <div class="well kanban-column">