diff options
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/action/event.php (renamed from app/Template/action_event.php) | 7 | ||||
| -rw-r--r-- | app/Template/action/index.php (renamed from app/Template/action_index.php) | 5 | ||||
| -rw-r--r-- | app/Template/action/params.php (renamed from app/Template/action_params.php) | 7 | ||||
| -rw-r--r-- | app/Template/action/remove.php (renamed from app/Template/action_remove.php) | 3 | ||||
| -rw-r--r-- | app/Template/app/forbidden.php (renamed from app/Template/app_forbidden.php) | 0 | ||||
| -rw-r--r-- | app/Template/app/index.php (renamed from app/Template/app_index.php) | 0 | ||||
| -rw-r--r-- | app/Template/app/notfound.php (renamed from app/Template/app_notfound.php) | 0 | ||||
| -rw-r--r-- | app/Template/board/assignee.php (renamed from app/Template/board_assignee.php) | 15 | ||||
| -rw-r--r-- | app/Template/board/category.php (renamed from app/Template/board_category.php) | 14 | ||||
| -rw-r--r-- | app/Template/board/edit.php (renamed from app/Template/board_edit.php) | 7 | ||||
| -rw-r--r-- | app/Template/board/filters.php | 35 | ||||
| -rw-r--r-- | app/Template/board/index.php | 21 | ||||
| -rw-r--r-- | app/Template/board/remove.php (renamed from app/Template/board_remove.php) | 0 | ||||
| -rw-r--r-- | app/Template/board/rename.php (renamed from app/Template/board_public.php) | 2 | ||||
| -rw-r--r-- | app/Template/board/show.php (renamed from app/Template/board_show.php) | 10 | ||||
| -rw-r--r-- | app/Template/board/task.php (renamed from app/Template/board_task.php) | 38 | ||||
| -rw-r--r-- | app/Template/board_index.php | 50 | ||||
| -rw-r--r-- | app/Template/layout.php | 2 |
18 files changed, 117 insertions, 99 deletions
diff --git a/app/Template/action_event.php b/app/Template/action/event.php index eee41780..565e900c 100644 --- a/app/Template/action_event.php +++ b/app/Template/action/event.php @@ -3,8 +3,10 @@ </div> <h3><?= t('Choose an event') ?></h3> -<form method="post" action="?controller=action&action=params&project_id=<?= $project['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('action', 'params', array('project_id' => $project['id'])) ?>"> + <?= Helper\form_csrf() ?> + <?= Helper\form_hidden('project_id', $values) ?> <?= Helper\form_hidden('action_name', $values) ?> @@ -17,6 +19,7 @@ <div class="form-actions"> <input type="submit" value="<?= t('Next step') ?>" class="btn btn-blue"/> - <?= t('or') ?> <a href="?controller=action&action=index&project_id=<?= $project['id'] ?>"><?= t('cancel') ?></a> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?> </div> </form>
\ No newline at end of file diff --git a/app/Template/action_index.php b/app/Template/action/index.php index 30874591..85839098 100644 --- a/app/Template/action_index.php +++ b/app/Template/action/index.php @@ -42,17 +42,16 @@ </ul> </td> <td> - <a href="?controller=action&action=confirm&project_id=<?= $project['id'] ?>&action_id=<?= $action['id'] ?>"><?= t('Remove') ?></a> + <?= Helper\a(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id'])) ?> </td> </tr> <?php endforeach ?> - </table> <?php endif ?> <h3><?= t('Add an action') ?></h3> -<form method="post" action="?controller=action&action=event&project_id=<?= $project['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('action', 'event', array('project_id' => $project['id'])) ?>"> <?= Helper\form_csrf() ?> <?= Helper\form_hidden('project_id', $values) ?> diff --git a/app/Template/action_params.php b/app/Template/action/params.php index f647149b..f221d92e 100644 --- a/app/Template/action_params.php +++ b/app/Template/action/params.php @@ -3,8 +3,10 @@ </div> <h3><?= t('Define action parameters') ?></h3> -<form method="post" action="?controller=action&action=create&project_id=<?= $project['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('action', 'create', array('project_id' => $project['id'])) ?>" autocomplete="off"> + <?= Helper\form_csrf() ?> + <?= Helper\form_hidden('project_id', $values) ?> <?= Helper\form_hidden('event_name', $values) ?> <?= Helper\form_hidden('action_name', $values) ?> @@ -35,6 +37,7 @@ <div class="form-actions"> <input type="submit" value="<?= t('Save this action') ?>" class="btn btn-blue"/> - <?= t('or') ?> <a href="?controller=action&action=index&project_id=<?= $project['id'] ?>"><?= t('cancel') ?></a> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?> </div> </form>
\ No newline at end of file diff --git a/app/Template/action_remove.php b/app/Template/action/remove.php index 668067da..131c2b54 100644 --- a/app/Template/action_remove.php +++ b/app/Template/action/remove.php @@ -9,6 +9,7 @@ <div class="form-actions"> <?= Helper\a(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?> - <?= t('or') ?> <?= Helper\a(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?> </div> </div>
\ No newline at end of file diff --git a/app/Template/app_forbidden.php b/app/Template/app/forbidden.php index 96e76115..96e76115 100644 --- a/app/Template/app_forbidden.php +++ b/app/Template/app/forbidden.php diff --git a/app/Template/app_index.php b/app/Template/app/index.php index 1aa5819a..1aa5819a 100644 --- a/app/Template/app_index.php +++ b/app/Template/app/index.php diff --git a/app/Template/app_notfound.php b/app/Template/app/notfound.php index 686f1fa0..686f1fa0 100644 --- a/app/Template/app_notfound.php +++ b/app/Template/app/notfound.php diff --git a/app/Template/board_assignee.php b/app/Template/board/assignee.php index 41ede32b..434daa51 100644 --- a/app/Template/board_assignee.php +++ b/app/Template/board/assignee.php @@ -1,24 +1,21 @@ <section id="main"> - - <div class="page-header board"> - <h2><?= t('Project "%s"', $current_project_name) ?></h2> - </div> - <section> <h3><?= t('Change assignee for the task "%s"', $values['title']) ?></h3> - <form method="post" action="?controller=board&action=updateAssignee" autocomplete="off"> + <form method="post" action="<?= Helper\u('board', 'updateAssignee', array('task_id' => $values['id'])) ?>"> + <?= Helper\form_csrf() ?> + <?= Helper\form_hidden('id', $values) ?> <?= Helper\form_hidden('project_id', $values) ?> <?= Helper\form_label(t('Assignee'), 'owner_id') ?> - <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/> + <?= Helper\form_select('owner_id', $users_list, $values) ?><br/> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> - <?= t('or') ?> <a href="?controller=board&action=show&project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $project['id'])) ?> </div> </form> </section> - </section>
\ No newline at end of file diff --git a/app/Template/board_category.php b/app/Template/board/category.php index 36126a1d..88d8e71c 100644 --- a/app/Template/board_category.php +++ b/app/Template/board/category.php @@ -1,22 +1,20 @@ <section id="main"> - - <div class="page-header board"> - <h2><?= t('Project "%s"', $current_project_name) ?></h2> - </div> - <section> <h3><?= t('Change category for the task "%s"', $values['title']) ?></h3> - <form method="post" action="?controller=board&action=updateCategory" autocomplete="off"> + <form method="post" action="<?= Helper\u('board', 'updateCategory', array('task_id' => $values['id'])) ?>"> + <?= Helper\form_csrf() ?> + <?= Helper\form_hidden('id', $values) ?> <?= Helper\form_hidden('project_id', $values) ?> <?= Helper\form_label(t('Category'), 'category_id') ?> - <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/> + <?= Helper\form_select('category_id', $categories_list, $values) ?><br/> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> - <?= t('or') ?> <a href="?controller=board&action=show&project_id=<?= $values['project_id'] ?>"><?= t('cancel') ?></a> + <?= t('or') ?> + <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $project['id'])) ?> </div> </form> </section> diff --git a/app/Template/board_edit.php b/app/Template/board/edit.php index cfaebc50..2c3236e2 100644 --- a/app/Template/board_edit.php +++ b/app/Template/board/edit.php @@ -4,7 +4,7 @@ <section> <h3><?= t('Change columns') ?></h3> -<form method="post" action="?controller=board&action=update&project_id=<?= $project['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('board', 'update', array('project_id' => $project['id'])) ?>" autocomplete="off"> <?= Helper\form_csrf() ?> <?php $i = 0; ?> <table> @@ -46,9 +46,12 @@ </form> <h3><?= t('Add a new column') ?></h3> -<form method="post" action="?controller=board&action=add&project_id=<?= $project['id'] ?>" autocomplete="off"> +<form method="post" action="<?= Helper\u('board', 'add', array('project_id' => $project['id'])) ?>" autocomplete="off"> + <?= Helper\form_csrf() ?> + <?= Helper\form_hidden('project_id', $values) ?> + <?= Helper\form_label(t('Title'), 'title') ?> <?= Helper\form_text('title', $values, $errors, array('required')) ?> diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php new file mode 100644 index 00000000..21e51d98 --- /dev/null +++ b/app/Template/board/filters.php @@ -0,0 +1,35 @@ +<div class="page-header"> + <ul> + <li> + <?= t('Filter by user') ?> + <?= Helper\form_select('user_id', $users) ?> + </li> + <li> + <?= t('Filter by category') ?> + <?= Helper\form_select('category_id', $categories) ?> + </li> + <li> + <a href="#" id="filter-due-date"><?= t('Filter by due date') ?></a> + </li> + <li> + <i class="fa fa-search"></i> + <?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $project['id'])) ?> + </li> + <li> + <i class="fa fa-check-square-o fa-fw"></i> + <?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $project['id'])) ?> + </li> + <li> + <i class="fa fa-dashboard fa-fw"></i> + <?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $project['id'])) ?> + </li> + <li> + <i class="fa fa-line-chart fa-fw"></i> + <?= Helper\a(t('Analytics'), 'analytic', 'repartition', array('project_id' => $project['id'])) ?> + </li> + <?php if (Helper\is_admin()): ?> + <li><i class="fa fa-cog fa-fw"></i> + <?= Helper\a(t('Configure'), 'project', 'show', array('project_id' => $project['id'])) ?> + <?php endif ?> + </ul> +</div>
\ No newline at end of file diff --git a/app/Template/board/index.php b/app/Template/board/index.php new file mode 100644 index 00000000..21040373 --- /dev/null +++ b/app/Template/board/index.php @@ -0,0 +1,21 @@ +<section id="main"> + + <?= Helper\template('board/filters', array( + 'categories' => $categories, + 'users' => $users, + 'project' => $project, + )) ?> + + <?php if (empty($board)): ?> + <p class="alert alert-error"><?= t('There is no column in your project!') ?></p> + <?php else: ?> + <?= Helper\template('board/show', array( + 'project' => $project, + 'board' => $board, + 'categories' => $categories, + 'board_private_refresh_interval' => $board_private_refresh_interval, + 'board_highlight_period' => $board_highlight_period, + )) ?> + <?php endif ?> + +</section> diff --git a/app/Template/board_remove.php b/app/Template/board/remove.php index 4529063b..4529063b 100644 --- a/app/Template/board_remove.php +++ b/app/Template/board/remove.php diff --git a/app/Template/board_public.php b/app/Template/board/rename.php index 85c90cfa..6514b0e5 100644 --- a/app/Template/board_public.php +++ b/app/Template/board/rename.php @@ -21,7 +21,7 @@ <?php foreach ($column['tasks'] as $task): ?> <div class="task-board task-<?= $task['color_id'] ?>"> - <?= Helper\template('board_task', array('task' => $task, 'categories' => $categories, 'not_editable' => true, 'project' => $project)) ?> + <?= Helper\template('board/task', array('task' => $task, 'categories' => $categories, 'not_editable' => true, 'project' => $project)) ?> </div> <?php endforeach ?> diff --git a/app/Template/board_show.php b/app/Template/board/show.php index 4865ce5c..66e8b46d 100644 --- a/app/Template/board_show.php +++ b/app/Template/board/show.php @@ -1,8 +1,9 @@ <table id="board" - data-project-id="<?= $current_project_id ?>" - data-time="<?= time() ?>" + data-project-id="<?= $project['id'] ?>" data-check-interval="<?= $board_private_refresh_interval ?>" - data-csrf-token=<?= \Core\Security::getCSRFToken() ?>> + data-save-url="<?= Helper\u('board', 'save', array('project_id' => $project['id'])) ?>" + data-check-url="<?= Helper\u('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" +> <tr> <?php $column_with = round(100 / count($board), 2); ?> <?php foreach ($board as $column): ?> @@ -37,9 +38,10 @@ data-owner-id="<?= $task['owner_id'] ?>" data-category-id="<?= $task['category_id'] ?>" data-due-date="<?= $task['date_due'] ?>" + data-task-url="<?= Helper\u('task', 'show', array('task_id' => $task['id'])) ?>" title="<?= t('View this task') ?>"> - <?= Helper\template('board_task', array('task' => $task, 'categories' => $categories)) ?> + <?= Helper\template('board/task', array('task' => $task, 'categories' => $categories)) ?> </div> <?php endforeach ?> diff --git a/app/Template/board_task.php b/app/Template/board/task.php index ca854f37..02ae46c1 100644 --- a/app/Template/board_task.php +++ b/app/Template/board/task.php @@ -1,6 +1,6 @@ <?php if (isset($not_editable)): ?> - <a href="?controller=task&action=readonly&task_id=<?= $task['id'] ?>&token=<?= $project['token'] ?>">#<?= $task['id'] ?></a> + <?= Helper\a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> <?php if ($task['reference']): ?> <span class="task-board-reference" title="<?= t('Reference') ?>"> @@ -23,14 +23,12 @@ <?php endif ?> <div class="task-board-title"> - <a href="?controller=task&action=readonly&task_id=<?= $task['id'] ?>&token=<?= $project['token'] ?>"> - <?= Helper\escape($task['title']) ?> - </a> + <?= Helper\a(Helper\escape($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> </div> <?php else: ?> - <a class="task-edit-popover" href="?controller=task&action=edit&task_id=<?= $task['id'] ?>" title="<?= t('Edit this task') ?>">#<?= $task['id'] ?></a> + <?= Helper\a('#'.$task['id'], 'task', 'edit', array('task_id' => $task['id']), false, 'task-edit-popover', t('Edit this task')) ?> <?php if ($task['reference']): ?> <span class="task-board-reference" title="<?= t('Reference') ?>"> @@ -41,13 +39,15 @@ - <span class="task-board-user"> - <a class="assignee-popover" href="?controller=board&action=changeAssignee&task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>"> - <?php if (! empty($task['owner_id'])): ?> - <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></a> - <?php else: ?> - <?= t('Nobody assigned') ?> - <?php endif ?> - </a> + <?= Helper\a( + ! empty($task['owner_id']) ? t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned'), + 'board', + 'changeAssignee', + array('task_id' => $task['id']), + false, + 'assignee-popover', + t('Change assignee') + ) ?> </span> <?php if ($task['score']): ?> @@ -55,7 +55,7 @@ <?php endif ?> <div class="task-board-title"> - <a href="?controller=task&action=show&task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a> + <?= Helper\a(Helper\escape($task['title']), 'task', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?> </div> <?php endif ?> @@ -64,9 +64,15 @@ <?php if ($task['category_id']): ?> <div class="task-board-category-container"> <span class="task-board-category"> - <a class="category-popover" href="?controller=board&action=changeCategory&task_id=<?= $task['id'] ?>" title="<?= t('Change category') ?>"> - <?= Helper\in_list($task['category_id'], $categories) ?> - </a> + <?= Helper\a( + Helper\in_list($task['category_id'], $categories), + 'board', + 'changeCategory', + array('task_id' => $task['id']), + false, + 'category-popover', + t('Change category') + ) ?> </span> </div> <?php endif ?> diff --git a/app/Template/board_index.php b/app/Template/board_index.php deleted file mode 100644 index e478680f..00000000 --- a/app/Template/board_index.php +++ /dev/null @@ -1,50 +0,0 @@ -<section id="main"> - <div class="page-header"> - <ul> - <li> - <?= t('Filter by user') ?> - <?= Helper\form_select('user_id', $users, $filters) ?> - </li> - <li> - <?= t('Filter by category') ?> - <?= Helper\form_select('category_id', $categories, $filters) ?> - </li> - <li> - <a href="#" id="filter-due-date"><?= t('Filter by due date') ?></a> - </li> - <li> - <i class="fa fa-search"></i> - <?= Helper\a(t('Search'), 'project', 'search', array('project_id' => $current_project_id)) ?> - </li> - <li> - <i class="fa fa-check-square-o fa-fw"></i> - <?= Helper\a(t('Completed tasks'), 'project', 'tasks', array('project_id' => $current_project_id)) ?> - </li> - <li> - <i class="fa fa-dashboard fa-fw"></i> - <?= Helper\a(t('Activity'), 'project', 'activity', array('project_id' => $current_project_id)) ?> - </li> - <li> - <i class="fa fa-line-chart fa-fw"></i> - <?= Helper\a(t('Analytics'), 'analytic', 'repartition', array('project_id' => $current_project_id)) ?> - </li> - <?php if (Helper\is_admin()): ?> - <li><i class="fa fa-cog fa-fw"></i> - <?= Helper\a(t('Configure'), 'project', 'show', array('project_id' => $current_project_id)) ?> - <?php endif ?> - </ul> - </div> - - <?php if (empty($board)): ?> - <p class="alert alert-error"><?= t('There is no column in your project!') ?></p> - <?php else: ?> - <?= Helper\template('board_show', array( - 'current_project_id' => $current_project_id, - 'board' => $board, - 'categories' => $categories, - 'board_private_refresh_interval' => $board_private_refresh_interval, - 'board_highlight_period' => $board_highlight_period, - )) ?> - <?php endif ?> - -</section> diff --git a/app/Template/layout.php b/app/Template/layout.php index 58761414..31a4c407 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -34,7 +34,7 @@ <ul> <?php if (isset($board_selector) && ! empty($board_selector)): ?> <li> - <select id="board-selector" data-placeholder="<?= t('Display another project') ?>"> + <select id="board-selector" data-placeholder="<?= t('Display another project') ?>" data-board-url="<?= Helper\u('board', 'show', array('project_id' => '%d')) ?>"> <option value=""></option> <?php foreach($board_selector as $board_id => $board_name): ?> <option value="<?= $board_id ?>"><?= Helper\escape($board_name) ?></option> |