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

Rename controllers

This commit is contained in:
Frederic Guillot 2016-05-28 13:41:54 -04:00
parent ab48a09f0d
commit 1353929a7d
134 changed files with 496 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/BaseApi.php
View File

@ -98,8 +98,8 @@ abstract class BaseApi extends Base
if (! empty($project)) {
$project['url'] = array(
'board' => $this->helper->url->to('board', 'show', array('project_id' => $project['id']), '', true),
'calendar' => $this->helper->url->to('calendar', 'show', array('project_id' => $project['id']), '', true),
'list' => $this->helper->url->to('listing', 'show', array('project_id' => $project['id']), '', true),
'calendar' => $this->helper->url->to('CalendarController', 'show', array('project_id' => $project['id']), '', true),
'list' => $this->helper->url->to('TaskListController', 'show', array('project_id' => $project['id']), '', true),
);
}

8
app/Controller/Action.php → app/Controller/ActionController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Automatic Actions
* Automatic Actions Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Action extends BaseController
class ActionController extends BaseController
{
/**
* List of automatic actions for a given project
@ -72,6 +72,6 @@ class Action extends BaseController
$this->flash->failure(t('Unable to remove this action.'));
}
$this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
}
}

8
app/Controller/ActionCreation.php → app/Controller/ActionCreationController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Action Creation
* Action Creation Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class ActionCreation extends BaseController
class ActionCreationController extends BaseController
{
/**
* Show the form (step 1)
@ -117,6 +117,6 @@ class ActionCreation extends BaseController
}
}
$this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
}
}

6
app/Controller/Activity.php → app/Controller/ActivityController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Activity stream
* Activity Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Activity extends BaseController
class ActivityController extends BaseController
{
/**
* Activity page for a project

8
app/Controller/Analytic.php → app/Controller/AnalyticController.php
View File

@ -6,12 +6,12 @@ use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Model\Task as TaskModel;
/**
* Project Analytic controller
* Project Analytic Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Analytic extends BaseController
class AnalyticController extends BaseController
{
/**
* Show average Lead and Cycle time
@ -47,7 +47,7 @@ class Analytic extends BaseController
$project = $this->getProject();
$paginator = $this->paginator
->setUrl('analytic', 'compareHours', array('project_id' => $project['id']))
->setUrl('AnalyticController', 'compareHours', array('project_id' => $project['id']))
->setMax(30)
->setOrder(TaskModel::TABLE.'.id')
->setQuery($this->taskQuery

1
app/Controller/AppController.php
View File

@ -8,6 +8,7 @@ use Kanboard\Core\Base;
* Class AppController
*
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class AppController extends Base
{

10
app/Controller/Auth.php → app/Controller/AuthController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Authentication controller
* Authentication Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Auth extends BaseController
class AuthController extends BaseController
{
/**
* Display the form login
@ -59,9 +59,9 @@ class Auth extends BaseController
{
if (! DISABLE_LOGOUT) {
$this->sessionManager->close();
$this->response->redirect($this->helper->url->to('auth', 'login'));
$this->response->redirect($this->helper->url->to('AuthController', 'login'));
} else {
$this->response->redirect($this->helper->url->to('auth', 'index'));
$this->response->redirect($this->helper->url->to('AuthController', 'index'));
}
}

6
app/Controller/BoardPopover.php → app/Controller/BoardPopoverController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Board Popover
* Board Popover Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class BoardPopover extends BaseController
class BoardPopoverController extends BaseController
{
/**
* Confirmation before to close all column tasks

4
app/Controller/BoardTooltip.php → app/Controller/BoardTooltipController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Board Tooltip
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class BoardTooltip extends BaseController
class BoardTooltipController extends BaseController
{
/**
* Get links on mouseover

6
app/Controller/Calendar.php → app/Controller/CalendarController.php
View File

@ -8,13 +8,13 @@ use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Model\Task as TaskModel;
/**
* Project Calendar controller
* Calendar Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
* @author Timo Litzbarski
*/
class Calendar extends BaseController
class CalendarController extends BaseController
{
/**
* Show calendar view for projects

12
app/Controller/Category.php → app/Controller/CategoryController.php
View File

@ -5,12 +5,12 @@ namespace Kanboard\Controller;
use Kanboard\Core\Controller\PageNotFoundException;
/**
* Category management
* Category Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Category extends BaseController
class CategoryController extends BaseController
{
/**
* Get the category (common method between actions)
@ -66,7 +66,7 @@ class Category extends BaseController
if ($valid) {
if ($this->category->create($values)) {
$this->flash->success(t('Your category have been created successfully.'));
return $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
} else {
$this->flash->failure(t('Unable to create your category.'));
}
@ -111,7 +111,7 @@ class Category extends BaseController
if ($valid) {
if ($this->category->update($values)) {
$this->flash->success(t('Your category have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
} else {
$this->flash->failure(t('Unable to update your category.'));
}
@ -154,6 +154,6 @@ class Category extends BaseController
$this->flash->failure(t('Unable to remove this category.'));
}
$this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
}
}

12
app/Controller/Column.php → app/Controller/ColumnController.php
View File

@ -5,12 +5,12 @@ namespace Kanboard\Controller;
use Kanboard\Core\Controller\AccessForbiddenException;
/**
* Column controller
* Column Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Column extends BaseController
class ColumnController extends BaseController
{
/**
* Display columns list
@ -68,7 +68,7 @@ class Column extends BaseController
if ($valid) {
if ($this->column->create($project['id'], $values['title'], $values['task_limit'], $values['description'])) {
$this->flash->success(t('Column created successfully.'));
return $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])), true);
return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])), true);
} else {
$errors['title'] = array(t('Another column with the same name exists in the project'));
}
@ -113,7 +113,7 @@ class Column extends BaseController
if ($valid) {
if ($this->column->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) {
$this->flash->success(t('Board updated successfully.'));
return $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
} else {
$this->flash->failure(t('Unable to update this board.'));
}
@ -173,6 +173,6 @@ class Column extends BaseController
$this->flash->failure(t('Unable to remove this column.'));
}
$this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
}
}

6
app/Controller/Comment.php → app/Controller/CommentController.php
View File

@ -6,12 +6,12 @@ use Kanboard\Core\Controller\AccessForbiddenException;
use Kanboard\Core\Controller\PageNotFoundException;
/**
* Comment controller
* Comment Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Comment extends BaseController
class CommentController extends BaseController
{
/**
* Get the current comment

13
app/Controller/Customfilter.php → app/Controller/CustomFilterController.php
View File

@ -6,12 +6,13 @@ use Kanboard\Core\Controller\AccessForbiddenException;
use Kanboard\Core\Security\Role;
/**
* Custom Filter management
* Custom Filter Controller
*
* @package controller
* @package Kanboard\Controller
* @author Timo Litzbarski
* @author Frederic Guillot
*/
class Customfilter extends BaseController
class CustomFilterController extends BaseController
{
/**
* Display list of filters
@ -48,7 +49,7 @@ class Customfilter extends BaseController
if ($valid) {
if ($this->customFilter->create($values)) {
$this->flash->success(t('Your custom filter have been created successfully.'));
return $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
} else {
$this->flash->failure(t('Unable to create your custom filter.'));
}
@ -93,7 +94,7 @@ class Customfilter extends BaseController
$this->flash->failure(t('Unable to remove this custom filter.'));
}
$this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
}
/**
@ -144,7 +145,7 @@ class Customfilter extends BaseController
if ($valid) {
if ($this->customFilter->update($values)) {
$this->flash->success(t('Your custom filter have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
} else {
$this->flash->failure(t('Unable to update custom filter.'));
}

8
app/Controller/Export.php → app/Controller/ExportController.php
View File

@ -3,12 +3,12 @@
namespace Kanboard\Controller;
/**
* Export controller
* Export Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Export extends BaseController
class ExportController extends BaseController
{
/**
* Common export method
@ -35,7 +35,7 @@ class Export extends BaseController
$this->response->html($this->helper->layout->project('export/'.$action, array(
'values' => array(
'controller' => 'export',
'controller' => 'ExportController',
'action' => $action,
'project_id' => $project['id'],
'from' => $from,

4
app/Controller/FileViewer.php → app/Controller/FileViewerController.php
View File

@ -7,10 +7,10 @@ use Kanboard\Core\ObjectStorage\ObjectStorageException;
/**
* File Viewer Controller
*
* @package controller
* @package Kanbaord\Controller
* @author Frederic Guillot
*/
class FileViewer extends BaseController
class FileViewerController extends BaseController
{
/**
* Get file content from object storage

12
app/Controller/Link.php → app/Controller/LinkController.php
View File

@ -5,13 +5,13 @@ namespace Kanboard\Controller;
use Kanboard\Core\Controller\PageNotFoundException;
/**
* Link controller
* Link Controller
*
* @package controller
* @package Kanboard\Controller
* @author Olivier Maridat
* @author Frederic Guillot
*/
class Link extends BaseController
class LinkController extends BaseController
{
/**
* Get the current link
@ -61,7 +61,7 @@ class Link extends BaseController
if ($valid) {
if ($this->link->create($values['label'], $values['opposite_label']) !== false) {
$this->flash->success(t('Link added successfully.'));
return $this->response->redirect($this->helper->url->to('link', 'index'));
return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
} else {
$this->flash->failure(t('Unable to create your link.'));
}
@ -105,7 +105,7 @@ class Link extends BaseController
if ($valid) {
if ($this->link->update($values)) {
$this->flash->success(t('Link updated successfully.'));
return $this->response->redirect($this->helper->url->to('link', 'index'));
return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
} else {
$this->flash->failure(t('Unable to update your link.'));
}
@ -145,6 +145,6 @@ class Link extends BaseController
$this->flash->failure(t('Unable to remove this link.'));
}
$this->response->redirect($this->helper->url->to('link', 'index'));
$this->response->redirect($this->helper->url->to('LinkController', 'index'));
}
}

6
app/Controller/Oauth.php → app/Controller/OAuthController.php
View File

@ -5,12 +5,12 @@ namespace Kanboard\Controller;
use Kanboard\Core\Security\OAuthAuthenticationProviderInterface;
/**
* OAuth controller
* OAuth Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Oauth extends BaseController
class OAuthController extends BaseController
{
/**
* Redirect to the provider if no code received

10
app/Controller/PasswordReset.php → app/Controller/PasswordResetController.php
View File

@ -7,10 +7,10 @@ use Kanboard\Core\Controller\AccessForbiddenException;
/**
* Password Reset Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class PasswordReset extends BaseController
class PasswordResetController extends BaseController
{
/**
* Show the form to reset the password
@ -38,7 +38,7 @@ class PasswordReset extends BaseController
if ($valid) {
$this->sendEmail($values['username']);
$this->response->redirect($this->helper->url->to('auth', 'login'));
$this->response->redirect($this->helper->url->to('AuthController', 'login'));
} else {
$this->create($values, $errors);
}
@ -62,7 +62,7 @@ class PasswordReset extends BaseController
'no_layout' => true,
)));
} else {
$this->response->redirect($this->helper->url->to('auth', 'login'));
$this->response->redirect($this->helper->url->to('AuthController', 'login'));
}
}
@ -85,7 +85,7 @@ class PasswordReset extends BaseController
$this->passwordReset->disable($user_id);
}
return $this->response->redirect($this->helper->url->to('auth', 'login'));
return $this->response->redirect($this->helper->url->to('AuthController', 'login'));
}
return $this->change($values, $errors);

10
app/Controller/ActionProject.php → app/Controller/ProjectActionDuplicationController.php
View File

@ -5,18 +5,18 @@ namespace Kanboard\Controller;
/**
* Duplicate automatic action from another project
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class ActionProject extends BaseController
class ProjectActionDuplicationController extends BaseController
{
public function project()
public function show()
{
$project = $this->getProject();
$projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId());
unset($projects[$project['id']]);
$this->response->html($this->template->render('action_project/project', array(
$this->response->html($this->template->render('project_action_duplication/show', array(
'project' => $project,
'projects_list' => $projects,
)));
@ -33,6 +33,6 @@ class ActionProject extends BaseController
$this->flash->failure(t('Unable to duplicate actions.'));
}
$this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id'])));
}
}

4
app/Controller/ProjectCreation.php → app/Controller/ProjectCreationController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Project Creation Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class ProjectCreation extends BaseController
class ProjectCreationController extends BaseController
{
/**
* Display a form to create a new project

4
app/Controller/ProjectEditController.php
View File

@ -97,11 +97,11 @@ class ProjectEditController extends BaseController
{
if ($redirect === 'edit') {
if (isset($values['is_private'])) {
if (! $this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) {
if (! $this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) {
unset($values['is_private']);
}
} elseif ($project['is_private'] == 1 && ! isset($values['is_private'])) {
if ($this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) {
if ($this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) {
$values += array('is_private' => 0);
}
}

8
app/Controller/ProjectFile.php → app/Controller/ProjectFileController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Project File Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class ProjectFile extends BaseController
class ProjectFileController extends BaseController
{
/**
* File upload form
@ -38,7 +38,7 @@ class ProjectFile extends BaseController
$this->flash->failure(t('Unable to upload the file.'));
}
$this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id'])), true);
$this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])), true);
}
/**
@ -58,7 +58,7 @@ class ProjectFile extends BaseController
$this->flash->failure(t('Unable to remove this file.'));
}
$this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])));
}
/**

4
app/Controller/ProjectOverview.php → app/Controller/ProjectOverviewController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Project Overview Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class ProjectOverview extends BaseController
class ProjectOverviewController extends BaseController
{
/**
* Show project overview

14
app/Controller/Projectuser.php → app/Controller/ProjectUserOverviewController.php
View File

@ -9,10 +9,10 @@ use Kanboard\Core\Security\Role;
/**
* Project User overview
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Projectuser extends BaseController
class ProjectUserOverviewController extends BaseController
{
private function common()
{
@ -39,13 +39,13 @@ class Projectuser extends BaseController
}
$paginator = $this->paginator
->setUrl('projectuser', $action, array('user_id' => $user_id))
->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id))
->setMax(30)
->setOrder('projects.name')
->setQuery($query)
->calculate();
$this->response->html($this->helper->layout->projectUser('project_user/roles', array(
$this->response->html($this->helper->layout->projectUser('project_user_overview/roles', array(
'paginator' => $paginator,
'title' => $title,
'user_id' => $user_id,
@ -65,13 +65,13 @@ class Projectuser extends BaseController
}
$paginator = $this->paginator
->setUrl('projectuser', $action, array('user_id' => $user_id))
->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id))
->setMax(50)
->setOrder(TaskModel::TABLE.'.id')
->setQuery($query)
->calculate();
$this->response->html($this->helper->layout->projectUser('project_user/tasks', array(
$this->response->html($this->helper->layout->projectUser('project_user_overview/tasks', array(
'paginator' => $paginator,
'title' => $title,
'user_id' => $user_id,
@ -122,7 +122,7 @@ class Projectuser extends BaseController
{
$project = $this->getProject();
return $this->response->html($this->template->render('project_user/tooltip_users', array(
return $this->response->html($this->template->render('project_user_overview/tooltip_users', array(
'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']),
'roles' => $this->role->getProjectRoles(),
)));

22
app/Controller/Swimlane.php → app/Controller/SwimlaneController.php
View File

@ -7,12 +7,12 @@ use Kanboard\Core\Controller\PageNotFoundException;
use Kanboard\Model\Swimlane as SwimlaneModel;
/**
* Swimlanes
* Swimlanes Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Swimlane extends BaseController
class SwimlaneController extends BaseController
{
/**
* Get the swimlane (common method between actions)
@ -83,7 +83,7 @@ class Swimlane extends BaseController
if ($valid) {
if ($this->swimlane->create($values)) {
$this->flash->success(t('Your swimlane have been created successfully.'));
return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
} else {
$errors = array('name' => array(t('Another swimlane with the same name exists in the project')));
}
@ -127,7 +127,7 @@ class Swimlane extends BaseController
if ($valid) {
if ($this->swimlane->updateDefault($values)) {
$this->flash->success(t('The default swimlane have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])), true);
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])), true);
} else {
$this->flash->failure(t('Unable to update this swimlane.'));
}
@ -171,7 +171,7 @@ class Swimlane extends BaseController
if ($valid) {
if ($this->swimlane->update($values)) {
$this->flash->success(t('Swimlane updated successfully.'));
return $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
} else {
$errors = array('name' => array(t('Another swimlane with the same name exists in the project')));
}
@ -213,7 +213,7 @@ class Swimlane extends BaseController
$this->flash->failure(t('Unable to remove this swimlane.'));
}
$this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
}
/**
@ -233,7 +233,7 @@ class Swimlane extends BaseController
$this->flash->failure(t('Unable to update this swimlane.'));
}
$this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
}
/**
@ -252,7 +252,7 @@ class Swimlane extends BaseController
$this->flash->failure(t('Unable to update this swimlane.'));
}
$this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
}
/**
@ -272,7 +272,7 @@ class Swimlane extends BaseController
$this->flash->failure(t('Unable to update this swimlane.'));
}
$this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
}
/**
@ -291,7 +291,7 @@ class Swimlane extends BaseController
$this->flash->failure(t('Unable to update this swimlane.'));
}
$this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])));
$this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
}
/**

1
app/Controller/TaskBulkController.php
View File

@ -6,6 +6,7 @@ namespace Kanboard\Controller;
* Class TaskBulkController
*
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class TaskBulkController extends BaseController
{

6
app/Controller/Taskduplication.php → app/Controller/TaskDuplicationController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Task Duplication controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Taskduplication extends BaseController
class TaskDuplicationController extends BaseController
{
/**
* Duplicate a task
@ -28,7 +28,7 @@ class Taskduplication extends BaseController
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id)));
} else {
$this->flash->failure(t('Unable to create this task.'));
return $this->response->redirect($this->helper->url->to('taskduplication', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
}
}

4
app/Controller/TaskExternalLink.php → app/Controller/TaskExternalLinkController.php
View File

@ -8,10 +8,10 @@ use Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound;
/**
* Task External Link Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class TaskExternalLink extends BaseController
class TaskExternalLinkController extends BaseController
{
/**
* First creation form

4
app/Controller/TaskFile.php → app/Controller/TaskFileController.php
View File

@ -5,10 +5,10 @@ namespace Kanboard\Controller;
/**
* Task File Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class TaskFile extends BaseController
class TaskFileController extends BaseController
{
/**
* Screenshot

10
app/Controller/Listing.php → app/Controller/TaskListController.php
View File

@ -6,12 +6,12 @@ use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Model\Task as TaskModel;
/**
* List view controller
* Task List Controller
*
* @package controller
* @package Kanboard\Controller
* @author Frederic Guillot
*/
class Listing extends BaseController
class TaskListController extends BaseController
{
/**
* Show list view for projects
@ -24,7 +24,7 @@ class Listing extends BaseController
$search = $this->helper->projectHeader->getSearchQuery($project);
$paginator = $this->paginator
->setUrl('listing', 'show', array('project_id' => $project['id']))
->setUrl('TaskListController', 'show', array('project_id' => $project['id']))
->setMax(30)
->setOrder(TaskModel::TABLE.'.id')
->setDirection('DESC')
@ -35,7 +35,7 @@ class Listing extends BaseController
)
->calculate();
$this->response->html($this->helper->layout->app('listing/show', array(
$this->response->html($this->helper->layout->app('task_list/show', array(
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),

2
app/Helper/LayoutHelper.php
View File

@ -96,7 +96,7 @@ class LayoutHelper extends Base
public function projectUser($template, array $params)
{
$params['filter'] = array('user_id' => $params['user_id']);
return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params);
return $this->subLayout('project_user_overview/layout', 'project_user_overview/sidebar', $template, $params);
}
/**

2
app/Middleware/AuthenticationMiddleware.php
View File

@ -39,7 +39,7 @@ class AuthenticationMiddleware extends BaseMiddleware
$this->response->text('Not Authorized', 401);
} else {
$this->sessionStorage->redirectAfterLogin = $this->request->getUri();
$this->response->redirect($this->helper->url->to('auth', 'login'));
$this->response->redirect($this->helper->url->to('AuthController', 'login'));
}
}
}

2
app/Middleware/PostAuthenticationMiddleware.php
View File

@ -19,7 +19,7 @@ class PostAuthenticationMiddleware extends BaseMiddleware
{
$controller = strtolower($this->router->getController());
$action = strtolower($this->router->getAction());
$ignore = ($controller === 'twofactorcontroller' && in_array($action, array('code', 'check'))) || ($controller === 'auth' && $action === 'logout');
$ignore = ($controller === 'twofactorcontroller' && in_array($action, array('code', 'check'))) || ($controller === 'authcontroller' && $action === 'logout');
if ($ignore === false && $this->userSession->hasPostAuthentication() && ! $this->userSession->isPostAuthenticationValidated()) {
$this->nextMiddleware = null;

45
app/ServiceProvider/AuthenticationProvider.php
View File

@ -66,39 +66,39 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->setRoleHierarchy(Role::PROJECT_MANAGER, array(Role::PROJECT_MEMBER, Role::PROJECT_VIEWER));
$acl->setRoleHierarchy(Role::PROJECT_MEMBER, array(Role::PROJECT_VIEWER));
$acl->add('Action', '*', Role::PROJECT_MANAGER);
$acl->add('ActionProject', '*', Role::PROJECT_MANAGER);
$acl->add('ActionCreation', '*', Role::PROJECT_MANAGER);
$acl->add('Analytic', '*', Role::PROJECT_MANAGER);
$acl->add('ActionController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectActionDuplicationController', '*', Role::PROJECT_MANAGER);
$acl->add('ActionCreationController', '*', Role::PROJECT_MANAGER);
$acl->add('AnalyticController', '*', Role::PROJECT_MANAGER);
$acl->add('Board', 'save', Role::PROJECT_MEMBER);
$acl->add('BoardPopover', '*', Role::PROJECT_MEMBER);
$acl->add('BoardPopoverController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskPopoverController', '*', Role::PROJECT_MEMBER);
$acl->add('Calendar', 'save', Role::PROJECT_MEMBER);
$acl->add('Category', '*', Role::PROJECT_MANAGER);
$acl->add('Column', '*', Role::PROJECT_MANAGER);
$acl->add('Comment', '*', Role::PROJECT_MEMBER);
$acl->add('Customfilter', '*', Role::PROJECT_MEMBER);
$acl->add('Export', '*', Role::PROJECT_MANAGER);
$acl->add('TaskFile', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
$acl->add('CalendarController', 'save', Role::PROJECT_MEMBER);
$acl->add('CategoryController', '*', Role::PROJECT_MANAGER);
$acl->add('ColumnController', '*', Role::PROJECT_MANAGER);
$acl->add('CommentController', '*', Role::PROJECT_MEMBER);
$acl->add('CustomFilterController', '*', Role::PROJECT_MEMBER);
$acl->add('ExportController', '*', Role::PROJECT_MANAGER);
$acl->add('TaskFileController', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
$acl->add('Gantt', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectViewController', array('share', 'updateSharing', 'integrations', 'updateIntegrations', 'notifications', 'updateNotifications', 'duplicate', 'doDuplication'), Role::PROJECT_MANAGER);
$acl->add('ProjectPermissionController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectEditController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectFile', '*', Role::PROJECT_MEMBER);
$acl->add('Projectuser', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectFileController', '*', Role::PROJECT_MEMBER);
$acl->add('ProjectUserOverviewController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectStatusController', '*', Role::PROJECT_MANAGER);
$acl->add('SubtaskController', '*', Role::PROJECT_MEMBER);
$acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER);
$acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER);
$acl->add('Swimlane', '*', Role::PROJECT_MANAGER);
$acl->add('SwimlaneController', '*', Role::PROJECT_MANAGER);
$acl->add('TaskViewController', 'remove', Role::PROJECT_MEMBER);
$acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskBulkController', '*', Role::PROJECT_MEMBER);
$acl->add('Taskduplication', '*', Role::PROJECT_MEMBER);
$acl->add('TaskDuplicationController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskRecurrenceController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskImportController', '*', Role::PROJECT_MANAGER);
$acl->add('TaskInternalLinkController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskExternalLink', '*', Role::PROJECT_MEMBER);
$acl->add('TaskExternalLinkController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskModificationController', '*', Role::PROJECT_MEMBER);
$acl->add('TaskStatusController', '*', Role::PROJECT_MEMBER);
$acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER);
@ -120,10 +120,9 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->setRoleHierarchy(Role::APP_MANAGER, array(Role::APP_USER, Role::APP_PUBLIC));
$acl->setRoleHierarchy(Role::APP_USER, array(Role::APP_PUBLIC));
$acl->add('Auth', array('login', 'check'), Role::APP_PUBLIC);
$acl->add('AuthController', array('login', 'check'), Role::APP_PUBLIC);
$acl->add('CaptchaController', '*', Role::APP_PUBLIC);
$acl->add('PasswordReset', '*', Role::APP_PUBLIC);
$acl->add('Webhook', '*', Role::APP_PUBLIC);
$acl->add('PasswordResetController', '*', Role::APP_PUBLIC);
$acl->add('TaskViewController', 'readonly', Role::APP_PUBLIC);
$acl->add('Board', 'readonly', Role::APP_PUBLIC);
$acl->add('ICalendarController', '*', Role::APP_PUBLIC);
@ -137,9 +136,9 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->add('GroupListController', '*', Role::APP_ADMIN);
$acl->add('GroupCreationController', '*', Role::APP_ADMIN);
$acl->add('GroupModificationController', '*', Role::APP_ADMIN);
$acl->add('Link', '*', Role::APP_ADMIN);
$acl->add('ProjectCreation', 'create', Role::APP_MANAGER);
$acl->add('Projectuser', '*', Role::APP_MANAGER);
$acl->add('LinkController', '*', Role::APP_ADMIN);
$acl->add('ProjectCreationController', 'create', Role::APP_MANAGER);
$acl->add('ProjectUserOverviewController', '*', Role::APP_MANAGER);
$acl->add('TwoFactorController', 'disable', Role::APP_ADMIN);
$acl->add('UserImportController', '*', Role::APP_ADMIN);
$acl->add('UserCreationController', '*', Role::APP_ADMIN);

70
app/ServiceProvider/RouteProvider.php
View File

@ -45,24 +45,24 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('search/activity', 'SearchController', 'activity');
// ProjectCreation routes
$container['route']->addRoute('project/create', 'ProjectCreation', 'create');
$container['route']->addRoute('project/create/private', 'ProjectCreation', 'createPrivate');
$container['route']->addRoute('project/create', 'ProjectCreationController', 'create');
$container['route']->addRoute('project/create/private', 'ProjectCreationController', 'createPrivate');
// Project routes
$container['route']->addRoute('projects', 'ProjectListController', 'show');
$container['route']->addRoute('project/:project_id', 'ProjectViewController', 'show');
$container['route']->addRoute('p/:project_id', 'ProjectViewController', 'show');
$container['route']->addRoute('project/:project_id/customer-filters', 'customfilter', 'index');
$container['route']->addRoute('project/:project_id/customer-filters', 'CustomFilterController', 'index');
$container['route']->addRoute('project/:project_id/share', 'ProjectViewController', 'share');
$container['route']->addRoute('project/:project_id/notifications', 'ProjectViewController', 'notifications');
$container['route']->addRoute('project/:project_id/integrations', 'ProjectViewController', 'integrations');
$container['route']->addRoute('project/:project_id/duplicate', 'ProjectViewController', 'duplicate');
$container['route']->addRoute('project/:project_id/permissions', 'ProjectPermissionController', 'index');
$container['route']->addRoute('project/:project_id/import', 'TaskImportController', 'step1');
$container['route']->addRoute('project/:project_id/activity', 'activity', 'project');
$container['route']->addRoute('project/:project_id/activity', 'ActivityController', 'project');
// Project Overview
$container['route']->addRoute('project/:project_id/overview', 'ProjectOverview', 'show');
$container['route']->addRoute('project/:project_id/overview', 'ProjectOverviewController', 'show');
// ProjectEdit routes
$container['route']->addRoute('project/:project_id/edit', 'ProjectEditController', 'edit');
@ -71,48 +71,48 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('project/:project_id/edit/priority', 'ProjectEditController', 'priority');
// ProjectUser routes
$container['route']->addRoute('projects/managers/:user_id', 'projectuser', 'managers');
$container['route']->addRoute('projects/members/:user_id', 'projectuser', 'members');
$container['route']->addRoute('projects/tasks/:user_id/opens', 'projectuser', 'opens');
$container['route']->addRoute('projects/tasks/:user_id/closed', 'projectuser', 'closed');
$container['route']->addRoute('projects/managers', 'projectuser', 'managers');
$container['route']->addRoute('projects/managers/:user_id', 'ProjectUserOverviewController', 'managers');
$container['route']->addRoute('projects/members/:user_id', 'ProjectUserOverviewController', 'members');
$container['route']->addRoute('projects/tasks/:user_id/opens', 'ProjectUserOverviewController', 'opens');
$container['route']->addRoute('projects/tasks/:user_id/closed', 'ProjectUserOverviewController', 'closed');
$container['route']->addRoute('projects/managers', 'ProjectUserOverviewController', 'managers');
// Action routes
$container['route']->addRoute('project/:project_id/actions', 'action', 'index');
$container['route']->addRoute('project/:project_id/actions', 'ActionController', 'index');
// Column routes
$container['route']->addRoute('project/:project_id/columns', 'column', 'index');
$container['route']->addRoute('project/:project_id/columns', 'ColumnController', 'index');
// Swimlane routes
$container['route']->addRoute('project/:project_id/swimlanes', 'swimlane', 'index');
$container['route']->addRoute('project/:project_id/swimlanes', 'SwimlaneController', 'index');
// Category routes
$container['route']->addRoute('project/:project_id/categories', 'category', 'index');
$container['route']->addRoute('project/:project_id/categories', 'CategoryController', 'index');
// Task routes
$container['route']->addRoute('project/:project_id/task/:task_id', 'TaskViewController', 'show');
$container['route']->addRoute('t/:task_id', 'TaskViewController', 'show');
$container['route']->addRoute('public/task/:task_id/:token', 'TaskViewController', 'readonly');
$container['route']->addRoute('project/:project_id/task/:task_id/activity', 'activity', 'task');
$container['route']->addRoute('project/:project_id/task/:task_id/activity', 'ActivityController', 'task');
$container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'TaskViewController', 'transitions');
$container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'TaskViewController', 'analytics');
$container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'TaskViewController', 'timetracking');
// Exports
$container['route']->addRoute('export/tasks/:project_id', 'export', 'tasks');
$container['route']->addRoute('export/subtasks/:project_id', 'export', 'subtasks');
$container['route']->addRoute('export/transitions/:project_id', 'export', 'transitions');
$container['route']->addRoute('export/summary/:project_id', 'export', 'summary');
$container['route']->addRoute('export/tasks/:project_id', 'ExportController', 'tasks');
$container['route']->addRoute('export/subtasks/:project_id', 'ExportController', 'subtasks');
$container['route']->addRoute('export/transitions/:project_id', 'ExportController', 'transitions');
$container['route']->addRoute('export/summary/:project_id', 'ExportController', 'summary');
// Analytics routes
$container['route']->addRoute('analytics/tasks/:project_id', 'analytic', 'tasks');
$container['route']->addRoute('analytics/users/:project_id', 'analytic', 'users');
$container['route']->addRoute('analytics/cfd/:project_id', 'analytic', 'cfd');
$container['route']->addRoute('analytics/burndown/:project_id', 'analytic', 'burndown');
$container['route']->addRoute('analytics/average-time-column/:project_id', 'analytic', 'averageTimeByColumn');
$container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'analytic', 'leadAndCycleTime');
$container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'analytic', 'compareHours');
$container['route']->addRoute('analytics/tasks/:project_id', 'AnalyticController', 'tasks');
$container['route']->addRoute('analytics/users/:project_id', 'AnalyticController', 'users');
$container['route']->addRoute('analytics/cfd/:project_id', 'AnalyticController', 'cfd');
$container['route']->addRoute('analytics/burndown/:project_id', 'AnalyticController', 'burndown');
$container['route']->addRoute('analytics/average-time-column/:project_id', 'AnalyticController', 'averageTimeByColumn');
$container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'AnalyticController', 'leadAndCycleTime');
$container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'AnalyticController', 'compareHours');
// Board routes
$container['route']->addRoute('board/:project_id', 'board', 'show');
@ -120,12 +120,12 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('public/board/:token', 'board', 'readonly');
// Calendar routes
$container['route']->addRoute('calendar/:project_id', 'calendar', 'show');
$container['route']->addRoute('c/:project_id', 'calendar', 'show');
$container['route']->addRoute('calendar/:project_id', 'CalendarController', 'show');
$container['route']->addRoute('c/:project_id', 'CalendarController', 'show');
// Listing routes
$container['route']->addRoute('list/:project_id', 'listing', 'show');
$container['route']->addRoute('l/:project_id', 'listing', 'show');
$container['route']->addRoute('list/:project_id', 'TaskListController', 'show');
$container['route']->addRoute('l/:project_id', 'TaskListController', 'show');
// Gantt routes
$container['route']->addRoute('gantt/:project_id', 'gantt', 'project');
@ -170,7 +170,7 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('settings/integrations', 'ConfigController', 'integrations');
$container['route']->addRoute('settings/webhook', 'ConfigController', 'webhook');
$container['route']->addRoute('settings/api', 'ConfigController', 'api');
$container['route']->addRoute('settings/links', 'link', 'index');
$container['route']->addRoute('settings/links', 'LinkController', 'index');
$container['route']->addRoute('settings/currencies', 'CurrencyController', 'index');
// Plugins
@ -182,12 +182,12 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('documentation', 'DocumentationController', 'show');
// Auth routes
$container['route']->addRoute('login', 'auth', 'login');
$container['route']->addRoute('logout', 'auth', 'logout');
$container['route']->addRoute('login', 'AuthController', 'login');
$container['route']->addRoute('logout', 'AuthController', 'logout');
// PasswordReset
$container['route']->addRoute('forgot-password', 'PasswordReset', 'create');
$container['route']->addRoute('forgot-password/change/:token', 'PasswordReset', 'change');
$container['route']->addRoute('forgot-password', 'PasswordResetController', 'create');
$container['route']->addRoute('forgot-password/change/:token', 'PasswordResetController', 'change');
}
return $container;

8
app/Template/action/index.php
View File

@ -3,11 +3,11 @@
<ul>
<li>
<i class="fa fa-plus fa-fw"></i>
<?= $this->url->link(t('Add a new action'), 'ActionCreation', 'create', array('project_id' => $project['id']), false, 'popover') ?>
<?= $this->url->link(t('Add a new action'), 'ActionCreationController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-copy fa-fw"></i>
<?= $this->url->link(t('Import from another project'), 'ActionProject', 'project', array('project_id' => $project['id']), false, 'popover') ?>
<?= $this->url->link(t('Import from another project'), 'ProjectActionDuplicationController', 'show', array('project_id' => $project['id']), false, 'popover') ?>
</li>
</ul>
</div>
@ -63,9 +63,9 @@
</ul>
</td>
<td>
<?= $this->url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
<?= $this->url->link(t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?>
</td>
</tr>
<?php endforeach ?>
</table>
<?php endif ?>
<?php endif ?>

6
app/Template/action/remove.php
View File

@ -8,8 +8,8 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'ActionController', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</div>
</div>

6
app/Template/action_creation/create.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('Add an action') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'event', array('project_id' => $project['id'])) ?>">
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'event', array('project_id' => $project['id'])) ?>">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('project_id', $values) ?>
@ -11,6 +11,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ActionController', 'index', array(), false, 'close-popover') ?>
</div>
</form>
</form>

6
app/Template/action_creation/event.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Choose an event') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'params', array('project_id' => $project['id'])) ?>">
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'params', array('project_id' => $project['id'])) ?>">
<?= $this->form->csrf() ?>
@ -22,6 +22,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>
</form>

4
app/Template/action_creation/params.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Define action parameters') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreation', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
@ -50,6 +50,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>

2
app/Template/activity/project.php
View File

@ -1,5 +1,5 @@
<section id="main">
<?= $this->projectHeader->render($project, 'Analytic', $this->app->getRouterAction()) ?>
<?= $this->projectHeader->render($project, 'AnalyticController', $this->app->getRouterAction()) ?>
<?php if ($project['is_public']): ?>
<div class="menu-inline pull-right">

2
app/Template/analytic/burndown.php
View File

@ -12,7 +12,7 @@
<hr/>
<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>

2
app/Template/analytic/cfd.php
View File

@ -12,7 +12,7 @@
<hr/>
<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>

2
app/Template/analytic/layout.php
View File

@ -1,5 +1,5 @@
<section id="main">
<?= $this->projectHeader->render($project, 'Listing', 'show') ?>
<?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
<section class="sidebar-container">
<?= $this->render($sidebar_template, array('project' => $project)) ?>

2
app/Template/analytic/lead_cycle_time.php
View File

@ -16,7 +16,7 @@
<div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>

32
app/Template/analytic/sidebar.php
View File

@ -1,29 +1,29 @@
<div class="sidebar">
<h2><?= t('Reportings') ?></h2>
<ul>
<li <?= $this->app->checkMenuSelection('analytic', 'tasks') ?>>
<?= $this->url->link(t('Task distribution'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'tasks') ?>>
<?= $this->url->link(t('Task distribution'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'users') ?>>
<?= $this->url->link(t('User repartition'), 'analytic', 'users', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'users') ?>>
<?= $this->url->link(t('User repartition'), 'AnalyticController', 'users', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'cfd') ?>>
<?= $this->url->link(t('Cumulative flow diagram'), 'analytic', 'cfd', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>>
<?= $this->url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'burndown') ?>>
<?= $this->url->link(t('Burndown chart'), 'analytic', 'burndown', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>>
<?= $this->url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'averageTimeByColumn') ?>>
<?= $this->url->link(t('Average time into each column'), 'analytic', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>>
<?= $this->url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'leadAndCycleTime') ?>>
<?= $this->url->link(t('Lead and cycle time'), 'analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
<?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('analytic', 'compareHours') ?>>
<?= $this->url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'compareHours') ?>>
<?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
</li>
<?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
</ul>
</div>

4
app/Template/auth/index.php
View File

@ -7,7 +7,7 @@
<?php endif ?>
<?php if (! HIDE_LOGIN_FORM): ?>
<form method="post" action="<?= $this->url->href('auth', 'check') ?>">
<form method="post" action="<?= $this->url->href('AuthController', 'check') ?>">
<?= $this->form->csrf() ?>
@ -32,7 +32,7 @@
</div>
<?php if ($this->app->config('password_reset') == 1): ?>
<div class="reset-password">
<?= $this->url->link(t('Forgot password?'), 'PasswordReset', 'create') ?>
<?= $this->url->link(t('Forgot password?'), 'PasswordResetController', 'create') ?>
</div>
<?php endif ?>
</form>

2
app/Template/board/table_column.php
View File

@ -43,7 +43,7 @@
<?php if ($column['nb_tasks'] > 0): ?>
<li>
<i class="fa fa-close fa-fw"></i>
<?= $this->url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
<?= $this->url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
</li>
<?php endif ?>
<?php endif ?>

2
app/Template/board/table_swimlane.php
View File

@ -14,7 +14,7 @@
<span
title="<?= t('Description') ?>"
class="tooltip"
data-href="<?= $this->url->href('BoardTooltip', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
data-href="<?= $this->url->href('BoardTooltipController', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>">
<i class="fa fa-info-circle"></i>
</span>
<?php endif ?>

16
app/Template/board/task_footer.php
View File

@ -34,35 +34,35 @@
<?php endif ?>
<?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
<?php endif ?>
<?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_links'])): ?>
<span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
<span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
<?php endif ?>
<?php if (! empty($task['nb_external_links'])): ?>
<span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
<span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
<?php endif ?>
<?php if (! empty($task['nb_subtasks'])): ?>
<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
<?php endif ?>
<?php if (! empty($task['nb_files'])): ?>
<span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
<span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
<?php endif ?>
<?php if (! empty($task['nb_comments'])): ?>
<span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
<span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
<?php endif ?>
<?php if (! empty($task['description'])): ?>
<span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltip', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<i class="fa fa-file-text-o"></i>
</span>
<?php endif ?>

4
app/Template/board/tooltip_files.php
View File

@ -9,9 +9,9 @@
</tr>
<tr>
<td>
<i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
<i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
<?php if ($file['is_image'] == 1): ?>
&nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
&nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
<?php endif ?>
</td>
</tr>

4
app/Template/board_popover/close_all_tasks_column.php
View File

@ -2,7 +2,7 @@
<div class="page-header">
<h2><?= t('Do you really want to close all tasks of this column?') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('BoardPopover', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
<form method="post" action="<?= $this->url->href('BoardPopoverController', 'closeColumnTasks', array('project_id' => $project['id'])) ?>">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('column_id', $values) ?>
<?= $this->form->hidden('swimlane_id', $values) ?>
@ -15,4 +15,4 @@
<?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>
</section>
</section>

8
app/Template/calendar/show.php
View File

@ -1,9 +1,9 @@
<section id="main">
<?= $this->projectHeader->render($project, 'Calendar', 'show') ?>
<?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
<div id="calendar"
data-save-url="<?= $this->url->href('calendar', 'save', array('project_id' => $project['id'])) ?>"
data-check-url="<?= $this->url->href('calendar', 'project', array('project_id' => $project['id'])) ?>"
data-save-url="<?= $this->url->href('CalendarController', 'save', array('project_id' => $project['id'])) ?>"
data-check-url="<?= $this->url->href('CalendarController', 'project', array('project_id' => $project['id'])) ?>"
data-check-interval="<?= $check_interval ?>"
>
</div>
</section>
</section>

6
app/Template/category/edit.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('CategoryController', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
@ -18,6 +18,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>
</form>

8
app/Template/category/index.php
View File

@ -15,10 +15,10 @@
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<li>
<?= $this->url->link(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
<?= $this->url->link(t('Edit'), 'CategoryController', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
</li>
<li>
<?= $this->url->link(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
<?= $this->url->link(t('Remove'), 'CategoryController', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
</li>
</ul>
</div>
@ -31,7 +31,7 @@
<div class="page-header">
<h2><?= t('Add a new category') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('category', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form method="post" action="<?= $this->url->href('CategoryController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('project_id', $values) ?>
@ -42,4 +42,4 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
</div>
</form>
</form>

6
app/Template/category/remove.php
View File

@ -9,9 +9,9 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'CategoryController', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</div>
</section>
</section>

4
app/Template/column/create.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('Add a new column') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('Column', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
@ -21,4 +21,4 @@
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>
</form>

6
app/Template/column/edit.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Edit column "%s"', $column['title']) ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('column', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('ColumnController', 'update', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
@ -21,6 +21,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>
</form>

8
app/Template/column/index.php
View File

@ -3,7 +3,7 @@
<ul>
<li>
<i class="fa fa-plus fa-fw"></i>
<?= $this->url->link(t('Add a new column'), 'Column', 'create', array('project_id' => $project['id']), false, 'popover') ?>
<?= $this->url->link(t('Add a new column'), 'ColumnController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
</li>
</ul>
</div>
@ -13,7 +13,7 @@
<?php else: ?>
<table
class="columns-table table-stripped"
data-save-position-url="<?= $this->url->href('Column', 'move', array('project_id' => $project['id'])) ?>">
data-save-position-url="<?= $this->url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>">
<thead>
<tr>
<th class="column-70"><?= t('Column title') ?></th>
@ -41,10 +41,10 @@
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<li>
<?= $this->url->link(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
<?= $this->url->link(t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
</li>
<li>
<?= $this->url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
<?= $this->url->link(t('Remove'), 'ColumnController', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
</li>
</ul>
</div>

6
app/Template/column/remove.php
View File

@ -9,7 +9,7 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
<?= t('or') ?> <?= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('Yes'), 'ColumnController', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?>
<?= t('or') ?> <?= $this->url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</div>
</div>

2
app/Template/comment/create.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('Add a comment') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('task_id', $values) ?>
<?= $this->form->hidden('user_id', $values) ?>

2
app/Template/comment/edit.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Edit a comment') ?></h2>
</div>
<form class="popover-form" method="post" action="<?= $this->url->href('comment', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $values) ?>

2
app/Template/comment/remove.php
View File

@ -14,7 +14,7 @@
)) ?>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'CommentController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>

4
app/Template/comment/show.php
View File

@ -26,11 +26,11 @@
<?php if ($editable && ($this->user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
<li>
<i class="fa fa-remove fa-fw"></i>
<?= $this->url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
<?= $this->url->link(t('remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-edit fa-fw"></i>
<?= $this->url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
<?= $this->url->link(t('edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
</li>
<?php endif ?>
</ul>

2
app/Template/comments/create.php
View File

@ -1,4 +1,4 @@
<form method="post" action="<?= $this->url->href('comment', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('task_id', $values) ?>
<?= $this->form->hidden('user_id', $values) ?>

4
app/Template/comments/show.php
View File

@ -6,7 +6,7 @@
<?php if (!isset($is_public) || !$is_public): ?>
<div class="comment-sorting">
<i class="fa fa-sort"></i>
<?= $this->url->link(t('change sorting'), 'comment', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
<?= $this->url->link(t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</div>
<?php endif ?>
<?php foreach ($comments as $comment): ?>
@ -30,4 +30,4 @@
)) ?>
<?php endif ?>
</div>
</section>
</section>

4
app/Template/config/sidebar.php
View File

@ -16,8 +16,8 @@
<li <?= $this->app->checkMenuSelection('ConfigController', 'calendar') ?>>
<?= $this->url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?>
</li>
<li <?= $this->app->checkMenuSelection('link') ?>>
<?= $this->url->link(t('Link settings'), 'link', 'index') ?>
<li <?= $this->app->checkMenuSelection('LinkController') ?>>
<?= $this->url->link(t('Link settings'), 'LinkController', 'index') ?>
</li>
<li <?= $this->app->checkMenuSelection('CurrencyController', 'index') ?>>
<?= $this->url->link(t('Currency rates'), 'CurrencyController', 'index') ?>

2
app/Template/custom_filter/add.php
View File

@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('Add a new filter') ?></h2>
</div>
<form method="post" action="<?= $this->url->href('customfilter', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form method="post" action="<?= $this->url->href('CustomFilterController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('project_id', $values) ?>

4
app/Template/custom_filter/edit.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Edit custom filter') ?></h2>
</div>
<form class="form-popover" method="post" action="<?= $this->url->href('customfilter', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
<form class="form-popover" method="post" action="<?= $this->url->href('CustomFilterController', 'update', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
@ -27,6 +27,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</form>

6
app/Template/custom_filter/index.php
View File

@ -32,12 +32,12 @@
</td>
<td><?= $this->text->e($filter['owner_name'] ?: $filter['owner_username']) ?></td>
<td>
<?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('customfilter', 'edit', $project['id'])): ?>
<?php if ($filter['user_id'] == $this->user->getId() || $this->user->hasProjectAccess('CustomFilterController', 'edit', $project['id'])): ?>
<div class="dropdown">
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<li><?= $this->url->link(t('Remove'), 'customfilter', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
<li><?= $this->url->link(t('Edit'), 'customfilter', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
<li><?= $this->url->link(t('Remove'), 'CustomFilterController', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
<li><?= $this->url->link(t('Edit'), 'CustomFilterController', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?></li>
</ul>
</div>
<?php endif ?>

4
app/Template/custom_filter/remove.php
View File

@ -9,9 +9,9 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'customfilter', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'CustomFilterController', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</div>
</section>

4
app/Template/dashboard/calendar.php
View File

@ -1,5 +1,5 @@
<div id="calendar"
data-check-url="<?= $this->url->href('calendar', 'user', array('user_id' => $user['id'])) ?>"
data-save-url="<?= $this->url->href('calendar', 'save') ?>"
data-check-url="<?= $this->url->href('CalendarController', 'user', array('user_id' => $user['id'])) ?>"
data-save-url="<?= $this->url->href('CalendarController', 'save') ?>"
>
</div>

6
app/Template/dashboard/layout.php
View File

@ -1,16 +1,16 @@
<section id="main">
<div class="page-header">
<ul>
<?php if ($this->user->hasAccess('ProjectCreation', 'create')): ?>
<?php if ($this->user->hasAccess('ProjectCreationController', 'create')): ?>
<li>
<i class="fa fa-plus fa-fw"></i>
<?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?>
<?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?>
</li>
<?php endif ?>
<?php if ($this->app->config('disable_private_project', 0) == 0): ?>
<li>
<i class="fa fa-lock fa-fw"></i>
<?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
<?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
</li>
<?php endif ?>
<li>

4
app/Template/dashboard/projects.php
View File

@ -26,8 +26,8 @@
<?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?>
<?php endif ?>
<?= $this->url->link('<i class="fa fa-list"></i>', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
<?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
<?= $this->url->link('<i class="fa fa-list"></i>', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>&nbsp;
<?= $this->url->link('<i class="fa fa-calendar"></i>', 'CalendarController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>&nbsp;
<?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
<?php if (! empty($project['description'])): ?>

10
app/Template/export/sidebar.php
View File

@ -2,17 +2,17 @@
<h2><?= t('Exports') ?></h2>
<ul>
<li <?= $this->app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>>
<?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Tasks'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->getRouterAction() === 'subtasks' ? 'class="active"' : '' ?>>
<?= $this->url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Subtasks'), 'ExportController', 'subtasks', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->getRouterAction() === 'transitions' ? 'class="active"' : '' ?>>
<?= $this->url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Task transitions'), 'ExportController', 'transitions', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->getRouterAction() === 'summary' ? 'class="active"' : '' ?>>
<?= $this->url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?>
</li>
<?= $this->hook->render('template:export:sidebar') ?>
</ul>
</div>
</div>

4
app/Template/file_viewer/show.php
View File

@ -3,7 +3,7 @@
</div>
<div class="file-viewer">
<?php if ($file['is_image']): ?>
<img src="<?= $this->url->href('FileViewer', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
<img src="<?= $this->url->href('FileViewerController', 'image', $params) ?>" alt="<?= $this->text->e($file['name']) ?>">
<?php elseif ($type === 'markdown'): ?>
<article class="markdown">
<?= $this->text->markdown($content) ?>
@ -11,4 +11,4 @@
<?php elseif ($type === 'text'): ?>
<pre><?= $content ?></pre>
<?php endif ?>
</div>
</div>

4
app/Template/gantt/projects.php
View File

@ -4,8 +4,8 @@
<li>
<i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?>
</li>
<?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
<?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
<?php endif ?>
</ul>
</div>

10
app/Template/header.php
View File

@ -38,7 +38,7 @@
</span>
<?php endif ?>
<?php $has_project_creation_access = $this->user->hasAccess('ProjectCreation', 'create'); ?>
<?php $has_project_creation_access = $this->user->hasAccess('ProjectCreationController', 'create'); ?>
<?php $is_private_project_enabled = $this->app->config('disable_private_project', 0) == 0; ?>
<?php if ($has_project_creation_access || (!$has_project_creation_access && $is_private_project_enabled)): ?>
@ -46,11 +46,13 @@
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-plus fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<?php if ($has_project_creation_access): ?>
<li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?></li>
<li><i class="fa fa-plus fa-fw"></i>
<?= $this->url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?></li>
<?php endif ?>
<?php if ($is_private_project_enabled): ?>
<li>
<i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?>
<i class="fa fa-lock fa-fw"></i>
<?= $this->url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
</li>
<?php endif ?>
</ul>
@ -98,7 +100,7 @@
<?php if (! DISABLE_LOGOUT): ?>
<li>
<i class="fa fa-sign-out fa-fw"></i>
<?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
<?= $this->url->link(t('Logout'), 'AuthController', 'logout') ?>
</li>
<?php endif ?>
</ul>

2
app/Template/layout.php
View File

@ -45,7 +45,7 @@
<?= $this->hook->render('template:layout:head') ?>
</head>
<body data-status-url="<?= $this->url->href('UserAjaxController', 'status') ?>"
data-login-url="<?= $this->url->href('auth', 'login') ?>"
data-login-url="<?= $this->url->href('AuthController', 'login') ?>"
data-keyboard-shortcut-url="<?= $this->url->href('DocumentationController', 'shortcuts') ?>"
data-timezone="<?= $this->app->getTimezone() ?>"
data-js-lang="<?= $this->app->jsLang() ?>">

4
app/Template/link/create.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Add a new link') ?></h2>
</div>
<form action="<?= $this->url->href('link', 'save') ?>" method="post" autocomplete="off">
<form action="<?= $this->url->href('LinkController', 'save') ?>" method="post" autocomplete="off">
<?= $this->form->csrf() ?>
@ -15,4 +15,4 @@
<div class="form-actions">
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
</div>
</form>
</form>

4
app/Template/link/edit.php
View File

@ -2,7 +2,7 @@
<h2><?= t('Link modification') ?></h2>
</div>
<form action="<?= $this->url->href('link', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
<form action="<?= $this->url->href('LinkController', 'update', array('link_id' => $link['id'])) ?>" method="post" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $values) ?>
@ -18,4 +18,4 @@
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'link', 'index') ?>
</div>
</form>
</form>

6
app/Template/link/index.php
View File

@ -18,9 +18,9 @@
</td>
<td>
<ul>
<?= $this->url->link(t('Edit'), 'link', 'edit', array('link_id' => $link['id'])) ?>
<?= $this->url->link(t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?>
<?= t('or') ?>
<?= $this->url->link(t('Remove'), 'link', 'confirm', array('link_id' => $link['id'])) ?>
<?= $this->url->link(t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
</ul>
</td>
</tr>
@ -30,4 +30,4 @@
<?= t('There is no link.') ?>
<?php endif ?>
<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>

6
app/Template/link/remove.php
View File

@ -8,8 +8,8 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'link', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'LinkController', 'remove', array('link_id' => $link['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'link', 'index') ?>
<?= $this->url->link(t('cancel'), 'LinkController', 'index') ?>
</div>
</div>
</div>

4
app/Template/password_reset/change.php
View File

@ -1,6 +1,6 @@
<div class="form-login">
<h2><?= t('Password Reset') ?></h2>
<form method="post" action="<?= $this->url->href('PasswordReset', 'update', array('token' => $token)) ?>">
<form method="post" action="<?= $this->url->href('PasswordResetController', 'update', array('token' => $token)) ?>">
<?= $this->form->csrf() ?>
<?= $this->form->label(t('New password'), 'password') ?>
@ -13,4 +13,4 @@
<button type="submit" class="btn btn-blue"><?= t('Change Password') ?></button>
</div>
</form>
</div>
</div>

2
app/Template/password_reset/create.php
View File

@ -1,6 +1,6 @@
<div class="form-login">
<h2><?= t('Password Reset') ?></h2>
<form method="post" action="<?= $this->url->href('PasswordReset', 'save') ?>">
<form method="post" action="<?= $this->url->href('PasswordResetController', 'save') ?>">
<?= $this->form->csrf() ?>
<?= $this->form->label(t('Username'), 'username') ?>

4
app/Template/password_reset/email.php
View File

@ -1,6 +1,6 @@
<p><?= t('To reset your password click on this link:') ?></p>
<p><?= $this->url->to('PasswordReset', 'change', array('token' => $token), '', true) ?></p>
<p><?= $this->url->to('PasswordResetController', 'change', array('token' => $token), '', true) ?></p>
<hr>
Kanboard
Kanboard

10
app/Template/project/dropdown.php
View File

@ -7,11 +7,11 @@
</li>
<li>
<i class="fa fa-calendar fa-fw"></i>
<?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?>
</li>
<li>
<i class="fa fa-list fa-fw"></i>
<?= $this->url->link(t('Listing'), 'listing', 'show', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
</li>
<?php if ($this->user->hasProjectAccess('Gantt', 'project', $project['id'])): ?>
<li>
@ -22,13 +22,13 @@
<li>
<i class="fa fa-dashboard fa-fw"></i>&nbsp;
<?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
</li>
<?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
<li>
<i class="fa fa-line-chart fa-fw"></i>&nbsp;
<?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>

4
app/Template/project/layout.php
View File

@ -1,5 +1,5 @@
<section id="main">
<?= $this->projectHeader->render($project, 'Listing', 'show') ?>
<?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
<section class="sidebar-container">
<?= $this->render($sidebar_template, array('project' => $project)) ?>
@ -8,4 +8,4 @@
<?= $content_for_sublayout ?>
</div>
</section>
</section>
</section>

20
app/Template/project/sidebar.php
View File

@ -4,9 +4,9 @@
<li <?= $this->app->checkMenuSelection('ProjectViewController', 'show') ?>>
<?= $this->url->link(t('Summary'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
</li>
<?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
<li <?= $this->app->checkMenuSelection('customfilter') ?>>
<?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
<?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
<li <?= $this->app->checkMenuSelection('CustomFilterController') ?>>
<?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>
@ -23,22 +23,22 @@
<li <?= $this->app->checkMenuSelection('ProjectViewController', 'integrations') ?>>
<?= $this->url->link(t('Integrations'), 'ProjectViewController', 'integrations', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('column') ?>>
<?= $this->url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('ColumnController') ?>>
<?= $this->url->link(t('Columns'), 'ColumnController', 'index', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('swimlane') ?>>
<?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('SwimlaneController') ?>>
<?= $this->url->link(t('Swimlanes'), 'SwimlaneController', 'index', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('category') ?>>
<?= $this->url->link(t('Categories'), 'category', 'index', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Categories'), 'CategoryController', 'index', array('project_id' => $project['id'])) ?>
</li>
<?php if ($project['is_private'] == 0): ?>
<li <?= $this->app->checkMenuSelection('ProjectPermissionController') ?>>
<?= $this->url->link(t('Permissions'), 'ProjectPermissionController', 'index', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>
<li <?= $this->app->checkMenuSelection('action') ?>>
<?= $this->url->link(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?>
<li <?= $this->app->checkMenuSelection('ActionController') ?>>
<?= $this->url->link(t('Automatic actions'), 'ActionController', 'index', array('project_id' => $project['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('ProjectViewController', 'duplicate') ?>>
<?= $this->url->link(t('Duplicate'), 'ProjectViewController', 'duplicate', array('project_id' => $project['id'])) ?>

5
app/Template/action_project/project.php → app/Template/project_action_duplication/show.php
View File

@ -4,8 +4,7 @@
<?php if (empty($projects_list)): ?>
<p class="alert"><?= t('There is no available project.') ?></p>
<?php else: ?>
<form class="popover-form" method="post" action="<?= $this->url->href('ActionProject', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<form class="popover-form" method="post" action="<?= $this->url->href('ProjectActionDuplicationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->label(t('Create from another project'), 'src_project_id') ?>
@ -17,4 +16,4 @@
<?= $this->url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
</div>
</form>
<?php endif ?>
<?php endif ?>

2
app/Template/project_creation/create.php
View File

@ -2,7 +2,7 @@
<div class="page-header">
<h2><?= $title ?></h2>
</div>
<form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreation', 'save') ?>" autocomplete="off">
<form class="popover-form" id="project-creation-form" method="post" action="<?= $this->url->href('ProjectCreationController', 'save') ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('is_private', $values) ?>

2
app/Template/project_edit/general.php
View File

@ -24,7 +24,7 @@
<?= $this->form->select('owner_id', $owners, $values, $errors) ?>
</div>
<?php if ($this->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])): ?>
<hr>
<?= $this->form->checkbox('is_private', t('Private project'), 1, $project['is_private'] == 1) ?>
<p class="form-help"><?= t('Private projects do not have users and groups management.') ?></p>

6
app/Template/project_file/create.php
View File

@ -4,7 +4,7 @@
<div id="file-done" style="display:none">
<p class="alert alert-success">
<?= t('All files have been uploaded successfully.') ?>
<?= $this->url->link(t('View uploaded files'), 'ProjectOverview', 'show', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('View uploaded files'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'])) ?>
</p>
</div>
@ -18,7 +18,7 @@
<div
id="file-dropzone"
data-max-size="<?= $max_size ?>"
data-url="<?= $this->url->href('ProjectFile', 'save', array('project_id' => $project['id'])) ?>">
data-url="<?= $this->url->href('ProjectFileController', 'save', array('project_id' => $project['id'])) ?>">
<div id="file-dropzone-inner">
<?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
</div>
@ -29,5 +29,5 @@
<div class="form-actions">
<input type="submit" value="<?= t('Upload files') ?>" class="btn btn-blue" id="file-upload-button" disabled>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>

6
app/Template/project_file/remove.php
View File

@ -8,8 +8,8 @@
</p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'ProjectFile', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
<?= $this->url->link(t('Yes'), 'ProjectFileController', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
<?= $this->url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
</div>
</div>
</div>

14
app/Template/project_header/dropdown.php
View File

@ -39,13 +39,13 @@
<li>
<i class="fa fa-dashboard fa-fw"></i>
<?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
</li>
<?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
<li>
<i class="fa fa-filter fa-fw"></i>
<?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>
@ -58,17 +58,17 @@
<?= $this->hook->render('template:project:dropdown', array('project' => $project)) ?>
<?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
<li>
<i class="fa fa-line-chart fa-fw"></i>
<?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>
<?php if ($this->user->hasProjectAccess('export', 'tasks', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
<li>
<i class="fa fa-download fa-fw"></i>
<?= $this->url->link(t('Exports'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
</li>
<?php endif ?>

18
app/Template/project_header/views.php
View File

@ -1,24 +1,24 @@
<ul class="views">
<li <?= $this->app->getRouterController() === 'ProjectOverview' ? 'class="active"' : '' ?>>
<li <?= $this->app->checkMenuSelection('ProjectOverviewController') ?>>
<i class="fa fa-eye fa-fw"></i>
<?= $this->url->link(t('Overview'), 'ProjectOverview', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
<?= $this->url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
</li>
<li <?= $this->app->getRouterController() === 'Board' ? 'class="active"' : '' ?>>
<li <?= $this->app->checkMenuSelection('Board') ?>>
<i class="fa fa-th fa-fw"></i>
<?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
</li>
<li <?= $this->app->getRouterController() === 'Calendar' ? 'class="active"' : '' ?>>
<li <?= $this->app->checkMenuSelection('Calendar') ?>>
<i class="fa fa-calendar fa-fw"></i>
<?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
<?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
</li>
<li <?= $this->app->getRouterController() === 'Listing' ? 'class="active"' : '' ?>>
<li <?= $this->app->checkMenuSelection('TaskListController') ?>>
<i class="fa fa-list fa-fw"></i>
<?= $this->url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
<?= $this->url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
</li>
<?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
<li <?= $this->app->getRouterController() === 'Gantt' ? 'class="active"' : '' ?>>
<li <?= $this->app->checkMenuSelection('Gantt') ?>>
<i class="fa fa-sliders fa-fw"></i>
<?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
</li>
<?php endif ?>
</ul>
</ul>

10
app/Template/project_list/show.php
View File

@ -1,8 +1,8 @@
<section id="main">
<div class="page-header">
<ul>
<?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'projectuser', 'managers') ?></li>
<?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?></li>
<?php endif ?>
<?php if ($this->user->hasAccess('gantt', 'projects')): ?>
<li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?></li>
@ -20,7 +20,7 @@
<th class="column-8"><?= $paginator->order(t('Start date'), 'start_date') ?></th>
<th class="column-8"><?= $paginator->order(t('End date'), 'end_date') ?></th>
<th class="column-15"><?= $paginator->order(t('Owner'), 'owner_id') ?></th>
<?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
<?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
<th class="column-10"><?= t('Users') ?></th>
<?php endif ?>
<th><?= t('Columns') ?></th>
@ -64,10 +64,10 @@
<?= $this->text->e($project['owner_name'] ?: $project['owner_username']) ?>
<?php endif ?>
</td>
<?php if ($this->user->hasAccess('projectuser', 'managers')): ?>
<?php if ($this->user->hasAccess('ProjectUserOverviewController', 'managers')): ?>
<td>
<i class="fa fa-users fa-fw"></i>
<span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('Projectuser', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
<span class="tooltip" title="<?= t('Members') ?>" data-href="<?= $this->url->href('ProjectUserOverviewController', 'users', array('project_id' => $project['id'])) ?>"><?= t('Members') ?></span>
</td>
<?php endif ?>
<td class="dashboard-project-stats">

4
app/Template/project_overview/attachments.php
View File

@ -3,9 +3,9 @@
<h3><a href="#" class="fa accordion-toggle"></a> <?= t('Attachments') ?></h3>
</div>
<div class="accordion-content">
<?php if ($this->user->hasProjectAccess('ProjectFile', 'create', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('ProjectFileController', 'create', $project['id'])): ?>
<div class="buttons-header">
<?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFile', 'create', array('project_id' => $project['id']), 'popover') ?>
<?= $this->url->button('fa-plus', t('Upload a file'), 'ProjectFileController', 'create', array('project_id' => $project['id']), 'popover') ?>
</div>
<?php endif ?>

8
app/Template/project_overview/files.php
View File

@ -16,17 +16,17 @@
<?php if ($this->file->getPreviewType($file['name']) !== null): ?>
<li>
<i class="fa fa-eye fa-fw"></i>
<?= $this->url->link(t('View file'), 'FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
<?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
</li>
<?php endif ?>
<li>
<i class="fa fa-download fa-fw"></i>
<?= $this->url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
<?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
</li>
<?php if ($this->user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?>
<?php if ($this->user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
<li>
<i class="fa fa-trash fa-fw"></i>
<?= $this->url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
<?= $this->url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
</li>
<?php endif ?>
</ul>

Some files were not shown because too many files have changed in this diff Show More