diff options
Diffstat (limited to 'app/Template')
177 files changed, 620 insertions, 611 deletions
diff --git a/app/Template/action/index.php b/app/Template/action/index.php index 63d63887..0a94e4f0 100644 --- a/app/Template/action/index.php +++ b/app/Template/action/index.php @@ -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 ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/action/remove.php b/app/Template/action/remove.php index 070a7918..384bec7a 100644 --- a/app/Template/action/remove.php +++ b/app/Template/action/remove.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/action_creation/create.php b/app/Template/action_creation/create.php index bccb19b3..c0d2880e 100644 --- a/app/Template/action_creation/create.php +++ b/app/Template/action_creation/create.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/action_creation/event.php b/app/Template/action_creation/event.php index e7e5aaf9..cdf00310 100644 --- a/app/Template/action_creation/event.php +++ b/app/Template/action_creation/event.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/action_creation/params.php b/app/Template/action_creation/params.php index 46ca52a4..fa892177 100644 --- a/app/Template/action_creation/params.php +++ b/app/Template/action_creation/params.php @@ -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> diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php index 176d9b99..ce1c8c0f 100644 --- a/app/Template/activity/project.php +++ b/app/Template/activity/project.php @@ -1,14 +1,14 @@ <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"> <ul> - <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar fa-fw"></i><?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar fa-fw"></i><?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> </ul> </div> <?php endif ?> <?= $this->render('event/events', array('events' => $events)) ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php index ed6c8aeb..e979595d 100644 --- a/app/Template/analytic/burndown.php +++ b/app/Template/analytic/burndown.php @@ -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() ?> diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php index ee259c70..8dfb5b00 100644 --- a/app/Template/analytic/cfd.php +++ b/app/Template/analytic/cfd.php @@ -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() ?> diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php index 8249e7ba..70d8d02b 100644 --- a/app/Template/analytic/compare_hours.php +++ b/app/Template/analytic/compare_hours.php @@ -34,13 +34,13 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td class="task-table color-<?= $task['color_id'] ?>"> - <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> - <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?> + <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?> <?= t('Open') ?> <?php else: ?> <?= t('Closed') ?> diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php index e9b9db61..e3c6099f 100644 --- a/app/Template/analytic/layout.php +++ b/app/Template/analytic/layout.php @@ -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)) ?> diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php index 82ffe534..2dccc136 100644 --- a/app/Template/analytic/lead_cycle_time.php +++ b/app/Template/analytic/lead_cycle_time.php @@ -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() ?> diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php index 76289b9f..de3dccf8 100644 --- a/app/Template/analytic/sidebar.php +++ b/app/Template/analytic/sidebar.php @@ -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> diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index cc562170..45bbdb8e 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -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() ?> @@ -19,7 +19,7 @@ <?php if (isset($captcha) && $captcha): ?> <?= $this->form->label(t('Enter the text below'), 'captcha') ?> - <img src="<?= $this->url->href('Captcha', 'image') ?>"/> + <img src="<?= $this->url->href('CaptchaController', 'image') ?>" alt="Captcha"> <?= $this->form->text('captcha', array(), $errors, array('required')) ?> <?php endif ?> @@ -32,11 +32,11 @@ </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> <?php endif ?> <?= $this->hook->render('template:auth:login-form:after') ?> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/avatar_file/show.php b/app/Template/avatar_file/show.php index 9f19a1ab..37c56cec 100644 --- a/app/Template/avatar_file/show.php +++ b/app/Template/avatar_file/show.php @@ -6,14 +6,14 @@ <div class="form-actions"> <?php if (! empty($user['avatar_path'])): ?> - <?= $this->url->link(t('Remove my image'), 'AvatarFile', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Remove my image'), 'AvatarFileController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> <?php endif ?> </div> <hr> <h3><?= t('Upload my avatar image') ?></h3> -<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('AvatarFile', 'upload', array('user_id' => $user['id'])) ?>"> +<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('AvatarFileController', 'upload', array('user_id' => $user['id'])) ?>"> <?= $this->form->csrf() ?> <?= $this->form->file('avatar') ?> diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index eced52dc..f7a9f6ad 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -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 ?> diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php index 82bbec93..a93e7001 100644 --- a/app/Template/board/table_container.php +++ b/app/Template/board/table_container.php @@ -10,9 +10,9 @@ class="board-project-<?= $project['id'] ?>" data-project-id="<?= $project['id'] ?>" data-check-interval="<?= $board_private_refresh_interval ?>" - data-save-url="<?= $this->url->href('board', 'save', array('project_id' => $project['id'])) ?>" - data-reload-url="<?= $this->url->href('board', 'reload', array('project_id' => $project['id'])) ?>" - data-check-url="<?= $this->url->href('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" + data-save-url="<?= $this->url->href('BoardAjaxController', 'save', array('project_id' => $project['id'])) ?>" + data-reload-url="<?= $this->url->href('BoardAjaxController', 'reload', array('project_id' => $project['id'])) ?>" + data-check-url="<?= $this->url->href('BoardAjaxController', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" data-task-creation-url="<?= $this->url->href('TaskCreationController', 'show', array('project_id' => $project['id'])) ?>" > <?php endif ?> diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php index 349b9acb..c5937e01 100644 --- a/app/Template/board/table_swimlane.php +++ b/app/Template/board/table_swimlane.php @@ -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 ?> diff --git a/app/Template/board/task_avatar.php b/app/Template/board/task_avatar.php index 53739b19..14b55476 100644 --- a/app/Template/board/task_avatar.php +++ b/app/Template/board/task_avatar.php @@ -1,9 +1,9 @@ <?php if (! empty($task['owner_id'])): ?> <div class="task-board-avatars"> <span - <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> class="task-board-assignee task-board-change-assignee" - data-url="<?= $this->url->href('TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> + data-url="<?= $this->url->href('TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> <?php else: ?> class="task-board-assignee"> <?php endif ?> diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index dbfe65b0..11df8962 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -6,7 +6,7 @@ <?php else: ?> <?= $this->url->link( $this->text->e($task['category_name']), - 'TaskPopover', + 'TaskPopoverController', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, @@ -33,36 +33,36 @@ </span> <?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> + <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?> + <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> + <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?> + <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> <?= 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> <?= 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> <?= $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> <?= $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> <?= $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> <?= $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 ?> diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 57623042..94b396a6 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -1,6 +1,6 @@ <div class=" task-board - <?= $task['is_active'] == 1 ? ($this->user->hasProjectAccess('board', 'save', $task['project_id']) ? 'draggable-item ' : '').'task-board-status-open '.($task['date_modification'] > (time() - $board_highlight_period) ? 'task-board-recent' : '') : 'task-board-status-closed' ?> + <?= $task['is_active'] == 1 ? ($this->user->hasProjectAccess('BoardViewController', 'save', $task['project_id']) ? 'draggable-item ' : '').'task-board-status-open '.($task['date_modification'] > (time() - $board_highlight_period) ? 'task-board-recent' : '') : 'task-board-status-closed' ?> color-<?= $task['color_id'] ?>" data-task-id="<?= $task['id'] ?>" data-column-id="<?= $task['column_id'] ?>" @@ -9,14 +9,14 @@ data-owner-id="<?= $task['owner_id'] ?>" data-category-id="<?= $task['category_id'] ?>" data-due-date="<?= $task['date_due'] ?>" - data-task-url="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> + data-task-url="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> <div class="task-board-sort-handle" style="display: none;"><i class="fa fa-arrows-alt"></i></div> <?php if ($this->board->isCollapsed($task['project_id'])): ?> <div class="task-board-collapsed"> <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse"></i></div> - <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> <?= $this->render('task/dropdown', array('task' => $task)) ?> <?php else: ?> <strong><?= '#'.$task['id'] ?></strong> @@ -27,12 +27,12 @@ <?= $this->text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?> </span> - <?php endif ?> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?> </div> <?php else: ?> <div class="task-board-expanded"> <div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div> - <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> <?= $this->render('task/dropdown', array('task' => $task)) ?> <?php else: ?> <strong><?= '#'.$task['id'] ?></strong> @@ -48,7 +48,7 @@ <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?> <div class="task-board-title"> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </div> <?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?> diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php index a53d42c8..82eb6535 100644 --- a/app/Template/board/task_public.php +++ b/app/Template/board/task_public.php @@ -1,6 +1,6 @@ <div class="task-board color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"> - <?= $this->url->link('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + <?= $this->url->link('#'.$task['id'], 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> <?php if ($task['reference']): ?> <span class="task-board-reference" title="<?= t('Reference') ?>"> @@ -12,7 +12,7 @@ <?= $this->hook->render('template:board:public:task:before-title', array('task' => $task)) ?> <div class="task-board-title"> - <?= $this->url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> </div> <?= $this->hook->render('template:board:public:task:after-title', array('task' => $task)) ?> @@ -21,4 +21,4 @@ 'not_editable' => $not_editable, 'project' => $project, )) ?> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php index 5ade5b5b..6f9e2640 100644 --- a/app/Template/board/tooltip_files.php +++ b/app/Template/board/tooltip_files.php @@ -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): ?> - <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') ?> + <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> diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php index 6424c39d..d1156cbe 100644 --- a/app/Template/board/tooltip_tasklinks.php +++ b/app/Template/board/tooltip_tasklinks.php @@ -12,7 +12,7 @@ <td class="column-60"> <?= $this->url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), + 'TaskViewController', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), false, $link['is_active'] ? '' : 'task-link-closed' ) ?> @@ -31,4 +31,4 @@ <?php endforeach ?> <?php endforeach ?> </table> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/board/view_private.php b/app/Template/board/view_private.php index 13702273..a89e7d2b 100644 --- a/app/Template/board/view_private.php +++ b/app/Template/board/view_private.php @@ -1,6 +1,6 @@ <section id="main"> - <?= $this->projectHeader->render($project, 'Board', 'show', true) ?> + <?= $this->projectHeader->render($project, 'BoardViewController', 'show', true) ?> <?= $this->render('board/table_container', array( 'project' => $project, diff --git a/app/Template/board_popover/close_all_tasks_column.php b/app/Template/board_popover/close_all_tasks_column.php index 5090f499..57f703e3 100644 --- a/app/Template/board_popover/close_all_tasks_column.php +++ b/app/Template/board_popover/close_all_tasks_column.php @@ -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) ?> @@ -12,7 +12,7 @@ <div class="form-actions"> <button type="submit" class="btn btn-red"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/calendar/show.php b/app/Template/calendar/show.php index f00e810b..3635f627 100644 --- a/app/Template/calendar/show.php +++ b/app/Template/calendar/show.php @@ -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>
\ No newline at end of file +</section> diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php index 7b592689..fac56db3 100644 --- a/app/Template/category/edit.php +++ b/app/Template/category/edit.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/category/index.php b/app/Template/category/index.php index b3bdfd81..a103d89f 100644 --- a/app/Template/category/index.php +++ b/app/Template/category/index.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/category/remove.php b/app/Template/category/remove.php index cad58d37..e7b9c9b4 100644 --- a/app/Template/category/remove.php +++ b/app/Template/category/remove.php @@ -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>
\ No newline at end of file +</section> diff --git a/app/Template/column/create.php b/app/Template/column/create.php index 2d325f76..023de525 100644 --- a/app/Template/column/create.php +++ b/app/Template/column/create.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php index 412858a9..a742e4b9 100644 --- a/app/Template/column/edit.php +++ b/app/Template/column/edit.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/column/index.php b/app/Template/column/index.php index 6bc67c5a..4f5f0a60 100644 --- a/app/Template/column/index.php +++ b/app/Template/column/index.php @@ -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> diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php index ccab889d..b231a9a7 100644 --- a/app/Template/column/remove.php +++ b/app/Template/column/remove.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php index fa7c0ca6..0358107a 100644 --- a/app/Template/comment/create.php +++ b/app/Template/comment/create.php @@ -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) ?> @@ -24,6 +24,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php index 4036b673..f69fc0c1 100644 --- a/app/Template/comment/edit.php +++ b/app/Template/comment/edit.php @@ -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) ?> @@ -22,6 +22,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/comment/remove.php b/app/Template/comment/remove.php index 3174df02..55587b67 100644 --- a/app/Template/comment/remove.php +++ b/app/Template/comment/remove.php @@ -14,8 +14,8 @@ )) ?> <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'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php index 2aca26b3..8419a14e 100644 --- a/app/Template/comment/show.php +++ b/app/Template/comment/show.php @@ -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> diff --git a/app/Template/comments/create.php b/app/Template/comments/create.php index 633f4392..3fa6ddc0 100644 --- a/app/Template/comments/create.php +++ b/app/Template/comments/create.php @@ -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) ?> diff --git a/app/Template/comments/show.php b/app/Template/comments/show.php index 76af5593..43f6b2c2 100644 --- a/app/Template/comments/show.php +++ b/app/Template/comments/show.php @@ -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>
\ No newline at end of file +</section> diff --git a/app/Template/config/about.php b/app/Template/config/about.php index 7c599ef7..8e2d1325 100644 --- a/app/Template/config/about.php +++ b/app/Template/config/about.php @@ -65,11 +65,11 @@ <strong><?= $this->text->bytes($db_size) ?></strong> </li> <li> - <?= $this->url->link(t('Download the database'), 'config', 'downloadDb', array(), true) ?> + <?= $this->url->link(t('Download the database'), 'ConfigController', 'downloadDb', array(), true) ?> <?= t('(Gzip compressed Sqlite file)') ?> </li> <li> - <?= $this->url->link(t('Optimize the database'), 'config', 'optimizeDb', array(), true) ?> + <?= $this->url->link(t('Optimize the database'), 'ConfigController', 'optimizeDb', array(), true) ?> <?= t('(VACUUM command)') ?> </li> </ul> diff --git a/app/Template/config/api.php b/app/Template/config/api.php index 3ebbb956..95f77355 100644 --- a/app/Template/config/api.php +++ b/app/Template/config/api.php @@ -12,7 +12,7 @@ <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->base().'jsonrpc.php' ?>"> </li> <li> - <?= $this->url->link(t('Reset token'), 'config', 'token', array('type' => 'api'), true) ?> + <?= $this->url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'api'), true) ?> </li> </ul> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/config/application.php b/app/Template/config/application.php index ee0e147b..0f842f6e 100644 --- a/app/Template/config/application.php +++ b/app/Template/config/application.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Application settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'application')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'application')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/board.php b/app/Template/config/board.php index 75cd40ef..62a736e7 100644 --- a/app/Template/config/board.php +++ b/app/Template/config/board.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Board settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'board')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'board')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php index 37084a8b..90e034e9 100644 --- a/app/Template/config/calendar.php +++ b/app/Template/config/calendar.php @@ -2,7 +2,7 @@ <h2><?= t('Calendar settings') ?></h2> </div> <section> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php index 2a29b358..3ba4e865 100644 --- a/app/Template/config/integrations.php +++ b/app/Template/config/integrations.php @@ -2,7 +2,7 @@ <h2><?= t('Integration with third-party services') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'integrations')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'integrations')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->hook->render('template:config:integrations', array('values' => $values)) ?> diff --git a/app/Template/config/project.php b/app/Template/config/project.php index b0112773..6d8d131a 100644 --- a/app/Template/config/project.php +++ b/app/Template/config/project.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Project settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'project')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'project')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php index a2a5a6cb..187ecd93 100644 --- a/app/Template/config/sidebar.php +++ b/app/Template/config/sidebar.php @@ -1,35 +1,35 @@ <div class="sidebar"> <h2><?= t('Actions') ?></h2> <ul> - <li <?= $this->app->checkMenuSelection('config', 'index') ?>> - <?= $this->url->link(t('About'), 'config', 'index') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'index') ?>> + <?= $this->url->link(t('About'), 'ConfigController', 'index') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'application') ?>> - <?= $this->url->link(t('Application settings'), 'config', 'application') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'application') ?>> + <?= $this->url->link(t('Application settings'), 'ConfigController', 'application') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'project') ?>> - <?= $this->url->link(t('Project settings'), 'config', 'project') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'project') ?>> + <?= $this->url->link(t('Project settings'), 'ConfigController', 'project') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'board') ?>> - <?= $this->url->link(t('Board settings'), 'config', 'board') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'board') ?>> + <?= $this->url->link(t('Board settings'), 'ConfigController', 'board') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'calendar') ?>> - <?= $this->url->link(t('Calendar settings'), 'config', 'calendar') ?> + <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('currency', 'index') ?>> - <?= $this->url->link(t('Currency rates'), 'currency', 'index') ?> + <li <?= $this->app->checkMenuSelection('CurrencyController', 'index') ?>> + <?= $this->url->link(t('Currency rates'), 'CurrencyController', 'index') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'integrations') ?>> - <?= $this->url->link(t('Integrations'), 'config', 'integrations') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'integrations') ?>> + <?= $this->url->link(t('Integrations'), 'ConfigController', 'integrations') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'webhook') ?>> - <?= $this->url->link(t('Webhooks'), 'config', 'webhook') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'webhook') ?>> + <?= $this->url->link(t('Webhooks'), 'ConfigController', 'webhook') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'api') ?>> - <?= $this->url->link(t('API'), 'config', 'api') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'api') ?>> + <?= $this->url->link(t('API'), 'ConfigController', 'api') ?> </li> <?= $this->hook->render('template:config:sidebar') ?> </ul> diff --git a/app/Template/config/webhook.php b/app/Template/config/webhook.php index 3bba907c..e3245873 100644 --- a/app/Template/config/webhook.php +++ b/app/Template/config/webhook.php @@ -2,7 +2,7 @@ <h2><?= t('Webhook settings') ?></h2> </div> <section> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'webhook')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'webhook')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> @@ -25,7 +25,7 @@ <strong><?= $this->text->e($values['webhook_token']) ?></strong> </li> <li> - <?= $this->url->link(t('Reset token'), 'config', 'token', array('type' => 'webhook'), true) ?> + <?= $this->url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'webhook'), true) ?> </li> </ul> </section> diff --git a/app/Template/currency/index.php b/app/Template/currency/index.php index d35ac459..9881cee5 100644 --- a/app/Template/currency/index.php +++ b/app/Template/currency/index.php @@ -24,7 +24,7 @@ <hr/> <h3><?= t('Change reference currency') ?></h3> <?php endif ?> -<form method="post" action="<?= $this->url->href('currency', 'reference') ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('CurrencyController', 'reference') ?>" autocomplete="off"> <?= $this->form->csrf() ?> @@ -38,7 +38,7 @@ <hr/> <h3><?= t('Add a new currency rate') ?></h3> -<form method="post" action="<?= $this->url->href('currency', 'create') ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('CurrencyController', 'create') ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/custom_filter/add.php b/app/Template/custom_filter/add.php index 56f7921c..3801cc30 100644 --- a/app/Template/custom_filter/add.php +++ b/app/Template/custom_filter/add.php @@ -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) ?> diff --git a/app/Template/custom_filter/edit.php b/app/Template/custom_filter/edit.php index 051a5062..26da8da2 100644 --- a/app/Template/custom_filter/edit.php +++ b/app/Template/custom_filter/edit.php @@ -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> diff --git a/app/Template/custom_filter/index.php b/app/Template/custom_filter/index.php index 12a4eece..08c8040c 100644 --- a/app/Template/custom_filter/index.php +++ b/app/Template/custom_filter/index.php @@ -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 ?> diff --git a/app/Template/custom_filter/remove.php b/app/Template/custom_filter/remove.php index d4c67a2b..609f19b2 100644 --- a/app/Template/custom_filter/remove.php +++ b/app/Template/custom_filter/remove.php @@ -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> diff --git a/app/Template/dashboard/calendar.php b/app/Template/dashboard/calendar.php index a154203b..75c96d83 100644 --- a/app/Template/dashboard/calendar.php +++ b/app/Template/dashboard/calendar.php @@ -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> diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php index 187f7f42..795537a6 100644 --- a/app/Template/dashboard/layout.php +++ b/app/Template/dashboard/layout.php @@ -1,21 +1,21 @@ <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> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Search'), 'search', 'index') ?> + <?= $this->url->link(t('Search'), 'SearchController', 'index') ?> </li> <li> <i class="fa fa-folder fa-fw"></i> diff --git a/app/Template/dashboard/notifications.php b/app/Template/dashboard/notifications.php index b64eb0b7..e0e9b878 100644 --- a/app/Template/dashboard/notifications.php +++ b/app/Template/dashboard/notifications.php @@ -8,7 +8,7 @@ <ul> <li> <i class="fa fa-check-square-o fa-fw"></i> - <?= $this->url->link(t('Mark all as read'), 'webNotification', 'flush', array('user_id' => $user['id'])) ?> + <?= $this->url->link(t('Mark all as read'), 'WebNotificationController', 'flush', array('user_id' => $user['id'])) ?> </li> </ul> </div> @@ -36,16 +36,12 @@ <i class="fa fa-file-o fa-fw"></i> <?php endif ?> - <?php if ($this->text->contains($notification['event_name'], 'comment')): ?> - <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']), false, '', '', false, 'comment-'.$notification['event_data']['comment']['id']) ?> - <?php elseif ($this->text->contains($notification['event_name'], 'task.overdue')): ?> + <?php if ($this->text->contains($notification['event_name'], 'task.overdue')): ?> <?php if (count($notification['event_data']['tasks']) > 1): ?> <?= $notification['title'] ?> - <?php else: ?> - <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['tasks'][0]['id'], 'project_id' => $notification['event_data']['tasks'][0]['project_id'])) ?> <?php endif ?> <?php else: ?> - <?= $this->url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id'])) ?> + <?= $this->url->link($notification['title'], 'WebNotificationController', 'redirect', array('notification_id' => $notification['id'], 'user_id' => $user['id'])) ?> <?php endif ?> </td> <td> @@ -53,9 +49,9 @@ </td> <td> <i class="fa fa-check fa-fw"></i> - <?= $this->url->link(t('Mark as read'), 'webNotification', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?> + <?= $this->url->link(t('Mark as read'), 'WebNotificationController', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?> </td> </tr> <?php endforeach ?> </table> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/dashboard/projects.php b/app/Template/dashboard/projects.php index cdf19bdf..5bf92980 100644 --- a/app/Template/dashboard/projects.php +++ b/app/Template/dashboard/projects.php @@ -8,7 +8,7 @@ <tr> <th class="column-5"><?= $paginator->order('Id', 'id') ?></th> <th class="column-3"><?= $paginator->order('<i class="fa fa-lock fa-fw" title="'.t('Private project').'"></i>', 'is_private') ?></th> - <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?></th> + <th class="column-25"><?= $paginator->order(t('Project'), \Kanboard\Model\ProjectModel::TABLE.'.name') ?></th> <th><?= t('Columns') ?></th> </tr> <?php foreach ($paginator->getCollection() as $project): ?> @@ -22,14 +22,14 @@ <?php endif ?> </td> <td> - <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?> - <?= $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 if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?> + <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'TaskGanttController', 'show', 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')) ?> - <?= $this->url->link('<i class="fa fa-calendar"></i>', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?> + <?= $this->url->link('<i class="fa fa-list"></i>', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?> + <?= $this->url->link('<i class="fa fa-calendar"></i>', 'CalendarController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?> - <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?> + <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> <?php if (! empty($project['description'])): ?> <span class="tooltip" title="<?= $this->text->markdownAttribute($project['description']) ?>"> <i class="fa fa-info-circle"></i> diff --git a/app/Template/dashboard/show.php b/app/Template/dashboard/show.php index bc4e2952..917a6651 100644 --- a/app/Template/dashboard/show.php +++ b/app/Template/dashboard/show.php @@ -2,7 +2,7 @@ <form method="get" action="<?= $this->url->dir() ?>" class="search"> <?= $this->form->hidden('controller', array('controller' => 'search')) ?> <?= $this->form->hidden('action', array('action' => 'index')) ?> - <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?> + <?= $this->form->text('SearchController', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?> <?= $this->render('app/filters_helper') ?> </form> </div> diff --git a/app/Template/dashboard/subtasks.php b/app/Template/dashboard/subtasks.php index ee6caf02..8e0aa3ce 100644 --- a/app/Template/dashboard/subtasks.php +++ b/app/Template/dashboard/subtasks.php @@ -18,10 +18,10 @@ <?= $this->render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?> </td> <td> - <?= $this->url->link($this->text->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> + <?= $this->url->link($this->text->e($subtask['project_name']), 'BoardViewController', 'show', array('project_id' => $subtask['project_id'])) ?> </td> <td> - <?= $this->url->link($this->text->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> + <?= $this->url->link($this->text->e($subtask['task_name']), 'TaskViewController', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> </td> <td> <?= $this->subtask->toggleStatus($subtask, $subtask['project_id']) ?> diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php index 756bd9b4..4b83a96a 100644 --- a/app/Template/dashboard/tasks.php +++ b/app/Template/dashboard/tasks.php @@ -20,10 +20,10 @@ <?= $this->render('task/dropdown', array('task' => $task)) ?> </td> <td> - <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + <?= $this->url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> </td> <td> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </td> <td> <?php if ($task['priority'] >= 0): ?> diff --git a/app/Template/doc/show.php b/app/Template/doc/show.php index 8fbadc93..a8dbd762 100644 --- a/app/Template/doc/show.php +++ b/app/Template/doc/show.php @@ -3,11 +3,11 @@ <ul> <li> <i class="fa fa-life-ring fa-fw"></i> - <?= $this->url->link(t('Table of contents'), 'doc', 'show', array('file' => 'index')) ?> + <?= $this->url->link(t('Table of contents'), 'DocumentationController', 'show', array('file' => 'index')) ?> </li> </ul> </div> <div class="markdown documentation"> <?= $content ?> </div> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php index 9869c94b..45132e6d 100644 --- a/app/Template/event/comment_create.php +++ b/app/Template/event/comment_create.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s commented the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php index 19420cf9..5a0821bd 100644 --- a/app/Template/event/comment_update.php +++ b/app/Template/event/comment_update.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s updated a comment on the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php index 7e41d5c9..1bf36c05 100644 --- a/app/Template/event/subtask_create.php +++ b/app/Template/event/subtask_create.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s created a subtask for the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> @@ -20,4 +20,4 @@ <?php endif ?> </li> </ul> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php index 9fea4fe8..201402f6 100644 --- a/app/Template/event/subtask_update.php +++ b/app/Template/event/subtask_update.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s updated a subtask for the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php index db78e7df..7c962223 100644 --- a/app/Template/event/task_assignee_change.php +++ b/app/Template/event/task_assignee_change.php @@ -4,14 +4,14 @@ <?php if (! empty($assignee)): ?> <?= e('%s changed the assignee of the task %s to %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($assignee) ) ?> <?php else: ?> - <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> + <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> <?php endif ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> <div class="activity-description"> <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php index 04157b0d..90ff9207 100644 --- a/app/Template/event/task_close.php +++ b/app/Template/event/task_close.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s closed the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php index 6e26cdb8..017a5ada 100644 --- a/app/Template/event/task_create.php +++ b/app/Template/event/task_create.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s created the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php index 0d8e545d..d329529a 100644 --- a/app/Template/event/task_file_create.php +++ b/app/Template/event/task_file_create.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s attached a new file to the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php index 0a78bca7..f3155e47 100644 --- a/app/Template/event/task_move_column.php +++ b/app/Template/event/task_move_column.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s moved the task %s to the column "%s"', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($task['column_title']) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php index eeadfa02..ecdd02b6 100644 --- a/app/Template/event/task_move_position.php +++ b/app/Template/event/task_move_position.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s moved the task %s to the position #%d in the column "%s"', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $task['position'], $this->text->e($task['column_title']) ) ?> diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php index a190bc0a..fe9bfb55 100644 --- a/app/Template/event/task_move_swimlane.php +++ b/app/Template/event/task_move_swimlane.php @@ -2,12 +2,12 @@ <?php if ($task['swimlane_id'] == 0): ?> <?= e('%s moved the task %s to the first swimlane', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <?php else: ?> <?= e('%s moved the task %s to the swimlane "%s"', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($task['swimlane_name']) ) ?> <?php endif ?> diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php index d9cd90b3..548aa98f 100644 --- a/app/Template/event/task_open.php +++ b/app/Template/event/task_open.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s opened the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php index 07b94ff8..7c7507c0 100644 --- a/app/Template/event/task_update.php +++ b/app/Template/event/task_update.php @@ -1,7 +1,7 @@ <p class="activity-title"> <?= e('%s updated the task %s', $this->text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span> </p> diff --git a/app/Template/export/sidebar.php b/app/Template/export/sidebar.php index 6a1de7e9..55fbaeef 100644 --- a/app/Template/export/sidebar.php +++ b/app/Template/export/sidebar.php @@ -1,18 +1,18 @@ <div class="sidebar"> <h2><?= t('Exports') ?></h2> <ul> - <li <?= $this->app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>> - <?= $this->url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?> + <li <?= $this->app->checkMenuSelection('ExportController', 'tasks') ?>> + <?= $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'])) ?> + <li <?= $this->app->checkMenuSelection('ExportController', 'subtasks') ?>> + <?= $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'])) ?> + <li <?= $this->app->checkMenuSelection('ExportController', 'transitions') ?>> + <?= $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'])) ?> + <li <?= $this->app->checkMenuSelection('ExportController', 'summary') ?>> + <?= $this->url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?> </li> <?= $this->hook->render('template:export:sidebar') ?> </ul> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/feed/project.php b/app/Template/feed/project.php index 1c6d1166..213a04d4 100644 --- a/app/Template/feed/project.php +++ b/app/Template/feed/project.php @@ -2,15 +2,15 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"> <title><?= t('%s\'s activity', $project['name']) ?></title> <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/> - <link rel="self" type="application/atom+xml" href="<?= $this->url->href('feed', 'project', array('token' => $project['token']), false, '', true) ?>"/> + <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'project', array('token' => $project['token']), false, '', true) ?>"/> <updated><?= date(DATE_ATOM) ?></updated> - <id><?= $this->url->href('feed', 'project', array('token' => $project['token']), false, '', true) ?></id> + <id><?= $this->url->href('FeedController', 'project', array('token' => $project['token']), false, '', true) ?></id> <icon><?= $this->url->base() ?>assets/img/favicon.png</icon> <?php foreach ($events as $e): ?> <entry> <title type="text"><?= $e['event_title'] ?></title> - <link rel="alternate" href="<?= $this->url->href('task', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/> + <link rel="alternate" href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/> <id><?= $e['id'].'-'.$e['event_name'].'-'.$e['task_id'].'-'.$e['date_creation'] ?></id> <published><?= date(DATE_ATOM, $e['date_creation']) ?></published> <updated><?= date(DATE_ATOM, $e['date_creation']) ?></updated> @@ -24,4 +24,4 @@ </content> </entry> <?php endforeach ?> -</feed>
\ No newline at end of file +</feed> diff --git a/app/Template/feed/user.php b/app/Template/feed/user.php index 28847f1f..0c45f03c 100644 --- a/app/Template/feed/user.php +++ b/app/Template/feed/user.php @@ -2,15 +2,15 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"> <title><?= t('Project activities for %s', $user['name'] ?: $user['username']) ?></title> <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/> - <link rel="self" type="application/atom+xml" href="<?= $this->url->href('feed', 'user', array('token' => $user['token']), false, '', true) ?>"/> + <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'user', array('token' => $user['token']), false, '', true) ?>"/> <updated><?= date(DATE_ATOM) ?></updated> - <id><?= $this->url->href('feed', 'user', array('token' => $user['token']), false, '', true) ?></id> + <id><?= $this->url->href('FeedController', 'user', array('token' => $user['token']), false, '', true) ?></id> <icon><?= $this->url->base() ?>assets/img/favicon.png</icon> <?php foreach ($events as $e): ?> <entry> <title type="text"><?= $e['event_title'] ?></title> - <link rel="alternate" href="<?= $this->url->href('task', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/> + <link rel="alternate" href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $e['task_id']), false, '', true) ?>"/> <id><?= $e['id'].'-'.$e['event_name'].'-'.$e['task_id'].'-'.$e['date_creation'] ?></id> <published><?= date(DATE_ATOM, $e['date_creation']) ?></published> <updated><?= date(DATE_ATOM, $e['date_creation']) ?></updated> @@ -24,4 +24,4 @@ </content> </entry> <?php endforeach ?> -</feed>
\ No newline at end of file +</feed> diff --git a/app/Template/file_viewer/show.php b/app/Template/file_viewer/show.php index 191aaa6c..e829a178 100644 --- a/app/Template/file_viewer/show.php +++ b/app/Template/file_viewer/show.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/header.php b/app/Template/header.php index 1ff8bf33..15b70ead 100644 --- a/app/Template/header.php +++ b/app/Template/header.php @@ -23,7 +23,7 @@ data-notfound="<?= t('No results match:') ?>" data-placeholder="<?= t('Display another project') ?>" data-redirect-regex="PROJECT_ID" - data-redirect-url="<?= $this->url->href('board', 'show', array('project_id' => 'PROJECT_ID')) ?>"> + data-redirect-url="<?= $this->url->href('BoardViewController', 'show', array('project_id' => 'PROJECT_ID')) ?>"> <option value=""></option> <?php foreach ($board_selector as $board_id => $board_name): ?> <option value="<?= $board_id ?>"><?= $this->text->e($board_name) ?></option> @@ -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> @@ -88,17 +90,17 @@ </li> <li> <i class="fa fa-cog fa-fw"></i> - <?= $this->url->link(t('Settings'), 'config', 'index') ?> + <?= $this->url->link(t('Settings'), 'ConfigController', 'index') ?> </li> <?php endif ?> <li> <i class="fa fa-life-ring fa-fw"></i> - <?= $this->url->link(t('Documentation'), 'doc', 'show') ?> + <?= $this->url->link(t('Documentation'), 'DocumentationController', 'show') ?> </li> <?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> diff --git a/app/Template/layout.php b/app/Template/layout.php index ff29e18f..9c4d69c5 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -45,8 +45,8 @@ <?= $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-keyboard-shortcut-url="<?= $this->url->href('Doc', 'shortcuts') ?>" + 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() ?>"> diff --git a/app/Template/link/create.php b/app/Template/link/create.php index 3b36abee..23990604 100644 --- a/app/Template/link/create.php +++ b/app/Template/link/create.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php index e91422be..0ad73275 100644 --- a/app/Template/link/edit.php +++ b/app/Template/link/edit.php @@ -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>
\ No newline at end of file +</form> diff --git a/app/Template/link/index.php b/app/Template/link/index.php index 1475bd50..7e32069a 100644 --- a/app/Template/link/index.php +++ b/app/Template/link/index.php @@ -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)) ?>
\ No newline at end of file +<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?> diff --git a/app/Template/link/remove.php b/app/Template/link/remove.php index 12ca14bb..b7fbef5e 100644 --- a/app/Template/link/remove.php +++ b/app/Template/link/remove.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php index c3b37884..6ac260cb 100644 --- a/app/Template/notification/footer.php +++ b/app/Template/notification/footer.php @@ -2,6 +2,6 @@ Kanboard <?php if (isset($application_url) && ! empty($application_url)): ?> - - <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the task on Kanboard') ?></a> - - <a href="<?= $this->url->href('board', 'show', array('project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the board on Kanboard') ?></a> + - <a href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the task on Kanboard') ?></a> + - <a href="<?= $this->url->href('BoardViewController', 'show', array('project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the board on Kanboard') ?></a> <?php endif ?> diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php index a9fad249..406e41f7 100644 --- a/app/Template/notification/task_overdue.php +++ b/app/Template/notification/task_overdue.php @@ -14,7 +14,7 @@ <td style="border: 1px solid #eee;">#<?= $task['id'] ?></td> <td style="border: 1px solid #eee;"> <?php if ($application_url): ?> - <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a> + <a href="<?= $this->url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a> <?php else: ?> <?= $this->text->e($task['title']) ?> <?php endif ?> diff --git a/app/Template/password_reset/change.php b/app/Template/password_reset/change.php index 0a1d8de4..80a035da 100644 --- a/app/Template/password_reset/change.php +++ b/app/Template/password_reset/change.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/password_reset/create.php b/app/Template/password_reset/create.php index 918a0eb4..f43d95fc 100644 --- a/app/Template/password_reset/create.php +++ b/app/Template/password_reset/create.php @@ -1,17 +1,17 @@ <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') ?> <?= $this->form->text('username', $values, $errors, array('autofocus', 'required')) ?> <?= $this->form->label(t('Enter the text below'), 'captcha') ?> - <img src="<?= $this->url->href('Captcha', 'image') ?>"/> + <img src="<?= $this->url->href('CaptchaController', 'image') ?>" alt="Captcha"> <?= $this->form->text('captcha', array(), $errors, array('required')) ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Change Password') ?></button> </div> </form> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/password_reset/email.php b/app/Template/password_reset/email.php index 62788b49..63b08e49 100644 --- a/app/Template/password_reset/email.php +++ b/app/Template/password_reset/email.php @@ -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
\ No newline at end of file +Kanboard diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php index edebdd65..90dccf21 100644 --- a/app/Template/project/dropdown.php +++ b/app/Template/project/dropdown.php @@ -3,32 +3,32 @@ <ul> <li> <i class="fa fa-th fa-fw"></i> - <?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'])) ?> + <?= $this->url->link(t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> </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'])): ?> + <?php if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?> <li> <i class="fa fa-sliders fa-fw"></i> - <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'])) ?> + <?= $this->url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'])) ?> </li> <?php endif ?> <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('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 ?> diff --git a/app/Template/project/layout.php b/app/Template/project/layout.php index fcb3e5f3..ec039202 100644 --- a/app/Template/project/layout.php +++ b/app/Template/project/layout.php @@ -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>
\ No newline at end of file +</section> diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php index 1071e78b..9bc0c9c4 100644 --- a/app/Template/project/sidebar.php +++ b/app/Template/project/sidebar.php @@ -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'])) ?> + <li <?= $this->app->checkMenuSelection('CategoryController') ?>> + <?= $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'])) ?> @@ -51,9 +51,6 @@ <?= $this->url->link(t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id']), false, 'popover') ?> <?php endif ?> </li> - <li <?= $this->app->checkMenuSelection('taskImport') ?>> - <?= $this->url->link(t('Import'), 'taskImport', 'step1', array('project_id' => $project['id'])) ?> - </li> <?php if ($this->user->hasProjectAccess('ProjectStatusController', 'remove', $project['id'])): ?> <li> <?= $this->url->link(t('Remove'), 'ProjectStatusController', 'confirmRemove', array('project_id' => $project['id']), false, 'popover') ?> diff --git a/app/Template/action_project/project.php b/app/Template/project_action_duplication/show.php index 226f3b19..2eebb262 100644 --- a/app/Template/action_project/project.php +++ b/app/Template/project_action_duplication/show.php @@ -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 ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/project_creation/create.php b/app/Template/project_creation/create.php index ea5783a6..01d06bab 100644 --- a/app/Template/project_creation/create.php +++ b/app/Template/project_creation/create.php @@ -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) ?> @@ -22,10 +22,10 @@ <?= $this->form->checkbox('projectPermission', t('Permissions'), 1, true) ?> <?php endif ?> - <?= $this->form->checkbox('category', t('Categories'), 1, true) ?> - <?= $this->form->checkbox('action', t('Actions'), 1, true) ?> - <?= $this->form->checkbox('swimlane', t('Swimlanes'), 1, true) ?> - <?= $this->form->checkbox('task', t('Tasks'), 1, false) ?> + <?= $this->form->checkbox('categoryModel', t('Categories'), 1, true) ?> + <?= $this->form->checkbox('actionModel', t('Actions'), 1, true) ?> + <?= $this->form->checkbox('swimlaneModel', t('Swimlanes'), 1, true) ?> + <?= $this->form->checkbox('taskModel', t('Tasks'), 1, false) ?> </div> <div class="form-actions"> diff --git a/app/Template/project_edit/general.php b/app/Template/project_edit/general.php index b817bcd4..c7421477 100644 --- a/app/Template/project_edit/general.php +++ b/app/Template/project_edit/general.php @@ -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> diff --git a/app/Template/project_file/create.php b/app/Template/project_file/create.php index 9858b273..e262799b 100644 --- a/app/Template/project_file/create.php +++ b/app/Template/project_file/create.php @@ -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> diff --git a/app/Template/project_file/remove.php b/app/Template/project_file/remove.php index ba834288..0517a9e7 100644 --- a/app/Template/project_file/remove.php +++ b/app/Template/project_file/remove.php @@ -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>
\ No newline at end of file +</div> diff --git a/app/Template/gantt/projects.php b/app/Template/project_gantt/show.php index b8431d03..af22a6ed 100644 --- a/app/Template/gantt/projects.php +++ b/app/Template/project_gantt/show.php @@ -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> @@ -16,7 +16,7 @@ <div id="gantt-chart" data-records='<?= json_encode($projects, JSON_HEX_APOS) ?>' - data-save-url="<?= $this->url->href('gantt', 'saveProjectDate') ?>" + data-save-url="<?= $this->url->href('ProjectGanttController', 'save') ?>" data-label-project-manager="<?= t('Project managers') ?>" data-label-project-member="<?= t('Project members') ?>" data-label-gantt-link="<?= t('Gantt chart for this project') ?>" diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php index 5a27e981..79a1b389 100644 --- a/app/Template/project_header/dropdown.php +++ b/app/Template/project_header/dropdown.php @@ -5,11 +5,11 @@ <li> <span class="filter-display-mode" <?= $this->board->isCollapsed($project['id']) ? '' : 'style="display: none;"' ?>> <i class="fa fa-expand fa-fw"></i> - <?= $this->url->link(t('Expand tasks'), 'board', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + <?= $this->url->link(t('Expand tasks'), 'BoardAjaxController', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> </span> <span class="filter-display-mode" <?= $this->board->isCollapsed($project['id']) ? 'style="display: none;"' : '' ?>> <i class="fa fa-compress fa-fw"></i> - <?= $this->url->link(t('Collapse tasks'), 'board', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + <?= $this->url->link(t('Collapse tasks'), 'BoardAjaxController', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> </span> </li> <li> @@ -39,36 +39,43 @@ <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 ?> <?php if ($project['is_public']): ?> <li> <i class="fa fa-share-alt fa-fw"></i> - <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?> + <?= $this->url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?> </li> <?php endif ?> <?= $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-upload fa-fw"></i> + <?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?> + </li> + <?php endif ?> + + <?php if ($this->user->hasProjectAccess('TaskImportController', '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('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> </li> <?php endif ?> diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php index 353e4b62..3a41c91b 100644 --- a/app/Template/project_header/views.php +++ b/app/Template/project_header/views.php @@ -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('BoardViewController') ?>> <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')) ?> + <?= $this->url->link(t('Board'), 'BoardViewController', '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"' : '' ?>> + <?php if ($this->user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?> + <li <?= $this->app->checkMenuSelection('TaskGanttController') ?>> <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')) ?> + <?= $this->url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?> </li> <?php endif ?> -</ul>
\ No newline at end of file +</ul> diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php index 06e4a626..8b9f1396 100644 --- a/app/Template/project_list/show.php +++ b/app/Template/project_list/show.php @@ -1,11 +1,11 @@ <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> + <?php if ($this->user->hasAccess('ProjectGanttController', 'show')): ?> + <li><i class="fa fa-sliders fa-fw"></i><?= $this->url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?></li> <?php endif ?> </ul> </div> @@ -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> @@ -38,7 +38,7 @@ <?php endif ?> </td> <td> - <?= $this->url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?> + <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> <?php if ($project['is_public']): ?> <i class="fa fa-share-alt fa-fw" title="<?= t('Shared project') ?>"></i> @@ -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"> diff --git a/app/Template/project_overview/attachments.php b/app/Template/project_overview/attachments.php index eaabfd5f..ab8cf2ad 100644 --- a/app/Template/project_overview/attachments.php +++ b/app/Template/project_overview/attachments.php @@ -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 ?> diff --git a/app/Template/project_overview/files.php b/app/Template/project_overview/files.php index c570b771..fa870938 100644 --- a/app/Template/project_overview/files.php +++ b/app/Template/project_overview/files.php @@ -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> diff --git a/app/Template/project_overview/images.php b/app/Template/project_overview/images.php index f6937e12..7f38e2b1 100644 --- a/app/Template/project_overview/images.php +++ b/app/Template/project_overview/images.php @@ -2,7 +2,7 @@ <div class="file-thumbnails"> <?php foreach ($images as $file): ?> <div class="file-thumbnail"> - <a href="<?= $this->url->href('FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a> + <a href="<?= $this->url->href('FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $project['id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a> <div class="file-thumbnail-content"> <div class="file-thumbnail-title"> <div class="dropdown"> @@ -10,12 +10,12 @@ <ul> <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> diff --git a/app/Template/project_overview/information.php b/app/Template/project_overview/information.php index 2032ed28..fdf0f753 100644 --- a/app/Template/project_overview/information.php +++ b/app/Template/project_overview/information.php @@ -29,9 +29,9 @@ <?php endif ?> <?php if ($project['is_public']): ?> - <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> <?php endif ?> </ul> </div> diff --git a/app/Template/project_overview/show.php b/app/Template/project_overview/show.php index 6fe815b3..6b2bc2cf 100644 --- a/app/Template/project_overview/show.php +++ b/app/Template/project_overview/show.php @@ -1,5 +1,5 @@ <section id="main"> - <?= $this->projectHeader->render($project, 'ProjectOverview', 'show') ?> + <?= $this->projectHeader->render($project, 'ProjectOverviewController', 'show') ?> <?= $this->render('project_overview/columns', array('project' => $project)) ?> <?= $this->render('project_overview/description', array('project' => $project)) ?> <?= $this->render('project_overview/attachments', array('project' => $project, 'images' => $images, 'files' => $files)) ?> diff --git a/app/Template/project_user/sidebar.php b/app/Template/project_user/sidebar.php deleted file mode 100644 index f1cffcad..00000000 --- a/app/Template/project_user/sidebar.php +++ /dev/null @@ -1,30 +0,0 @@ -<div class="sidebar"> - <h2><?= t('Actions') ?></h2> - - <?= $this->form->select( - 'user_id', - $users, - $filter, - array(), - array('data-redirect-url="'.$this->url->href('projectuser', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'), - 'chosen-select select-auto-redirect' - ) ?> - - <br><br> - <ul> - <li <?= $this->app->checkMenuSelection('projectuser', 'managers') ?>> - <?= $this->url->link(t('Project managers'), 'projectuser', 'managers', $filter) ?> - </li> - <li <?= $this->app->checkMenuSelection('projectuser', 'members') ?>> - <?= $this->url->link(t('Project members'), 'projectuser', 'members', $filter) ?> - </li> - <li <?= $this->app->checkMenuSelection('projectuser', 'opens') ?>> - <?= $this->url->link(t('Open tasks'), 'projectuser', 'opens', $filter) ?> - </li> - <li <?= $this->app->checkMenuSelection('projectuser', 'closed') ?>> - <?= $this->url->link(t('Closed tasks'), 'projectuser', 'closed', $filter) ?> - </li> - - <?= $this->hook->render('template:project-user:sidebar') ?> - </ul> -</div> diff --git a/app/Template/project_user/layout.php b/app/Template/project_user_overview/layout.php index ab4326f6..19b83436 100644 --- a/app/Template/project_user/layout.php +++ b/app/Template/project_user_overview/layout.php @@ -5,10 +5,10 @@ <i class="fa fa-folder fa-fw"></i> <?= $this->url->link(t('Projects list'), 'ProjectListController', 'show') ?> </li> - <?php if ($this->user->hasAccess('gantt', 'projects')): ?> + <?php if ($this->user->hasAccess('ProjectGanttController', 'show')): ?> <li> <i class="fa fa-sliders fa-fw"></i> - <?= $this->url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?> + <?= $this->url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?> </li> <?php endif ?> </ul> diff --git a/app/Template/project_user/roles.php b/app/Template/project_user_overview/roles.php index 6be929d8..87c8df85 100644 --- a/app/Template/project_user/roles.php +++ b/app/Template/project_user_overview/roles.php @@ -13,8 +13,8 @@ <?= $this->text->e($this->user->getFullname($project)) ?> </td> <td> - <?= $this->url->link('<i class="fa fa-th"></i>', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> - <?= $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')) ?> + <?= $this->url->link('<i class="fa fa-th"></i>', 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> + <?= $this->url->link('<i class="fa fa-sliders fa-fw"></i>', 'TaskGanttController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> <?= $this->url->link('<i class="fa fa-cog fa-fw"></i>', 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?> <?= $this->text->e($project['project_name']) ?> diff --git a/app/Template/project_user_overview/sidebar.php b/app/Template/project_user_overview/sidebar.php new file mode 100644 index 00000000..9a87d4eb --- /dev/null +++ b/app/Template/project_user_overview/sidebar.php @@ -0,0 +1,30 @@ +<div class="sidebar"> + <h2><?= t('Actions') ?></h2> + + <?= $this->form->select( + 'user_id', + $users, + $filter, + array(), + array('data-redirect-url="'.$this->url->href('ProjectUserOverviewController', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'), + 'chosen-select select-auto-redirect' + ) ?> + + <br><br> + <ul> + <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'managers') ?>> + <?= $this->url->link(t('Project managers'), 'ProjectUserOverviewController', 'managers', $filter) ?> + </li> + <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'members') ?>> + <?= $this->url->link(t('Project members'), 'ProjectUserOverviewController', 'members', $filter) ?> + </li> + <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'opens') ?>> + <?= $this->url->link(t('Open tasks'), 'ProjectUserOverviewController', 'opens', $filter) ?> + </li> + <li <?= $this->app->checkMenuSelection('ProjectUserOverviewController', 'closed') ?>> + <?= $this->url->link(t('Closed tasks'), 'ProjectUserOverviewController', 'closed', $filter) ?> + </li> + + <?= $this->hook->render('template:project-user:sidebar') ?> + </ul> +</div> diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user_overview/tasks.php index 108d3b33..af0a3d97 100644 --- a/app/Template/project_user/tasks.php +++ b/app/Template/project_user_overview/tasks.php @@ -14,16 +14,16 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td class="task-table color-<?= $task['color_id'] ?>"> - <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> - <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + <?= $this->url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> </td> <td> <?= $this->text->e($task['column_name']) ?> </td> <td> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> <?php if ($task['assignee_username']): ?> diff --git a/app/Template/project_user/tooltip_users.php b/app/Template/project_user_overview/tooltip_users.php index 81300eaa..7117a87f 100644 --- a/app/Template/project_user/tooltip_users.php +++ b/app/Template/project_user_overview/tooltip_users.php @@ -7,7 +7,7 @@ <tr><th><?= $role_name ?></th></tr> <?php foreach ($users[$role] as $user_id => $user): ?> <tr><td> - <?= $this->url->link($this->text->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?> + <?= $this->url->link($this->text->e($user), 'ProjectUserOverviewController', 'opens', array('user_id' => $user_id)) ?> </td></tr> <?php endforeach ?> <?php endif ?> diff --git a/app/Template/project_view/duplicate.php b/app/Template/project_view/duplicate.php index 41ae39df..d2cd127a 100644 --- a/app/Template/project_view/duplicate.php +++ b/app/Template/project_view/duplicate.php @@ -14,11 +14,11 @@ <?= $this->form->checkbox('projectPermission', t('Permissions'), 1, true) ?> <?php endif ?> - <?= $this->form->checkbox('category', t('Categories'), 1, true) ?> - <?= $this->form->checkbox('action', t('Actions'), 1, true) ?> - <?= $this->form->checkbox('swimlane', t('Swimlanes'), 1, false) ?> - <?= $this->form->checkbox('task', t('Tasks'), 1, false) ?> - <?= $this->form->checkbox('projectMetadata', t('Metadata'), 1, false) ?> + <?= $this->form->checkbox('categoryModel', t('Categories'), 1, true) ?> + <?= $this->form->checkbox('actionModel', t('Actions'), 1, true) ?> + <?= $this->form->checkbox('swimlaneModel', t('Swimlanes'), 1, false) ?> + <?= $this->form->checkbox('taskModel', t('Tasks'), 1, false) ?> + <?= $this->form->checkbox('projectMetadataModel', t('Metadata'), 1, false) ?> <div class="form-actions"> <button type="submit" class="btn btn-red"><?= t('Duplicate') ?></button> diff --git a/app/Template/project_view/share.php b/app/Template/project_view/share.php index 6161faa9..409f37e6 100644 --- a/app/Template/project_view/share.php +++ b/app/Template/project_view/share.php @@ -6,9 +6,9 @@ <div class="listing"> <ul class="no-bullet"> - <li><strong><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> </ul> </div> diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php index 4aba4919..5efe8ce6 100644 --- a/app/Template/project_view/show.php +++ b/app/Template/project_view/show.php @@ -13,9 +13,9 @@ <?php endif ?> <?php if ($project['is_public']): ?> - <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> <?php else: ?> <li><?= t('Public access disabled') ?></li> <?php endif ?> @@ -35,11 +35,11 @@ <?php if ($stats['nb_tasks'] > 0): ?> <?php if ($stats['nb_active_tasks'] > 0): ?> - <li><?= $this->url->link(t('%d tasks on the board', $stats['nb_active_tasks']), 'board', 'show', array('project_id' => $project['id'], 'search' => 'status:open')) ?></li> + <li><?= $this->url->link(t('%d tasks on the board', $stats['nb_active_tasks']), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => 'status:open')) ?></li> <?php endif ?> <?php if ($stats['nb_inactive_tasks'] > 0): ?> - <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'listing', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li> + <li><?= $this->url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?></li> <?php endif ?> <li><?= t('%d tasks in total', $stats['nb_tasks']) ?></li> diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php index 60362215..9abc7d7e 100644 --- a/app/Template/search/activity.php +++ b/app/Template/search/activity.php @@ -3,7 +3,7 @@ <ul> <li> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Search tasks'), 'search', 'index') ?> + <?= $this->url->link(t('Search tasks'), 'SearchController', 'index') ?> </li> </ul> </div> @@ -36,4 +36,4 @@ <?= $this->render('event/events', array('events' => $events)) ?> <?php endif ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/search/index.php b/app/Template/search/index.php index d5d07ed6..bc528af7 100644 --- a/app/Template/search/index.php +++ b/app/Template/search/index.php @@ -3,7 +3,7 @@ <ul> <li> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Activity stream search'), 'search', 'activity') ?> + <?= $this->url->link(t('Activity stream search'), 'SearchController', 'activity') ?> </li> </ul> </div> @@ -40,4 +40,4 @@ )) ?> <?php endif ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/search/results.php b/app/Template/search/results.php index 79df3544..8376b9e8 100644 --- a/app/Template/search/results.php +++ b/app/Template/search/results.php @@ -13,10 +13,10 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td> - <?= $this->url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + <?= $this->url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> </td> <td class="task-table color-<?= $task['color_id'] ?>"> - <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> <?= $this->text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?> @@ -28,7 +28,7 @@ <?= $this->text->e($task['category_name']) ?> </td> <td> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> <?php if ($task['assignee_username']): ?> @@ -41,7 +41,7 @@ <?= $this->dt->date($task['date_due']) ?> </td> <td> - <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?> + <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?> <?= t('Open') ?> <?php else: ?> <?= t('Closed') ?> diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php index 31b99f90..3c080f7c 100644 --- a/app/Template/subtask/create.php +++ b/app/Template/subtask/create.php @@ -15,6 +15,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php index 9e316ea5..8f256cea 100644 --- a/app/Template/subtask/edit.php +++ b/app/Template/subtask/edit.php @@ -15,6 +15,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php index 33c10e88..426c1a93 100644 --- a/app/Template/subtask/remove.php +++ b/app/Template/subtask/remove.php @@ -15,6 +15,6 @@ <div class="form-actions"> <?= $this->url->link(t('Yes'), 'SubtaskController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </div> diff --git a/app/Template/subtask_converter/show.php b/app/Template/subtask_converter/show.php index af8af49e..63f45482 100644 --- a/app/Template/subtask_converter/show.php +++ b/app/Template/subtask_converter/show.php @@ -15,6 +15,6 @@ <div class="form-actions"> <?= $this->url->link(t('Yes'), 'SubtaskConverterController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </div> diff --git a/app/Template/subtask_restriction/show.php b/app/Template/subtask_restriction/show.php index 1ff49915..ec8b8d5b 100644 --- a/app/Template/subtask_restriction/show.php +++ b/app/Template/subtask_restriction/show.php @@ -12,6 +12,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-red"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/swimlane/create.php b/app/Template/swimlane/create.php index a9b4374b..f5aa1591 100644 --- a/app/Template/swimlane/create.php +++ b/app/Template/swimlane/create.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Add a new swimlane') ?></h2> </div> -<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off"> +<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('project_id', $values) ?> @@ -15,6 +15,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php index b08099ae..b10cdd52 100644 --- a/app/Template/swimlane/edit.php +++ b/app/Template/swimlane/edit.php @@ -2,7 +2,7 @@ <h2><?= t('Swimlane modification for the project "%s"', $project['name']) ?></h2> </div> -<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'update', array('project_id' => $project['id'], 'swimlane_id' => $values['id'])) ?>" autocomplete="off"> +<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'update', array('project_id' => $project['id'], 'swimlane_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'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/swimlane/edit_default.php b/app/Template/swimlane/edit_default.php index 3bf82568..f271c513 100644 --- a/app/Template/swimlane/edit_default.php +++ b/app/Template/swimlane/edit_default.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Change default swimlane') ?></h2> </div> -<form class="popover-form" method="post" action="<?= $this->url->href('swimlane', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off"> +<form class="popover-form" method="post" action="<?= $this->url->href('SwimlaneController', 'updateDefault', array('project_id' => $project['id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> @@ -13,6 +13,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php index fad35306..4f78a405 100644 --- a/app/Template/swimlane/index.php +++ b/app/Template/swimlane/index.php @@ -3,7 +3,7 @@ <ul> <li> <i class="fa fa-plus fa-fw"></i> - <?= $this->url->link(t('Add a new swimlane'), 'Swimlane', 'create', array('project_id' => $project['id']), false, 'popover') ?> + <?= $this->url->link(t('Add a new swimlane'), 'SwimlaneController', 'create', array('project_id' => $project['id']), false, 'popover') ?> </li> </ul> </div> diff --git a/app/Template/swimlane/remove.php b/app/Template/swimlane/remove.php index 9be39ff8..f16b778c 100644 --- a/app/Template/swimlane/remove.php +++ b/app/Template/swimlane/remove.php @@ -9,9 +9,9 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'swimlane', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'SwimlaneController', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </div> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php index ec3cb621..be123b08 100644 --- a/app/Template/swimlane/table.php +++ b/app/Template/swimlane/table.php @@ -1,6 +1,6 @@ <table class="swimlanes-table table-stripped" - data-save-position-url="<?= $this->url->href('Swimlane', 'move', array('project_id' => $project['id'])) ?>"> + data-save-position-url="<?= $this->url->href('SwimlaneController', 'move', array('project_id' => $project['id'])) ?>"> <thead> <tr> <th><?= t('Name') ?></th> @@ -20,13 +20,13 @@ <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'), 'Swimlane', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?> + <?= $this->url->link(t('Edit'), 'SwimlaneController', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?> </li> <li> <?php if ($default_swimlane['show_default_swimlane'] == 1): ?> - <?= $this->url->link(t('Disable'), 'Swimlane', 'disableDefault', array('project_id' => $project['id']), true) ?> + <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?> <?php else: ?> - <?= $this->url->link(t('Enable'), 'Swimlane', 'enableDefault', array('project_id' => $project['id']), true) ?> + <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?> <?php endif ?> </li> </ul> @@ -55,17 +55,17 @@ <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'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> + <?= $this->url->link(t('Edit'), 'SwimlaneController', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> </li> <li> <?php if ($swimlane['is_active']): ?> - <?= $this->url->link(t('Disable'), 'swimlane', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + <?= $this->url->link(t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> <?php else: ?> - <?= $this->url->link(t('Enable'), 'swimlane', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + <?= $this->url->link(t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> <?php endif ?> </li> <li> - <?= $this->url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> + <?= $this->url->link(t('Remove'), 'SwimlaneController', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> </li> </ul> </div> diff --git a/app/Template/task/details.php b/app/Template/task/details.php index 5b8b7c6d..fe2bba67 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -32,13 +32,13 @@ <?php if ($project['is_public']): ?> <li class="smaller"> <i class="fa fa-external-link fa-fw"></i> - <?= $this->url->link(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?> + <?= $this->url->link(t('Public link'), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?> </li> <?php endif ?> <?php if ($project['is_public'] && !$editable): ?> <li class="smaller"> <i class="fa fa-th fa-fw"></i> - <?= $this->url->link(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?> + <?= $this->url->link(t('Back to the board'), 'BoardViewController', 'readonly', array('token' => $project['token'])) ?> </li> <?php endif ?> <li class="smaller"> @@ -148,7 +148,7 @@ <?php if ($editable && empty($task['date_started'])): ?> <div class="task-summary-buttons"> - <?= $this->url->button('fa-play', t('Set start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->button('fa-play', t('Set start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </div> <?php endif ?> diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php index 887e1828..b6b9c789 100644 --- a/app/Template/task/dropdown.php +++ b/app/Template/task/dropdown.php @@ -4,24 +4,24 @@ <?php if (array_key_exists('date_started', $task) && empty($task['date_started'])): ?> <li> <i class="fa fa-play fa-fw"></i> - <?= $this->url->link(t('Set automatically the start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <?php endif ?> <li> <i class="fa fa-user fa-fw"></i> - <?= $this->url->link(t('Change assignee'), 'TaskPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Change assignee'), 'TaskPopoverController', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-tag fa-fw"></i> - <?= $this->url->link(t('Change category'), 'TaskPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Change category'), 'TaskPopoverController', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-pencil-square-o fa-fw"></i> - <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-align-left fa-fw"></i> - <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Edit the description'), 'TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-plus fa-fw"></i> @@ -29,46 +29,46 @@ </li> <li> <i class="fa fa-code-fork fa-fw"></i> - <?= $this->url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-external-link fa-fw"></i> - <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-comment-o fa-fw"></i> - <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-camera fa-fw"></i> - <?= $this->url->link(t('Add a screenshot'), 'TaskPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add a screenshot'), 'TaskPopoverController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-files-o fa-fw"></i> - <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-clipboard fa-fw"></i> - <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-clone fa-fw"></i> - <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <?php if ($this->user->canRemoveTask($task)): ?> <li> <i class="fa fa-trash-o fa-fw"></i> - <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <?php endif ?> <?php if (isset($task['is_active'])): ?> <li> <?php if ($task['is_active'] == 1): ?> <i class="fa fa-times fa-fw"></i> - <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?php else: ?> <i class="fa fa-check-square-o fa-fw"></i> - <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?php endif ?> </li> <?php endif ?> diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php index 4bc67406..00e0e9ae 100644 --- a/app/Template/task/layout.php +++ b/app/Template/task/layout.php @@ -1,13 +1,13 @@ <section id="main"> - <?= $this->projectHeader->render($project, 'Listing', 'show') ?> + <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?> <?= $this->hook->render('template:task:layout:top', array('task' => $task)) ?> <section class="sidebar-container" id="task-view" - data-edit-url="<?= $this->url->href('taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" - data-description-url="<?= $this->url->href('taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" + data-edit-url="<?= $this->url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" + data-description-url="<?= $this->url->href('TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" - data-internal-link-url="<?= $this->url->href('TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" - data-comment-url="<?= $this->url->href('comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> + data-internal-link-url="<?= $this->url->href('TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" + data-comment-url="<?= $this->url->href('CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> <?= $this->render($sidebar_template, array('task' => $task)) ?> diff --git a/app/Template/task/remove.php b/app/Template/task/remove.php deleted file mode 100644 index b869b646..00000000 --- a/app/Template/task/remove.php +++ /dev/null @@ -1,15 +0,0 @@ -<div class="page-header"> - <h2><?= t('Remove a task') ?></h2> -</div> - -<div class="confirm"> - <p class="alert alert-info"> - <?= t('Do you really want to remove this task: "%s"?', $this->text->e($task['title'])) ?> - </p> - - <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> - <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> - </div> -</div> diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 8f41d653..2b54eea8 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -3,7 +3,7 @@ <?= $this->render('task/details', array( 'task' => $task, 'project' => $project, - 'editable' => $this->user->hasProjectAccess('taskmodification', 'edit', $project['id']), + 'editable' => $this->user->hasProjectAccess('TaskModificationController', 'edit', $project['id']), )) ?> <?= $this->hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?> @@ -46,7 +46,7 @@ 'task' => $task, 'comments' => $comments, 'project' => $project, - 'editable' => $this->user->hasProjectAccess('comment', 'edit', $project['id']), + 'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']), )) ?> <?= $this->hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?> diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index 3dc518b4..e77ec18a 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -1,46 +1,46 @@ <div class="sidebar sidebar-icons"> <h2><?= t('Task #%d', $task['id']) ?></h2> <ul> - <li <?= $this->app->checkMenuSelection('task', 'show') ?>> + <li <?= $this->app->checkMenuSelection('TaskViewController', 'show') ?>> <i class="fa fa-newspaper-o fa-fw"></i> - <?= $this->url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> - <li <?= $this->app->checkMenuSelection('activity', 'task') ?>> + <li <?= $this->app->checkMenuSelection('ActivityController', 'task') ?>> <i class="fa fa-dashboard fa-fw"></i> - <?= $this->url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> - <li <?= $this->app->checkMenuSelection('task', 'transitions') ?>> + <li <?= $this->app->checkMenuSelection('TaskViewController', 'transitions') ?>> <i class="fa fa-arrows-h fa-fw"></i> - <?= $this->url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> - <li <?= $this->app->checkMenuSelection('task', 'analytics') ?>> + <li <?= $this->app->checkMenuSelection('TaskViewController', 'analytics') ?>> <i class="fa fa-bar-chart fa-fw"></i> - <?= $this->url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?> - <li <?= $this->app->checkMenuSelection('task', 'timetracking') ?>> + <li <?= $this->app->checkMenuSelection('TaskViewController', 'timetracking') ?>> <i class="fa fa-clock-o fa-fw"></i> - <?= $this->url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <?php endif ?> <?= $this->hook->render('template:task:sidebar:information', array('task' => $task)) ?> </ul> - <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> <h2><?= t('Actions') ?></h2> <ul> <li> <i class="fa fa-pencil-square-o fa-fw"></i> - <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-align-left fa-fw"></i> - <?= $this->url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Edit the description'), 'TaskModificationController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-refresh fa-rotate-90 fa-fw"></i> - <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrence', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-plus fa-fw"></i> @@ -48,49 +48,49 @@ </li> <li> <i class="fa fa-code-fork fa-fw"></i> - <?= $this->url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-external-link fa-fw"></i> - <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-comment-o fa-fw"></i> - <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-file fa-fw"></i> - <?= $this->url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-camera fa-fw"></i> - <?= $this->url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-files-o fa-fw"></i> - <?= $this->url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-clipboard fa-fw"></i> - <?= $this->url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <i class="fa fa-clone fa-fw"></i> - <?= $this->url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> </li> <li> <?php if ($task['is_active'] == 1): ?> <i class="fa fa-times fa-fw"></i> - <?= $this->url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?php else: ?> <i class="fa fa-check-square-o fa-fw"></i> - <?= $this->url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> <?php endif ?> </li> <?php if ($this->user->canRemoveTask($task)): ?> <li> <i class="fa fa-trash-o fa-fw"></i> - <?= $this->url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + <?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?> </li> <?php endif ?> diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php index d86273c5..1a179522 100644 --- a/app/Template/task/time_tracking_details.php +++ b/app/Template/task/time_tracking_details.php @@ -14,7 +14,7 @@ <th><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th> <th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th> <th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th> - <th class="column-10"><?= $subtask_paginator->order(t('Time spent'), \Kanboard\Model\SubtaskTimeTracking::TABLE.'.time_spent') ?></th> + <th class="column-10"><?= $subtask_paginator->order(t('Time spent'), \Kanboard\Model\SubtaskTimeTrackingModel::TABLE.'.time_spent') ?></th> </tr> <?php foreach ($subtask_paginator->getCollection() as $record): ?> <tr> diff --git a/app/Template/task_bulk/show.php b/app/Template/task_bulk/show.php index 5f76f808..1391c2c1 100644 --- a/app/Template/task_bulk/show.php +++ b/app/Template/task_bulk/show.php @@ -19,7 +19,7 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> - <?= t('or') ?> <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= t('or') ?> <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/task_creation/show.php b/app/Template/task_creation/show.php index cecf459d..7bebbfe9 100644 --- a/app/Template/task_creation/show.php +++ b/app/Template/task_creation/show.php @@ -48,6 +48,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button> - <?= t('or') ?> <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> + <?= t('or') ?> <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php index b7337a1e..58b4d837 100644 --- a/app/Template/task_duplication/copy.php +++ b/app/Template/task_duplication/copy.php @@ -6,7 +6,7 @@ <p class="alert"><?= t('There is no destination project available.') ?></p> <?php else: ?> - <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> + <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> @@ -17,7 +17,7 @@ $projects_list, $values, array(), - array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), + array('data-redirect="'.$this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> <span class="loading-icon" style="display: none"> <i class="fa fa-spinner fa-spin"></i></span> @@ -41,8 +41,8 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/task_duplication/duplicate.php b/app/Template/task_duplication/duplicate.php index 376f6b3b..c0baf94e 100644 --- a/app/Template/task_duplication/duplicate.php +++ b/app/Template/task_duplication/duplicate.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php index beebf9eb..8f01c4b9 100644 --- a/app/Template/task_duplication/move.php +++ b/app/Template/task_duplication/move.php @@ -6,7 +6,7 @@ <p class="alert"><?= t('There is no destination project available.') ?></p> <?php else: ?> - <form class="popover-form" method="post" action="<?= $this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> + <form class="popover-form" method="post" action="<?= $this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> @@ -17,7 +17,7 @@ $projects_list, $values, array(), - array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), + array('data-redirect="'.$this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> <span class="loading-icon" style="display: none"> <i class="fa fa-spinner fa-spin"></i></span> @@ -41,8 +41,8 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php index 5d49eef0..beddfc90 100644 --- a/app/Template/task_external_link/create.php +++ b/app/Template/task_external_link/create.php @@ -2,12 +2,12 @@ <h2><?= t('Add a new external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/task_external_link/edit.php b/app/Template/task_external_link/edit.php index dcbc2633..917a28b9 100644 --- a/app/Template/task_external_link/edit.php +++ b/app/Template/task_external_link/edit.php @@ -2,12 +2,12 @@ <h2><?= t('Edit external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php index 3977a66c..a88b29ce 100644 --- a/app/Template/task_external_link/find.php +++ b/app/Template/task_external_link/find.php @@ -2,7 +2,7 @@ <h2><?= t('Add a new external link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskExternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskExternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('task_id', array('task_id' => $task['id'])) ?> @@ -23,6 +23,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Next') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/task_external_link/remove.php b/app/Template/task_external_link/remove.php index 01535255..2a888a60 100644 --- a/app/Template/task_external_link/remove.php +++ b/app/Template/task_external_link/remove.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'TaskExternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'TaskExternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_external_link/table.php b/app/Template/task_external_link/table.php index 1f32f4dd..56ef0363 100644 --- a/app/Template/task_external_link/table.php +++ b/app/Template/task_external_link/table.php @@ -6,7 +6,7 @@ <th class="column-10"><?= t('Dependency') ?></th> <th class="column-15"><?= t('Creator') ?></th> <th class="column-15"><?= t('Date') ?></th> - <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?> <th class="column-5"><?= t('Action') ?></th> <?php endif ?> </tr> @@ -27,13 +27,13 @@ <td> <?= $this->dt->date($link['date_creation']) ?> </td> - <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?> <td> <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('Edit'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><?= $this->url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> + <li><?= $this->url->link(t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> + <li><?= $this->url->link(t('Remove'), 'TaskExternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> </ul> </div> </td> diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php index 4abe6634..e05cf829 100644 --- a/app/Template/task_file/create.php +++ b/app/Template/task_file/create.php @@ -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'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('View uploaded files'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </p> </div> @@ -18,7 +18,7 @@ <div id="file-dropzone" data-max-size="<?= $max_size ?>" - data-url="<?= $this->url->href('TaskFile', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> + data-url="<?= $this->url->href('TaskFileController', 'save', array('task_id' => $task['id'], 'project_id' => $task['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'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> diff --git a/app/Template/task_file/files.php b/app/Template/task_file/files.php index 5603014e..7ca59b1c 100644 --- a/app/Template/task_file/files.php +++ b/app/Template/task_file/files.php @@ -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('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + <?= $this->url->link(t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['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('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> </li> - <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?> <li> <i class="fa fa-trash fa-fw"></i> - <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> </li> <?php endif ?> </ul> @@ -44,4 +44,4 @@ </tr> <?php endforeach ?> </table> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/task_file/images.php b/app/Template/task_file/images.php index 55c098cb..81c33151 100644 --- a/app/Template/task_file/images.php +++ b/app/Template/task_file/images.php @@ -2,7 +2,7 @@ <div class="file-thumbnails"> <?php foreach ($images as $file): ?> <div class="file-thumbnail"> - <a href="<?= $this->url->href('FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewer', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a> + <a href="<?= $this->url->href('FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>" class="popover"><img src="<?= $this->url->href('FileViewerController', 'thumbnail', array('file_id' => $file['id'], 'project_id' => $task['project_id'], 'task_id' => $file['task_id'])) ?>" title="<?= $this->text->e($file['name']) ?>" alt="<?= $this->text->e($file['name']) ?>"></a> <div class="file-thumbnail-content"> <div class="file-thumbnail-title"> <div class="dropdown"> @@ -10,12 +10,12 @@ <ul> <li> <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'])) ?> + <?= $this->url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> </li> - <?php if ($this->user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?> <li> <i class="fa fa-trash fa-fw"></i> - <?= $this->url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + <?= $this->url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> </li> <?php endif ?> </ul> @@ -31,4 +31,4 @@ </div> <?php endforeach ?> </div> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php index fe601f6f..42894f05 100644 --- a/app/Template/task_file/remove.php +++ b/app/Template/task_file/remove.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'TaskFileController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php index 2880478d..6300159f 100644 --- a/app/Template/task_file/screenshot.php +++ b/app/Template/task_file/screenshot.php @@ -6,14 +6,14 @@ <p id="screenshot-inner"><?= t('Take a screenshot and press CTRL+V or ⌘+V to paste here.') ?></p> </div> -<form class="popover-form" action="<?= $this->url->href('TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post"> +<form class="popover-form" action="<?= $this->url->href('TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post"> <input type="hidden" name="screenshot"/> <?= $this->form->csrf() ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> -<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p>
\ No newline at end of file +<p class="alert alert-info"><?= t('This feature does not work with all browsers.') ?></p> diff --git a/app/Template/gantt/project.php b/app/Template/task_gantt/show.php index e6c8592f..c5d338fb 100644 --- a/app/Template/gantt/project.php +++ b/app/Template/task_gantt/show.php @@ -1,18 +1,18 @@ <section id="main"> - <?= $this->projectHeader->render($project, 'Gantt', 'project') ?> + <?= $this->projectHeader->render($project, 'TaskGanttController', 'show') ?> <div class="menu-inline"> <ul> <li <?= $sorting === 'board' ? 'class="active"' : '' ?>> <i class="fa fa-sort-numeric-asc fa-fw"></i> - <?= $this->url->link(t('Sort by position'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'board')) ?> + <?= $this->url->link(t('Sort by position'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'board')) ?> </li> <li <?= $sorting === 'date' ? 'class="active"' : '' ?>> <i class="fa fa-sort-amount-asc fa-fw"></i> - <?= $this->url->link(t('Sort by date'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'date')) ?> + <?= $this->url->link(t('Sort by date'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'date')) ?> </li> <li> <i class="fa fa-plus fa-fw"></i> - <?= $this->url->link(t('Add task'), 'gantt', 'task', array('project_id' => $project['id']), false, 'popover') ?> + <?= $this->url->link(t('Add task'), 'TaskGanttCreationController', 'show', array('project_id' => $project['id']), false, 'popover') ?> </li> </ul> </div> @@ -21,7 +21,7 @@ <div id="gantt-chart" data-records='<?= json_encode($tasks, JSON_HEX_APOS) ?>' - data-save-url="<?= $this->url->href('gantt', 'saveTaskDate', array('project_id' => $project['id'])) ?>" + data-save-url="<?= $this->url->href('TaskGanttController', 'save', array('project_id' => $project['id'])) ?>" data-label-start-date="<?= t('Start date:') ?>" data-label-end-date="<?= t('Due date:') ?>" data-label-assignee="<?= t('Assignee:') ?>" @@ -31,4 +31,4 @@ <?php else: ?> <p class="alert"><?= t('There is no task in your project.') ?></p> <?php endif ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/gantt/task_creation.php b/app/Template/task_gantt_creation/show.php index 448a808d..683bc8c8 100644 --- a/app/Template/gantt/task_creation.php +++ b/app/Template/task_gantt_creation/show.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('New task') ?></h2> </div> -<form method="post" action="<?= $this->url->href('gantt', 'saveTask', array('project_id' => $values['project_id'])) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('TaskGanttCreationController', 'save', array('project_id' => $values['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('project_id', $values) ?> <?= $this->form->hidden('column_id', $values) ?> @@ -30,6 +30,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskGanttController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/task_import/step1.php b/app/Template/task_import/show.php index abb43505..cc6a7b3a 100644 --- a/app/Template/task_import/step1.php +++ b/app/Template/task_import/show.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Tasks Importation') ?></h2> </div> -<form action="<?= $this->url->href('taskImport', 'step2', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data"> +<form action="<?= $this->url->href('TaskImportController', 'save', array('project_id' => $project['id'])) ?>" method="post" enctype="multipart/form-data"> <?= $this->form->csrf() ?> <?= $this->form->label(t('Delimiter'), 'delimiter') ?> @@ -31,4 +31,4 @@ <li><?= t('The due date must use the ISO format: YYYY-MM-DD') ?></li> </ul> </div> -<p><i class="fa fa-download fa-fw"></i><?= $this->url->link(t('Download CSV template'), 'taskImport', 'template', array('project_id' => $project['id'])) ?></p>
\ No newline at end of file +<p><i class="fa fa-download fa-fw"></i><?= $this->url->link(t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?></p> diff --git a/app/Template/task_import/sidebar.php b/app/Template/task_import/sidebar.php new file mode 100644 index 00000000..4cd92af8 --- /dev/null +++ b/app/Template/task_import/sidebar.php @@ -0,0 +1,9 @@ +<div class="sidebar"> + <h2><?= t('Imports') ?></h2> + <ul> + <li <?= $this->app->checkMenuSelection('TaskImportController', 'show') ?>> + <?= $this->url->link(t('Tasks').' (CSV)', 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> + </li> + <?= $this->hook->render('template:task-import:sidebar') ?> + </ul> +</div> diff --git a/app/Template/task_internal_link/create.php b/app/Template/task_internal_link/create.php index 94dcdd66..fed29605 100644 --- a/app/Template/task_internal_link/create.php +++ b/app/Template/task_internal_link/create.php @@ -2,7 +2,7 @@ <h2><?= t('Add a new link') ?></h2> </div> -<form class="popover-form" action="<?= $this->url->href('TaskInternalLink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> +<form class="popover-form" action="<?= $this->url->href('TaskInternalLinkController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('task_id', array('task_id' => $task['id'])) ?> @@ -21,13 +21,13 @@ 'placeholder="'.t('Start to type task title...').'"', 'title="'.t('Start to type task title...').'"', 'data-dst-field="opposite_task_id"', - 'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + 'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', ), 'autocomplete') ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/task_internal_link/edit.php b/app/Template/task_internal_link/edit.php index 03622df7..f4df57bd 100644 --- a/app/Template/task_internal_link/edit.php +++ b/app/Template/task_internal_link/edit.php @@ -2,7 +2,7 @@ <h2><?= t('Edit link') ?></h2> </div> -<form action="<?= $this->url->href('TaskInternalLink', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off"> +<form action="<?= $this->url->href('TaskInternalLinkController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'link_id' => $task_link['id'])) ?>" method="post" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> @@ -22,13 +22,13 @@ 'placeholder="'.t('Start to type task title...').'"', 'title="'.t('Start to type task title...').'"', 'data-dst-field="opposite_task_id"', - 'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + 'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', ), 'autocomplete') ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/task_internal_link/remove.php b/app/Template/task_internal_link/remove.php index 82156ece..966ad116 100644 --- a/app/Template/task_internal_link/remove.php +++ b/app/Template/task_internal_link/remove.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'TaskInternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'TaskInternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_internal_link/table.php b/app/Template/task_internal_link/table.php index 57a3536c..424d4791 100644 --- a/app/Template/task_internal_link/table.php +++ b/app/Template/task_internal_link/table.php @@ -24,7 +24,7 @@ <?php if ($is_public): ?> <?= $this->url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', + 'TaskViewController', 'readonly', array('task_id' => $link['task_id'], 'token' => $project['token']), false, @@ -33,7 +33,7 @@ <?php else: ?> <?= $this->url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', + 'TaskViewController', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), false, @@ -72,8 +72,8 @@ <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('Edit'), 'TaskInternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> - <li><?= $this->url->link(t('Remove'), 'TaskInternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> + <li><?= $this->url->link(t('Edit'), 'TaskInternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> + <li><?= $this->url->link(t('Remove'), 'TaskInternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li> </ul> </div> </td> diff --git a/app/Template/listing/show.php b/app/Template/task_list/show.php index a5cba1c4..bb95b6a3 100644 --- a/app/Template/listing/show.php +++ b/app/Template/task_list/show.php @@ -1,5 +1,5 @@ <section id="main"> - <?= $this->projectHeader->render($project, 'Listing', 'show') ?> + <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?> <?php if ($paginator->isEmpty()): ?> <p class="alert"><?= t('No tasks found.') ?></p> @@ -18,7 +18,7 @@ <?php foreach ($paginator->getCollection() as $task): ?> <tr> <td class="task-table color-<?= $task['color_id'] ?>"> - <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> <?= $this->render('task/dropdown', array('task' => $task)) ?> <?php else: ?> #<?= $task['id'] ?> @@ -34,7 +34,7 @@ <?= $this->text->e($task['category_name']) ?> </td> <td> - <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> </td> <td> <?php if ($task['assignee_username']): ?> @@ -47,7 +47,7 @@ <?= $this->dt->date($task['date_due']) ?> </td> <td> - <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?> + <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?> <?= t('Open') ?> <?php else: ?> <?= t('Closed') ?> diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php index 801b4005..339ed036 100644 --- a/app/Template/task_modification/edit_description.php +++ b/app/Template/task_modification/edit_description.php @@ -2,7 +2,7 @@ <h2><?= t('Edit the description') ?></h2> </div> -<form class="popover-form" method="post" action="<?= $this->url->href('taskmodification', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> +<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'updateDescription', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> @@ -22,6 +22,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php index 5ddec5ea..0707fd9a 100644 --- a/app/Template/task_modification/edit_task.php +++ b/app/Template/task_modification/edit_task.php @@ -1,8 +1,7 @@ <div class="page-header"> <h2><?= t('Edit a task') ?></h2> </div> -<form class="popover-form" method="post" action="<?= $this->url->href('taskmodification', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> - +<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->hidden('id', $values) ?> <?= $this->form->hidden('project_id', $values) ?> @@ -34,6 +33,6 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> diff --git a/app/Template/task_popover/change_assignee.php b/app/Template/task_popover/change_assignee.php index bf68c34d..02f3e198 100644 --- a/app/Template/task_popover/change_assignee.php +++ b/app/Template/task_popover/change_assignee.php @@ -2,7 +2,7 @@ <div class="page-header"> <h2><?= t('Change assignee for the task "%s"', $values['title']) ?></h2> </div> - <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>"> + <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateAssignee', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>"> <?= $this->form->csrf() ?> @@ -14,7 +14,7 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> </section> diff --git a/app/Template/task_popover/change_category.php b/app/Template/task_popover/change_category.php index 0364e660..eb6a373d 100644 --- a/app/Template/task_popover/change_category.php +++ b/app/Template/task_popover/change_category.php @@ -2,7 +2,7 @@ <div class="page-header"> <h2><?= t('Change category for the task "%s"', $values['title']) ?></h2> </div> - <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopover', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>"> + <form class="popover-form" method="post" action="<?= $this->url->href('TaskPopoverController', 'updateCategory', array('task_id' => $values['id'], 'project_id' => $project['id'])) ?>"> <?= $this->form->csrf() ?> @@ -14,7 +14,7 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> </div> </form> </section> diff --git a/app/Template/task_recurrence/edit.php b/app/Template/task_recurrence/edit.php index 0f5d611a..09d14826 100644 --- a/app/Template/task_recurrence/edit.php +++ b/app/Template/task_recurrence/edit.php @@ -2,7 +2,7 @@ <h2><?= t('Edit recurrence') ?></h2> </div> -<?php if ($task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_NONE): ?> +<?php if ($task['recurrence_status'] != \Kanboard\Model\TaskModel::RECURRING_STATUS_NONE): ?> <div class="listing"> <?= $this->render('task_recurrence/info', array( 'task' => $task, @@ -13,9 +13,9 @@ </div> <?php endif ?> -<?php if ($task['recurrence_status'] != \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?> +<?php if ($task['recurrence_status'] != \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?> - <form class="popover-form" method="post" action="<?= $this->url->href('TaskRecurrence', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> + <form class="popover-form" method="post" action="<?= $this->url->href('TaskRecurrenceController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> @@ -40,8 +40,8 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Save') ?></button> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> </form> -<?php endif ?>
\ No newline at end of file +<?php endif ?> diff --git a/app/Template/task_recurrence/info.php b/app/Template/task_recurrence/info.php index 1a6574df..04d58c7f 100644 --- a/app/Template/task_recurrence/info.php +++ b/app/Template/task_recurrence/info.php @@ -1,7 +1,7 @@ <ul> - <?php if ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PENDING): ?> + <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?> <li><?= t('Recurrent task is scheduled to be generated') ?></li> - <?php elseif ($task['recurrence_status'] == \Kanboard\Model\Task::RECURRING_STATUS_PROCESSED): ?> + <?php elseif ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?> <li><?= t('Recurrent task has been generated:') ?> <ul> <li> @@ -24,14 +24,14 @@ <?php if ($task['recurrence_parent']): ?> <li> <?= t('This task has been created by: ') ?> - <?= $this->url->link('#'.$task['recurrence_parent'], 'task', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link('#'.$task['recurrence_parent'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?> </li> <?php endif ?> <?php if ($task['recurrence_child']): ?> <li> <?= t('This task has created this child task: ') ?> - <?= $this->url->link('#'.$task['recurrence_child'], 'task', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link('#'.$task['recurrence_child'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?> </li> <?php endif ?> <?php endif ?> -</ul>
\ No newline at end of file +</ul> diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php index 7d200544..2d7b0ce5 100644 --- a/app/Template/task_status/close.php +++ b/app/Template/task_status/close.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> + <?= $this->url->link(t('Yes'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php index 5d19bfbe..242b5db5 100644 --- a/app/Template/task_status/open.php +++ b/app/Template/task_status/open.php @@ -8,8 +8,8 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> + <?= $this->url->link(t('Yes'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> <?= t('or') ?> - <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> </div> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/task_suppression/remove.php b/app/Template/task_suppression/remove.php new file mode 100644 index 00000000..5d0f7720 --- /dev/null +++ b/app/Template/task_suppression/remove.php @@ -0,0 +1,15 @@ +<div class="page-header"> + <h2><?= t('Remove a task') ?></h2> +</div> + +<div class="confirm"> + <p class="alert alert-info"> + <?= t('Do you really want to remove this task: "%s"?', $this->text->e($task['title'])) ?> + </p> + + <div class="form-actions"> + <?= $this->url->link(t('Yes'), 'TaskSuppressionController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => $redirect), true, 'btn btn-red popover-link') ?> + <?= t('or') ?> + <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + </div> +</div> diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php index b0cb4825..06801d50 100644 --- a/app/Template/twofactor/check.php +++ b/app/Template/twofactor/check.php @@ -1,4 +1,4 @@ -<form method="post" action="<?= $this->url->href('twofactor', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('TwoFactorController', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->label(t('Code'), 'code') ?> @@ -7,4 +7,4 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/twofactor/disable.php b/app/Template/twofactor/disable.php index bdbe1233..bc419181 100644 --- a/app/Template/twofactor/disable.php +++ b/app/Template/twofactor/disable.php @@ -8,7 +8,7 @@ </p> <div class="form-actions"> - <?= $this->url->link(t('Yes'), 'twofactor', 'disable', array('user_id' => $user['id'], 'disable' => 'yes'), true, 'btn btn-red') ?> + <?= $this->url->link(t('Yes'), 'TwoFactorController', 'disable', array('user_id' => $user['id'], 'disable' => 'yes'), true, 'btn btn-red') ?> <?= t('or') ?> <?= $this->url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> </div> </div> diff --git a/app/Template/twofactor/index.php b/app/Template/twofactor/index.php index 6de36514..1ed414ed 100644 --- a/app/Template/twofactor/index.php +++ b/app/Template/twofactor/index.php @@ -2,7 +2,7 @@ <h2><?= t('Two factor authentication') ?></h2> </div> -<form method="post" action="<?= $this->url->href('twofactor', $user['twofactor_activated'] == 1 ? 'deactivate' : 'show', array('user_id' => $user['id'])) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('TwoFactorController', $user['twofactor_activated'] == 1 ? 'deactivate' : 'show', array('user_id' => $user['id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <p><?= t('Two-Factor Provider: ') ?><strong><?= $this->text->e($provider) ?></strong></p> <div class="form-actions"> diff --git a/app/Template/twofactor/show.php b/app/Template/twofactor/show.php index 59897e20..0aeef427 100644 --- a/app/Template/twofactor/show.php +++ b/app/Template/twofactor/show.php @@ -19,7 +19,7 @@ <?php endif ?> <h3><?= t('Test your device') ?></h3> -<form method="post" action="<?= $this->url->href('twofactor', 'test', array('user_id' => $user['id'])) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('TwoFactorController', 'test', array('user_id' => $user['id'])) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->label(t('Code'), 'code') ?> @@ -28,4 +28,4 @@ <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Check my code') ?></button> </div> -</form>
\ No newline at end of file +</form> diff --git a/app/Template/user_view/share.php b/app/Template/user_view/share.php index 9ef150e8..570b766e 100644 --- a/app/Template/user_view/share.php +++ b/app/Template/user_view/share.php @@ -5,8 +5,8 @@ <?php if (! empty($user['token'])): ?> <div class="listing"> <ul class="no-bullet"> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> </ul> </div> <?= $this->url->link(t('Disable public access'), 'UserViewController', 'share', array('user_id' => $user['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 390a1e45..fc11f8a1 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -37,8 +37,8 @@ <div class="listing"> <ul class="no-bullet"> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> </ul> </div> <?php endif ?> diff --git a/app/Template/user_view/sidebar.php b/app/Template/user_view/sidebar.php index 5eb0457b..d200a7f5 100644 --- a/app/Template/user_view/sidebar.php +++ b/app/Template/user_view/sidebar.php @@ -38,7 +38,7 @@ <?= $this->url->link(t('Edit profile'), 'UserModificationController', 'show', array('user_id' => $user['id'])) ?> </li> <li <?= $this->app->checkMenuSelection('AvatarFile') ?>> - <?= $this->url->link(t('Avatar'), 'AvatarFile', 'show', array('user_id' => $user['id'])) ?> + <?= $this->url->link(t('Avatar'), 'AvatarFileController', 'show', array('user_id' => $user['id'])) ?> </li> <?php endif ?> @@ -49,12 +49,12 @@ <?php endif ?> <?php if ($this->user->isCurrentUser($user['id'])): ?> - <li <?= $this->app->checkMenuSelection('twofactor', 'index') ?>> - <?= $this->url->link(t('Two factor authentication'), 'twofactor', 'index', array('user_id' => $user['id'])) ?> + <li <?= $this->app->checkMenuSelection('TwoFactorController', 'index') ?>> + <?= $this->url->link(t('Two factor authentication'), 'TwoFactorController', 'index', array('user_id' => $user['id'])) ?> </li> - <?php elseif ($this->user->hasAccess('twofactor', 'disable') && $user['twofactor_activated'] == 1): ?> - <li <?= $this->app->checkMenuSelection('twofactor', 'disable') ?>> - <?= $this->url->link(t('Two factor authentication'), 'twofactor', 'disable', array('user_id' => $user['id'])) ?> + <?php elseif ($this->user->hasAccess('TwoFactorController', 'disable') && $user['twofactor_activated'] == 1): ?> + <li <?= $this->app->checkMenuSelection('TwoFactorController', 'disable') ?>> + <?= $this->url->link(t('Two factor authentication'), 'TwoFactorController', 'disable', array('user_id' => $user['id'])) ?> </li> <?php endif ?> diff --git a/app/Template/user_view/timesheet.php b/app/Template/user_view/timesheet.php index 92ebafb5..3df57492 100644 --- a/app/Template/user_view/timesheet.php +++ b/app/Template/user_view/timesheet.php @@ -16,8 +16,8 @@ </tr> <?php foreach ($subtask_paginator->getCollection() as $record): ?> <tr> - <td><?= $this->url->link($this->text->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td> - <td><?= $this->url->link($this->text->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td> + <td><?= $this->url->link($this->text->e($record['task_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td> + <td><?= $this->url->link($this->text->e($record['subtask_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td> <td><?= $this->dt->datetime($record['start']) ?></td> <td><?= $this->dt->datetime($record['end']) ?></td> <td><?= n($record['time_spent']).' '.t('hours') ?></td> @@ -26,4 +26,4 @@ </table> <?= $subtask_paginator ?> -<?php endif ?>
\ No newline at end of file +<?php endif ?> |