AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve user interface

This commit is contained in:
Frédéric Guillot 2014-05-23 09:49:26 -04:00
parent a7167f63c5
commit 7b53d47d46
26 changed files with 595 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/App.php
View File

@ -2,7 +2,7 @@
namespace Controller;
use Model\Project;
use Model\Project as ProjectModel;
/**
* Application controller
@ -19,7 +19,7 @@ class App extends Base
*/
public function index()
{
if ($this->project->countByStatus(Project::ACTIVE)) {
if ($this->project->countByStatus(ProjectModel::ACTIVE)) {
$this->response->redirect('?controller=board');
}
else {

83
app/Controller/Base.php
View File

@ -11,6 +11,20 @@ use Model\LastLogin;
*
* @package controller
* @author Frederic Guillot
* @property \Model\Acl $acl
* @property \Model\Action $action
* @property \Model\Board $board
* @property \Model\Category $category
* @property \Model\Comment $comment
* @property \Model\Config $config
* @property \Model\File $file
* @property \Model\Google $google
* @property \Model\LastLogin $lastlogin
* @property \Model\Ldap $ldap
* @property \Model\Project $project
* @property \Model\RememberMe $rememberme
* @property \Model\Task $task
* @property \Model\User $user
*/
abstract class Base
{
@ -172,56 +186,6 @@ abstract class Base
$this->response->redirect('?controller=project&action=create');
}
/**
* Display the template show task (common between different actions)
*
* @access protected
* @param array $task Task data
* @param array $comment_form Comment form data
* @param array $description_form Description form data
* @param array $comment_edit_form Comment edit form data
*/
protected function showTask(array $task, array $comment_form = array(), array $description_form = array(), array $comment_edit_form = array())
{
if (empty($comment_form)) {
$comment_form = array(
'values' => array('task_id' => $task['id'], 'user_id' => $this->acl->getUserId()),
'errors' => array()
);
}
if (empty($description_form)) {
$description_form = array(
'values' => array('id' => $task['id']),
'errors' => array()
);
}
if (empty($comment_edit_form)) {
$comment_edit_form = array(
'values' => array('id' => 0),
'errors' => array()
);
}
else {
$hide_comment_form = true;
}
$this->response->html($this->taskLayout('task_show', array(
'hide_comment_form' => isset($hide_comment_form),
'comment_edit_form' => $comment_edit_form,
'comment_form' => $comment_form,
'description_form' => $description_form,
'comments' => $this->comment->getAll($task['id']),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'colors_list' => $this->task->getColors(),
'files' => $this->file->getAll($task['id']),
'menu' => 'tasks',
'title' => $task['title'],
)));
}
/**
* Common layout for task views
*
@ -236,4 +200,23 @@ abstract class Base
return $this->template->layout('task_layout', $params);
}
/**
* Common method to get a task for task views
*
* @access protected
* @return array
*/
protected function getTask()
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
if (! $task) {
$this->notfound();
}
$this->checkProjectPermissions($task['project_id']);
return $task;
}
}

12
app/Controller/Board.php
View File

@ -2,8 +2,8 @@
namespace Controller;
use Model\Project;
use Model\User;
use Model\Project as ProjectModel;
use Model\User as UserModel;
/**
* Board controller
@ -52,7 +52,7 @@ class Board extends Base
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'));
$project = $this->project->getById($task['project_id']);
$projects = $this->project->getListByStatus(Project::ACTIVE);
$projects = $this->project->getListByStatus(ProjectModel::ACTIVE);
if ($this->acl->isRegularUser()) {
$projects = $this->project->filterListByAccess($projects, $this->acl->getUserId());
@ -143,7 +143,7 @@ class Board extends Base
*/
public function index()
{
$projects = $this->project->getListByStatus(Project::ACTIVE);
$projects = $this->project->getListByStatus(ProjectModel::ACTIVE);
if ($this->acl->isRegularUser()) {
$projects = $this->project->filterListByAccess($projects, $this->acl->getUserId());
@ -177,10 +177,10 @@ class Board extends Base
public function show()
{
$project_id = $this->request->getIntegerParam('project_id');
$user_id = $this->request->getIntegerParam('user_id', User::EVERYBODY_ID);
$user_id = $this->request->getIntegerParam('user_id', UserModel::EVERYBODY_ID);
$this->checkProjectPermissions($project_id);
$projects = $this->project->getListByStatus(Project::ACTIVE);
$projects = $this->project->getListByStatus(ProjectModel::ACTIVE);
if ($this->acl->isRegularUser()) {
$projects = $this->project->filterListByAccess($projects, $this->acl->getUserId());

186
app/Controller/Comment.php
View File

@ -10,6 +10,27 @@ namespace Controller;
*/
class Comment extends Base
{
/**
* Get the current comment
*
* @access private
* @return array
*/
private function getComment()
{
$comment = $this->comment->getById($this->request->getIntegerParam('comment_id'));
if (! $comment) {
$this->notfound();
}
if (! $this->acl->isAdminUser() && $comment['user_id'] != $this->acl->getUserId()) {
$this->forbidden();
}
return $comment;
}
/**
* Forbidden page for comments
*
@ -23,6 +44,27 @@ class Comment extends Base
)));
}
/**
* Add comment form
*
* @access public
*/
public function create()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('comment_create', array(
'values' => array(
'user_id' => $this->acl->getUserId(),
'task_id' => $task['id'],
),
'errors' => array(),
'task' => $task,
'menu' => 'tasks',
'title' => t('Add a comment')
)));
}
/**
* Add a comment
*
@ -30,12 +72,9 @@ class Comment extends Base
*/
public function save()
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
$task = $this->getTask();
$values = $this->request->getValues();
if (! $task) $this->notfound();
$this->checkProjectPermissions($task['project_id']);
list($valid, $errors) = $this->comment->validateCreation($values);
if ($valid) {
@ -47,13 +86,16 @@ class Comment extends Base
$this->session->flashError(t('Unable to create your comment.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#comments');
}
$this->showTask(
$task,
array('values' => $values, 'errors' => $errors)
);
$this->response->html($this->taskLayout('comment_create', array(
'values' => $values,
'errors' => $errors,
'task' => $task,
'menu' => 'tasks',
'title' => t('Add a comment')
)));
}
/**
@ -63,26 +105,17 @@ class Comment extends Base
*/
public function edit()
{
$task_id = $this->request->getIntegerParam('task_id');
$comment_id = $this->request->getIntegerParam('comment_id');
$task = $this->getTask();
$comment = $this->getComment();
$task = $this->task->getById($task_id, true);
$comment = $this->comment->getById($comment_id);
if (! $task || ! $comment) $this->notfound();
$this->checkProjectPermissions($task['project_id']);
if ($this->acl->isAdminUser() || $comment['user_id'] == $this->acl->getUserId()) {
$this->showTask(
$task,
array(),
array(),
array('values' => array('id' => $comment['id']), 'errors' => array())
);
}
$this->forbidden();
$this->response->html($this->taskLayout('comment_edit', array(
'values' => $comment,
'errors' => array(),
'comment' => $comment,
'task' => $task,
'menu' => 'tasks',
'title' => t('Edit a comment')
)));
}
/**
@ -92,42 +125,32 @@ class Comment extends Base
*/
public function update()
{
$task_id = $this->request->getIntegerParam('task_id');
$comment_id = $this->request->getIntegerParam('comment_id');
$task = $this->task->getById($task_id, true);
$comment = $this->comment->getById($comment_id);
$task = $this->getTask();
$comment = $this->getComment();
$values = $this->request->getValues();
list($valid, $errors) = $this->comment->validateModification($values);
if (! $task || ! $comment) $this->notfound();
$this->checkProjectPermissions($task['project_id']);
if ($valid) {
if ($this->acl->isAdminUser() || $comment['user_id'] == $this->acl->getUserId()) {
list($valid, $errors) = $this->comment->validateModification($values);
if ($valid) {
if ($this->comment->update($values)) {
$this->session->flash(t('Comment updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your comment.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#comment-'.$comment_id);
if ($this->comment->update($values)) {
$this->session->flash(t('Comment updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your comment.'));
}
$this->showTask(
$task,
array(),
array(),
array('values' => $values, 'errors' => $errors)
);
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#comment-'.$comment['id']);
}
$this->forbidden();
$this->response->html($this->taskLayout('comment_edit', array(
'values' => $values,
'errors' => $errors,
'comment' => $comment,
'task' => $task,
'menu' => 'tasks',
'title' => t('Edit a comment')
)));
}
/**
@ -137,25 +160,15 @@ class Comment extends Base
*/
public function confirm()
{
$project_id = $this->request->getIntegerParam('project_id');
$comment_id = $this->request->getIntegerParam('comment_id');
$task = $this->getTask();
$comment = $this->getComment();
$this->checkProjectPermissions($project_id);
$comment = $this->comment->getById($comment_id);
if (! $comment) $this->notfound();
if ($this->acl->isAdminUser() || $comment['user_id'] == $this->acl->getUserId()) {
$this->response->html($this->template->layout('comment_remove', array(
'comment' => $comment,
'project_id' => $project_id,
'menu' => 'tasks',
'title' => t('Remove a comment')
)));
}
$this->forbidden();
$this->response->html($this->taskLayout('comment_remove', array(
'comment' => $comment,
'task' => $task,
'menu' => 'tasks',
'title' => t('Remove a comment')
)));
}
/**
@ -165,25 +178,16 @@ class Comment extends Base
*/
public function remove()
{
$project_id = $this->request->getIntegerParam('project_id');
$comment_id = $this->request->getIntegerParam('comment_id');
$task = $this->getTask();
$comment = $this->getComment();
$this->checkProjectPermissions($project_id);
$comment = $this->comment->getById($comment_id);
if (! $comment) $this->notfound();
if ($this->acl->isAdminUser() || $comment['user_id'] == $this->acl->getUserId()) {
if ($this->comment->remove($comment['id'])) {
$this->session->flash(t('Comment removed successfully.'));
} else {
$this->session->flashError(t('Unable to remove this comment.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$comment['task_id']);
if ($this->comment->remove($comment['id'])) {
$this->session->flash(t('Comment removed successfully.'));
}
else {
$this->session->flashError(t('Unable to remove this comment.'));
}
$this->forbidden();
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#comments');
}
}

136
app/Controller/File.php Normal file
View File

@ -0,0 +1,136 @@
<?php
namespace Controller;
use Model\File as FileModel;
/**
* File controller
*
* @package controller
* @author Frederic Guillot
*/
class File extends Base
{
/**
* File upload form
*
* @access public
*/
public function create()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('file_new', array(
'task' => $task,
'menu' => 'tasks',
'title' => t('Attach a document')
)));
}
/**
* File upload (save files)
*
* @access public
*/
public function save()
{
$task = $this->getTask();
$this->file->upload($task['project_id'], $task['id'], 'files');
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments');
}
/**
* File download
*
* @access public
*/
public function download()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$filename = FileModel::BASE_PATH.$file['path'];
if ($file['task_id'] == $task['id'] && file_exists($filename)) {
$this->response->forceDownload($file['name']);
$this->response->binary(file_get_contents($filename));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Open a file (show the content in a popover)
*
* @access public
*/
public function open()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
if ($file['task_id'] == $task['id']) {
$this->response->html($this->template->load('file_open', array(
'file' => $file
)));
}
}
/**
* Return the file content (work only for images)
*
* @access public
*/
public function image()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$filename = FileModel::BASE_PATH.$file['path'];
if ($file['task_id'] == $task['id'] && file_exists($filename)) {
$metadata = getimagesize($filename);
if (isset($metadata['mime'])) {
$this->response->contentType($metadata['mime']);
readfile($filename);
}
}
}
/**
* Remove a file
*
* @access public
*/
public function remove()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
if ($file['task_id'] == $task['id'] && $this->file->remove($file['id'])) {
$this->session->flash(t('File removed successfully.'));
} else {
$this->session->flashError(t('Unable to remove this file.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Confirmation dialog before removing a file
*
* @access public
*/
public function confirm()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$this->response->html($this->taskLayout('file_remove', array(
'task' => $task,
'file' => $file,
'menu' => 'tasks',
'title' => t('Remove a file')
)));
}
}

4
app/Controller/Project.php
View File

@ -2,7 +2,7 @@
namespace Controller;
use Model\Task;
use Model\Task as TaskModel;
/**
* Project controller
@ -96,7 +96,7 @@ class Project extends Base
$filters = array(
array('column' => 'project_id', 'operator' => 'eq', 'value' => $project_id),
array('column' => 'is_active', 'operator' => 'eq', 'value' => Task::STATUS_CLOSED),
array('column' => 'is_active', 'operator' => 'eq', 'value' => TaskModel::STATUS_CLOSED),
);
$tasks = $this->task->find($filters);

192
app/Controller/Task.php
View File

@ -2,8 +2,7 @@
namespace Controller;
use Model\Project;
use Model\File;
use Model\Project as ProjectModel;
/**
* Task controller
@ -13,19 +12,6 @@ use Model\File;
*/
class Task extends Base
{
private function getTask()
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
if (! $task) {
$this->notfound();
}
$this->checkProjectPermissions($task['project_id']);
return $task;
}
/**
* Webhook to create a task (useful for external software)
*
@ -71,41 +57,17 @@ class Task extends Base
*/
public function show()
{
$this->showTask($this->getTask());
}
$task = $this->getTask();
/**
* Add a description from the show task page
*
* @access public
*/
public function description()
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
$values = $this->request->getValues();
if (! $task) $this->notfound();
$this->checkProjectPermissions($task['project_id']);
list($valid, $errors) = $this->task->validateDescriptionCreation($values);
if ($valid) {
if ($this->task->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your task.'));
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
$this->showTask(
$task,
array(),
array('values' => $values, 'errors' => $errors)
);
$this->response->html($this->taskLayout('task_show', array(
'files' => $this->file->getAll($task['id']),
'comments' => $this->comment->getAll($task['id']),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'colors_list' => $this->task->getColors(),
'menu' => 'tasks',
'title' => $task['title'],
)));
}
/**
@ -127,7 +89,7 @@ class Task extends Base
'owner_id' => $this->request->getIntegerParam('owner_id'),
'another_task' => $this->request->getIntegerParam('another_task'),
),
'projects_list' => $this->project->getListByStatus(\Model\Project::ACTIVE),
'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
'columns_list' => $this->board->getColumnsList($project_id),
'users_list' => $this->project->getUsersList($project_id),
'colors_list' => $this->task->getColors(),
@ -171,7 +133,7 @@ class Task extends Base
$this->response->html($this->template->layout('task_new', array(
'errors' => $errors,
'values' => $values,
'projects_list' => $this->project->getListByStatus(Project::ACTIVE),
'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
'columns_list' => $this->board->getColumnsList($values['project_id']),
'users_list' => $this->project->getUsersList($values['project_id']),
'colors_list' => $this->task->getColors(),
@ -188,10 +150,7 @@ class Task extends Base
*/
public function edit()
{
$task = $this->task->getById($this->request->getIntegerParam('task_id'));
if (! $task) $this->notfound();
$this->checkProjectPermissions($task['project_id']);
$task = $this->getTask();
if (! empty($task['date_due'])) {
$task['date_due'] = date(t('m/d/Y'), $task['date_due']);
@ -203,8 +162,9 @@ class Task extends Base
$task['score'] = $task['score'] ?: '';
$this->response->html($this->template->layout('task_edit', array(
'errors' => array(),
'values' => $task,
'errors' => array(),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'users_list' => $this->project->getUsersList($task['project_id']),
'colors_list' => $this->task->getColors(),
@ -221,8 +181,8 @@ class Task extends Base
*/
public function update()
{
$task = $this->getTask();
$values = $this->request->getValues();
$this->checkProjectPermissions($values['project_id']);
list($valid, $errors) = $this->task->validateModification($values);
@ -238,8 +198,9 @@ class Task extends Base
}
$this->response->html($this->template->layout('task_edit', array(
'errors' => $errors,
'values' => $values,
'errors' => $errors,
'task' => $task,
'columns_list' => $this->board->getColumnsList($values['project_id']),
'users_list' => $this->project->getUsersList($values['project_id']),
'colors_list' => $this->task->getColors(),
@ -372,7 +333,7 @@ class Task extends Base
$this->response->html($this->template->layout('task_new', array(
'errors' => array(),
'values' => $task,
'projects_list' => $this->project->getListByStatus(Project::ACTIVE),
'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
'columns_list' => $this->board->getColumnsList($task['project_id']),
'users_list' => $this->project->getUsersList($task['project_id']),
'colors_list' => $this->task->getColors(),
@ -384,124 +345,53 @@ class Task extends Base
}
/**
* File upload form
* Edit description form
*
* @access public
*/
public function file()
public function editDescription()
{
$task = $this->getTask();
$this->response->html($this->taskLayout('task_upload', array(
$this->response->html($this->taskLayout('task_edit_description', array(
'values' => $task,
'errors' => array(),
'task' => $task,
'menu' => 'tasks',
'title' => t('Attach a document')
'title' => t('Edit the description')
)));
}
/**
* File upload (save files)
* Save and validation the description
*
* @access public
*/
public function upload()
public function saveDescription()
{
$task = $this->getTask();
$this->file->upload($task['project_id'], $task['id'], 'files');
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments');
}
$values = $this->request->getValues();
/**
* File download
*
* @access public
*/
public function download()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$filename = File::BASE_PATH.$file['path'];
list($valid, $errors) = $this->task->validateDescriptionCreation($values);
if ($file['task_id'] == $task['id'] && file_exists($filename)) {
$this->response->forceDownload($file['name']);
$this->response->binary(file_get_contents($filename));
}
if ($valid) {
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Open a file (show the content in a popover)
*
* @access public
*/
public function openFile()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
if ($file['task_id'] == $task['id']) {
$this->response->html($this->template->load('task_open_file', array(
'file' => $file
)));
}
}
/**
* Return the file content (work only for images)
*
* @access public
*/
public function image()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$filename = File::BASE_PATH.$file['path'];
if ($file['task_id'] == $task['id'] && file_exists($filename)) {
$metadata = getimagesize($filename);
if (isset($metadata['mime'])) {
$this->response->contentType($metadata['mime']);
readfile($filename);
if ($this->task->update($values)) {
$this->session->flash(t('Task updated successfully.'));
}
else {
$this->session->flashError(t('Unable to update your task.'));
}
}
}
/**
* Remove a file
*
* @access public
*/
public function removeFile()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
if ($file['task_id'] == $task['id'] && $this->file->remove($file['id'])) {
$this->session->flash(t('File removed successfully.'));
} else {
$this->session->flashError(t('Unable to remove this file.'));
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
$this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
}
/**
* Confirmation dialog before removing a file
*
* @access public
*/
public function confirmRemoveFile()
{
$task = $this->getTask();
$file = $this->file->getById($this->request->getIntegerParam('file_id'));
$this->response->html($this->taskLayout('task_remove_file', array(
$this->response->html($this->taskLayout('task_edit_description', array(
'values' => $values,
'errors' => $errors,
'task' => $task,
'file' => $file,
'menu' => 'tasks',
'title' => t('Remove a file')
'title' => t('Edit the description')
)));
}
}

5
app/Locales/es_ES/translations.php
View File

@ -338,4 +338,9 @@ return array(
// 'Do you really want to remove this file: "%s"?' => '',
// 'open' => '',
// 'Attachments' => '',
// 'Edit the task' => '',
// 'Edit the description' => '',
// 'Add a comment' => '',
// 'Edit a comment' => '',
// 'Summary' => '',
);

5
app/Locales/fr_FR/translations.php
View File

@ -338,4 +338,9 @@ return array(
'Do you really want to remove this file: "%s"?' => 'Voulez-vous vraiment supprimer ce fichier « %s » ?',
'open' => 'ouvrir',
'Attachments' => 'Pièces-jointes',
'Edit the task' => 'Modifier la tâche',
'Edit the description' => 'Modifier la description',
'Add a comment' => 'Ajouter un commentaire',
'Edit a comment' => 'Modifier un commentaire',
'Summary' => 'Résumé',
);

5
app/Locales/pl_PL/translations.php
View File

@ -343,4 +343,9 @@ return array(
// 'Do you really want to remove this file: "%s"?' => '',
// 'open' => '',
// 'Attachments' => '',
// 'Edit the task' => '',
// 'Edit the description' => '',
// 'Add a comment' => '',
// 'Edit a comment' => '',
// 'Summary' => '',
);

5
app/Locales/pt_BR/translations.php
View File

@ -339,4 +339,9 @@ return array(
// 'Do you really want to remove this file: "%s"?' => '',
// 'open' => '',
// 'Attachments' => '',
// 'Edit the task' => '',
// 'Edit the description' => '',
// 'Add a comment' => '',
// 'Edit a comment' => '',
// 'Summary' => '',
);

13
app/Model/Acl.php
View File

@ -32,9 +32,10 @@ class Acl extends Base
'app' => array('index'),
'board' => array('index', 'show', 'assign', 'assigntask', 'save', 'check'),
'project' => array('tasks', 'index', 'forbidden', 'search'),
'comment' => array('save', 'confirm', 'remove', 'update', 'edit'),
'user' => array('index', 'edit', 'update', 'forbidden', 'logout', 'index', 'unlinkgoogle'),
'config' => array('index', 'removeremembermetoken'),
'comment' => array('create', 'save', 'confirm', 'remove', 'update', 'edit', 'forbidden'),
'file' => array('create', 'save', 'download', 'confirm', 'remove', 'open', 'image'),
'task' => array(
'show',
'create',
@ -45,17 +46,11 @@ class Acl extends Base
'confirmclose',
'open',
'confirmopen',
'description',
'duplicate',
'remove',
'confirmremove',
'file',
'upload',
'download',
'openfile',
'image',
'removefile',
'confirmremovefile',
'editdescription',
'savedescription',
),
);

4
app/Model/Base.php
View File

@ -30,7 +30,7 @@ abstract class Base
* Database instance
*
* @access protected
* @var PicoDb
* @var \PicoDb\Database
*/
protected $db;
@ -38,7 +38,7 @@ abstract class Base
* Event dispatcher instance
*
* @access protected
* @var Core\Event
* @var \Core\Event
*/
protected $event;

17
app/Templates/comment_create.php Normal file
View File

@ -0,0 +1,17 @@
<div class="page-header">
<h2><?= t('Add a comment') ?></h2>
</div>
<form method="post" action="?controller=comment&amp;action=save&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
<?= Helper\form_hidden('task_id', $values) ?>
<?= Helper\form_hidden('user_id', $values) ?>
<?= Helper\form_textarea('comment', $values, $errors, array('required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>

15
app/Templates/comment_edit.php Normal file
View File

@ -0,0 +1,15 @@
<div class="page-header">
<h2><?= t('Edit a comment') ?></h2>
</div>
<form method="post" action="?controller=comment&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>" autocomplete="off">
<?= Helper\form_hidden('id', $values) ?>
<?= Helper\form_textarea('comment', $values, $errors, array('required', 'placeholder="'.t('Leave a comment').'"')) ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Update') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>

32
app/Templates/comment_remove.php
View File

@ -1,18 +1,16 @@
<section id="main">
<div class="page-header">
<h2><?= t('Remove a comment') ?></h2>
<div class="page-header">
<h2><?= t('Add a comment') ?></h2>
</div>
<div class="confirm">
<p class="alert alert-info">
<?= t('Do you really want to remove this comment?') ?>
</p>
<?= Helper\template('comment_show', array('comment' => $comment, 'task' => $task, 'preview' => true)) ?>
<div class="form-actions">
<a href="?controller=comment&amp;action=remove&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
<?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>#comment-<?= $comment['id'] ?>"><?= t('cancel') ?></a>
</div>
<div class="confirm">
<p class="alert alert-info">
<?= t('Do you really want to remove this comment?') ?>
</p>
<?= Helper\template('comment_show', array('comment' => $comment)) ?>
<div class="form-actions">
<a href="?controller=comment&amp;action=remove&amp;project_id=<?= $project_id ?>&amp;comment_id=<?= $comment['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
<?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $comment['task_id'] ?>#comment-<?= $comment['id'] ?>"><?= t('cancel') ?></a>
</div>
</div>
</section>
</div>

48
app/Templates/comment_show.php
View File

@ -1,36 +1,28 @@
<div class="<?= isset($display_edit_form) && $display_edit_form === true ? 'comment-edit' : 'comment' ?>" id="comment-<?= $comment['id'] ?>">
<div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>">
<p class="comment-title">
<span class="comment-username"><?= Helper\escape($comment['username']) ?></span> @ <span class="comment-date"><?= dt('%B %e, %G at %k:%M %p', $comment['date']) ?></span>
</p>
<?php if (isset($task)): ?>
<ul class="comment-actions">
<li><a href="#comment-<?= $comment['id'] ?>"><?= t('link') ?></a></li>
<?php if (Helper\is_admin() || Helper\is_current_user($comment['user_id'])): ?>
<li>
<a href="?controller=comment&amp;action=confirm&amp;project_id=<?= $task['project_id'] ?>&amp;comment_id=<?= $comment['id'] ?>"><?= t('remove') ?></a>
</li>
<li>
<a href="?controller=comment&amp;action=edit&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>#comment-<?= $comment['id'] ?>"><?= t('edit') ?></a>
</li>
<div class="comment-inner">
<?php if (! isset($preview)): ?>
<ul class="comment-actions">
<li><a href="#comment-<?= $comment['id'] ?>"><?= t('link') ?></a></li>
<?php if (Helper\is_admin() || Helper\is_current_user($comment['user_id'])): ?>
<li>
<a href="?controller=comment&amp;action=confirm&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>"><?= t('remove') ?></a>
</li>
<li>
<a href="?controller=comment&amp;action=edit&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>"><?= t('edit') ?></a>
</li>
<?php endif ?>
</ul>
<?php endif ?>
</ul>
<?php endif ?>
<?php if (isset($display_edit_form) && $display_edit_form === true): ?>
<form method="post" action="?controller=comment&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;comment_id=<?= $comment['id'] ?>" autocomplete="off">
<div class="markdown">
<?= Helper\parse($comment['comment']) ?>
</div>
<?= Helper\form_hidden('id', $values) ?>
<?= Helper\form_textarea('comment', $values, $errors, array('required', 'placeholder="'.t('Leave a comment').'"')) ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Update this comment') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>
<?php else: ?>
<div class="markdown">
<?= Helper\markdown($comment['comment']) ?>
</div>
<?php endif ?>
</div>

12
app/Templates/file_new.php Normal file
View File

@ -0,0 +1,12 @@
<div class="page-header">
<h2><?= t('Attach a document') ?></h2>
</div>
<form action="?controller=file&amp;action=save&amp;task_id=<?= $task['id'] ?>" method="post" enctype="multipart/form-data">
<input type="file" name="files[]" multiple />
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>

2
app/Templates/task_open_file.php → app/Templates/file_open.php
View File

@ -1,6 +1,6 @@
<div class="page-header">
<h2><?= Helper\escape($file['name']) ?></h2>
<div class="task-file-viewer">
<img src="?controller=task&amp;action=image&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $file['task_id'] ?>" alt="<?= Helper\escape($file['name']) ?>"/>
<img src="?controller=file&amp;action=image&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $file['task_id'] ?>" alt="<?= Helper\escape($file['name']) ?>"/>
</div>
</div>

2
app/Templates/task_remove_file.php → app/Templates/file_remove.php
View File

@ -8,7 +8,7 @@
</p>
<div class="form-actions">
<a href="?controller=task&amp;action=removeFile&amp;task_id=<?= $task['id'] ?>&amp;file_id=<?= $file['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
<a href="?controller=file&amp;action=remove&amp;task_id=<?= $task['id'] ?>&amp;file_id=<?= $file['id'] ?>" class="btn btn-red"><?= t('Yes') ?></a>
<?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</div>

7
app/Templates/task_edit.php
View File

@ -1,9 +1,12 @@
<section id="main">
<div class="page-header">
<h2><?= t('Edit a task') ?></h2>
<ul>
<li><a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
</ul>
</div>
<section>
<form method="post" action="?controller=task&amp;action=update" autocomplete="off">
<form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
<div class="form-column">
@ -44,7 +47,7 @@
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?> <a href="?controller=board&amp;action=show&amp;project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a>
<?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>
</section>

16
app/Templates/task_edit_description.php Normal file
View File

@ -0,0 +1,16 @@
<div class="page-header">
<h2><?= t('Edit the description') ?></h2>
</div>
<form method="post" action="?controller=task&amp;action=saveDescription&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
<?= Helper\form_hidden('id', $values) ?>
<?= Helper\form_textarea('description', $values, $errors, array('required', 'placeholder="'.t('Leave a description').'"'), 'description-textarea') ?><br/>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
</div>
</form>

150
app/Templates/task_show.php
View File

@ -1,111 +1,99 @@
<article class="task task-<?= $task['color_id'] ?> task-show-details">
<div class="task-<?= $task['color_id'] ?> task-show-details">
<h2><?= Helper\escape($task['title']) ?></h2>
<?php if ($task['score']): ?>
<span class="task-score"><?= Helper\escape($task['score']) ?></span>
<?php endif ?>
<ul>
<li>
<?= dt('Created on %B %e, %G at %k:%M %p', $task['date_creation']) ?>
</li>
<?php if ($task['date_completed']): ?>
<li>
<?= dt('Completed on %B %e, %G at %k:%M %p', $task['date_completed']) ?>
</li>
<?php if ($task['score']): ?>
<span class="task-score"><?= Helper\escape($task['score']) ?></span>
<?php endif ?>
<?php if ($task['date_due']): ?>
<li>
<strong><?= dt('Must be done before %B %e, %G', $task['date_due']) ?></strong>
</li>
<?php endif ?>
<li>
<strong>
<?php if ($task['username']): ?>
<?= t('Assigned to %s', $task['username']) ?>
<?php else: ?>
<?= t('There is nobody assigned') ?>
<ul>
<li>
<?= dt('Created on %B %e, %G at %k:%M %p', $task['date_creation']) ?>
</li>
<?php if ($task['date_completed']): ?>
<li>
<?= dt('Completed on %B %e, %G at %k:%M %p', $task['date_completed']) ?>
</li>
<?php endif ?>
</strong>
</li>
<li>
<?= t('Column on the board:') ?>
<strong><?= Helper\escape($task['column_title']) ?></strong>
(<?= Helper\escape($task['project_name']) ?>)
</li>
<?php if ($task['category_name']): ?>
<li>
<?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
</li>
<?php endif ?>
<li>
<?php if ($task['is_active'] == 1): ?>
<?= t('Status is open') ?>
<?php else: ?>
<?= t('Status is closed') ?>
<?php if ($task['date_due']): ?>
<li>
<strong><?= dt('Must be done before %B %e, %G', $task['date_due']) ?></strong>
</li>
<?php endif ?>
</li>
</ul>
</article>
<li>
<strong>
<?php if ($task['username']): ?>
<?= t('Assigned to %s', $task['username']) ?>
<?php else: ?>
<?= t('There is nobody assigned') ?>
<?php endif ?>
</strong>
</li>
<li>
<?= t('Column on the board:') ?>
<strong><?= Helper\escape($task['column_title']) ?></strong>
(<?= Helper\escape($task['project_name']) ?>)
</li>
<?php if ($task['category_name']): ?>
<li>
<?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
</li>
<?php endif ?>
<li>
<?php if ($task['is_active'] == 1): ?>
<?= t('Status is open') ?>
<?php else: ?>
<?= t('Status is closed') ?>
<?php endif ?>
</li>
</ul>
</div>
<?php if (! empty($task['description'])): ?>
<div id="description" class="task-show-section">
<div class="page-header">
<h2><?= t('Description') ?></h2>
</div>
<h2><?= t('Description') ?></h2>
<?php if ($task['description']): ?>
<article class="markdown task-show-description">
<?= Helper\parse($task['description']) ?: t('There is no description.') ?>
</article>
<?php else: ?>
<form method="post" action="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
<?= Helper\form_hidden('id', $description_form['values']) ?>
<?= Helper\form_textarea('description', $description_form['values'], $description_form['errors'], array('required', 'placeholder="'.t('Leave a description').'"')) ?><br/>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>
</form>
</div>
<?php endif ?>
<?php if (! empty($files)): ?>
<h2 id="attachments"><?= t('Attachments') ?></h2>
<div id="attachments" class="task-show-section">
<div class="page-header">
<h2><?= t('Attachments') ?></h2>
</div>
<ul class="task-show-files">
<?php foreach ($files as $file): ?>
<li>
<a href="?controller=task&amp;action=download&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= Helper\escape($file['name']) ?></a>
<a href="?controller=file&amp;action=download&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= Helper\escape($file['name']) ?></a>
<span class="task-show-file-actions">
<?php if ($file['is_image']): ?>
<a href="?controller=task&amp;action=openFile&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>" class="popover"><?= t('open') ?></a>,
<a href="?controller=file&amp;action=open&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>" class="popover"><?= t('open') ?></a>,
<?php endif ?>
<a href="?controller=task&amp;action=confirmRemoveFile&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('remove') ?></a>
<a href="?controller=file&amp;action=confirm&amp;file_id=<?= $file['id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('remove') ?></a>
</span>
</li>
<?php endforeach ?>
</ul>
</div>
<?php endif ?>
<h2><?= t('Comments') ?></h2>
<?php if ($comments): ?>
<ul id="comments">
<?php if (! empty($comments)): ?>
<div id="comments" class="task-show-section">
<div class="page-header">
<h2><?= t('Comments') ?></h2>
</div>
<?php foreach ($comments as $comment): ?>
<?= Helper\template('comment_show', array(
'comment' => $comment,
'task' => $task,
'display_edit_form' => $comment['id'] == $comment_edit_form['values']['id'],
'values' => $comment_edit_form['values'] + array('comment' => $comment['comment']),
'errors' => $comment_edit_form['errors']
)) ?>
<?php endforeach ?>
</ul>
</div>
<?php endif ?>
<?php if (! isset($hide_comment_form) || $hide_comment_form === false): ?>
<form method="post" action="?controller=comment&amp;action=save&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
<?= Helper\form_hidden('task_id', $comment_form['values']) ?>
<?= Helper\form_hidden('user_id', $comment_form['values']) ?>
<?= Helper\form_textarea('comment', $comment_form['values'], $comment_form['errors'], array('required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
<div class="form-actions">
<input type="submit" value="<?= t('Post comment') ?>" class="btn btn-blue"/>
</div>
</form>
<?php endif ?>

8
app/Templates/task_sidebar.php
View File

@ -2,9 +2,11 @@
<h2><?= t('Actions') ?></h2>
<div class="task-show-actions">
<ul>
<li><a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('Description') ?></a></li>
<li><a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>"><?= t('Edit') ?></a></li>
<li><a href="?controller=task&amp;action=file&amp;task_id=<?= $task['id'] ?>"><?= t('Attach a document') ?></a></li>
<li><a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('Summary') ?></a></li>
<li><a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>"><?= t('Edit the task') ?></a></li>
<li><a href="?controller=task&amp;action=editDescription&amp;task_id=<?= $task['id'] ?>"><?= t('Edit the description') ?></a></li>
<li><a href="?controller=comment&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Add a comment') ?></a></li>
<li><a href="?controller=file&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Attach a document') ?></a></li>
<li><a href="?controller=task&amp;action=duplicate&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
<li>
<?php if ($task['is_active'] == 1): ?>

10
app/Templates/task_upload.php
View File

@ -1,10 +0,0 @@
<div class="page-header">
<h2><?= t('Attach a document') ?></h2>
</div>
<form action="?controller=task&amp;action=upload&amp;task_id=<?= $task['id'] ?>" method="post" enctype="multipart/form-data">
<input type="file" name="files[]" multiple />
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>
</form>

172
assets/css/app.css
View File

@ -673,6 +673,7 @@ div.task .task-score {
.task-show-details {
position: relative;
border-radius: 5px;
padding-bottom: 10px;
}
.task-show-details h2 {
@ -695,11 +696,9 @@ div.task .task-score {
bottom: 5px;
}
.task-show-description {
border: 1px solid #999;
border-radius: 5px;
background: #f0f0f0;
padding: 10px;
.task-show-section {
margin-top: 30px;
margin-bottom: 20px;
}
.task-show-files a {
@ -729,6 +728,12 @@ div.task .task-score {
color: #333;
}
.description-textarea {
width: 80%;
max-width: 800px;
height: 300px;
}
.task-file-viewer {
position: relative;
}
@ -739,6 +744,69 @@ div.task .task-score {
margin-top: 10px;
}
/* comments */
.comment {
margin-bottom: 20px;
}
.comment:hover {
background: #F7F8E0;
}
.comment-inner {
border-left: 4px solid #333;
padding-bottom: 10px;
padding-left: 20px;
margin-left: 20px;
margin-right: 10px;
}
.comment-preview {
border: 2px solid #000;
border-radius: 3px;
padding: 10px;
}
.comment-preview .comment-inner {
border: none;
padding: 0;
margin: 0;
}
.comment-title {
margin-bottom: 8px;
padding-bottom: 3px;
border-bottom: 1px dotted #aaa;
}
.comment-actions {
font-size: 0.8em;
padding: 0;
text-align: right;
}
.comment-actions li {
display: inline;
padding-left: 5px;
padding-right: 5px;
border-right: 1px dotted #000;
}
.comment-actions li:last-child {
padding-right: 0;
border: 0;
}
.comment-username {
font-weight: bold;
}
.comment-textarea {
height: 200px;
width: 80%;
max-width: 800px;
}
/* markdown content */
.markdown {
line-height: 1.4em;
@ -769,12 +837,12 @@ div.task .task-score {
}
.markdown pre {
background: #fff;
background: #fafafa;
padding: 10px;
border-radius: 5px;
border: 1px dashed #000;
border: 1px solid #ccc;
overflow: auto;
color: #000;
color: brown;
}
.markdown blockquote {
@ -783,92 +851,8 @@ div.task .task-score {
padding-left: 8px;
}
/* comments */
.comment {
margin-bottom: 25px;
padding: 0;
border: 1px solid #ddd;
border-radius: 5px;
}
.comment-edit {
margin-bottom: 25px;
padding: 0;
border: 2px solid #000;
border-radius: 5px;
}
.comment:hover {
border: 1px solid #888;
}
.comment-title {
font-size: 0.9em;
padding: 5px;
margin-bottom: 2px;
border-bottom: 1px solid #ddd;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background: #f0f0f0;
}
.comment:nth-child(odd) .comment-title {
background: #f0f0f0;
}
.comment:nth-child(even) .comment-title {
background: #ddd;
}
.comment-actions a,
.comment-title a {
color: #000;
text-decoration: none;
}
.comment-actions a:hover,
.comment-actions a:focus,
.comment-title a:hover,
.comment-title a:focus {
text-decoration: underline;
}
.comment-actions {
font-size: 0.8em;
padding: 0;
text-align: right;
}
.comment-actions li {
display: inline;
padding-left: 5px;
padding-right: 5px;
border-right: 1px dotted #000;
}
.comment-actions li:last-child {
border: 0;
}
.comment-username {
font-weight: bold;
}
.comment-textarea {
height: 70px;
width: 500px;
}
.comment .markdown {
margin: 10px;
}
.comment .markdown pre {
background: #fdfdfd;
}
.comment-edit form {
border: none;
.markdown p {
margin-bottom: 10px;
}
/* task colors */