diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index efc03f9b44..9b1a401ced 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2618,6 +2618,7 @@ $LANG = array( 'ready_to_do' => 'Ready to do', 'in_progress' => 'In progress', 'add_status' => 'Add status', + 'archive_status' => 'Archive Status', ); diff --git a/resources/views/tasks/kanban.blade.php b/resources/views/tasks/kanban.blade.php index e8601c41c3..10624b6466 100644 --- a/resources/views/tasks/kanban.blade.php +++ b/resources/views/tasks/kanban.blade.php @@ -7,9 +7,11 @@ .kanban { overflow-x: auto; white-space: nowrap; + min-height: 540px; } .kanban-column { + background-color: #EAEAEA; padding: 10px; height: 100%; width: 230px; @@ -204,7 +206,9 @@ } self.archiveStatus = function() { - window.model.statuses.remove(self); + sweetConfirm(function() { + window.model.statuses.remove(self); + }, "{{ trans('texts.archive_status')}}"); } self.cancelNewTask = function() { @@ -226,7 +230,6 @@ if (data) { ko.mapping.fromJS(data, {}, this); - self.tasks.push(new TaskModel({description:'testing'})); } else { self.name('{{ trans('texts.add_status') }}...'); self.is_blank(true); @@ -235,6 +238,7 @@ function TaskModel(data) { var self = this; + self.public_id = ko.observable(0); self.description = ko.observable(''); self.description.orig = ko.observable(''); self.is_blank = ko.observable(false); @@ -247,7 +251,6 @@ } var projectId = self.project().public_id(); var colorNum = (projectId-1) % 8; - console.log('project-group' + (colorNum+1)); return 'project-group' + (colorNum+1); }) @@ -275,10 +278,15 @@ self.endEdit(); } - self.saveEditTask = function(task) { + self.saveEditTask = function() { self.endEdit(); } + self.viewTask = function() { + //console.log(); + window.open('{{ url('/tasks') }}/' + self.public_id() + '/edit', '_blank'); + } + self.reset = function() { self.endEdit(); self.description(''); @@ -352,6 +360,9 @@ +