diff options
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/app/filters_helper.php | 2 | ||||
| -rw-r--r-- | app/Template/board/task_footer.php | 2 | ||||
| -rw-r--r-- | app/Template/config/about.php | 2 | ||||
| -rw-r--r-- | app/Template/gantt/project.php | 24 | ||||
| -rw-r--r-- | app/Template/project/dropdown.php | 4 | ||||
| -rw-r--r-- | app/Template/project/filters.php | 6 |
6 files changed, 17 insertions, 23 deletions
diff --git a/app/Template/app/filters_helper.php b/app/Template/app/filters_helper.php index e5aea82b..b7a0bba6 100644 --- a/app/Template/app/filters_helper.php +++ b/app/Template/app/filters_helper.php @@ -1,7 +1,7 @@ <div class="dropdown filters"> <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Filters') ?></a> <ul> - <li><a href="#" class="filter-helper" data-filter="<?= isset($reset) ? $reset : '' ?>"><?= t('Reset filters') ?></a></li> + <li><a href="#" class="filter-helper" data-filter="<?= isset($reset) ? $reset : '' ?>" title="<?= t('Keyboard shortcut: "%s"', 'r') ?>"><?= t('Reset filters') ?></a></li> <li><a href="#" class="filter-helper" data-filter="status:open assignee:me"><?= t('My tasks') ?></a></li> <li><a href="#" class="filter-helper" data-filter="status:open assignee:me due:tomorrow"><?= t('My tasks due tomorrow') ?></a></li> <li><a href="#" class="filter-helper" data-filter="status:open due:today"><?= t('Tasks due today') ?></a></li> diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index 2944db06..0fb5ea8d 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -66,7 +66,7 @@ <?php if ($task['is_milestone'] == 1): ?> <span title="<?= t('Milestone') ?>"> - <i class="fa fa-flag"></i> + <i class="fa fa-flag flag-milestone"></i> </span> <?php endif ?> </div> diff --git a/app/Template/config/about.php b/app/Template/config/about.php index c55233f4..e0652a2f 100644 --- a/app/Template/config/about.php +++ b/app/Template/config/about.php @@ -57,6 +57,7 @@ <li><?= t('Switch to the board view') ?> = <strong>v b</strong></li> <li><?= t('Switch to the calendar view') ?> = <strong>v c</strong></li> <li><?= t('Switch to the list view') ?> = <strong>v l</strong></li> + <li><?= t('Switch to the Gantt chart view') ?> = <strong>v g</strong></li> </ul> <h3><?= t('Board view') ?></h3> <ul> @@ -68,6 +69,7 @@ <ul> <li><?= t('Open board switcher') ?> = <strong>b</strong></li> <li><?= t('Go to the search/filter box') ?> = <strong>f</strong></li> + <li><?= t('Reset the search/filter box') ?> = <strong>r</strong></li> <li><?= t('Close dialog box') ?> = <strong>ESC</strong></li> <li><?= t('Submit a form') ?> = <strong>CTRL+ENTER</strong> <?= t('or') ?> <strong>⌘+ENTER</strong></li> </ul> diff --git a/app/Template/gantt/project.php b/app/Template/gantt/project.php index 7ad859c7..1face3b8 100644 --- a/app/Template/gantt/project.php +++ b/app/Template/gantt/project.php @@ -1,22 +1,12 @@ <section id="main"> - <div class="page-header"> + <?= $this->render('project/filters', array( + 'project' => $project, + 'filters' => $filters, + 'users_list' => $users_list, + )) ?> + + <div class="menu-inline"> <ul> - <li> - <span class="dropdown"> - <span> - <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a> - <ul> - <?= $this->render('project/dropdown', array('project' => $project)) ?> - </ul> - </span> - </span> - </li> - <li> - <i class="fa fa-th fa-fw"></i> - <?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $project['id'])) ?> - </li> - </ul> - <ul class="views toolbar"> <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')) ?> diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php index 7b599d60..0a53cc05 100644 --- a/app/Template/project/dropdown.php +++ b/app/Template/project/dropdown.php @@ -15,10 +15,6 @@ <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?> </li> <li> - <i class="fa fa-sliders fa-fw"></i> - <?= $this->url->link(t('Gantt chart'), 'gantt', 'project', array('project_id' => $project['id'])) ?> -</li> -<li> <i class="fa fa-pie-chart fa-fw"></i> <?= $this->url->link(t('Budget'), 'budget', 'index', array('project_id' => $project['id'])) ?> </li> diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php index b53e160e..ddbbbcf1 100644 --- a/app/Template/project/filters.php +++ b/app/Template/project/filters.php @@ -38,6 +38,12 @@ <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')) ?> </li> + <?php if ($this->user->isProjectManagementAllowed($project['id'])): ?> + <li <?= $filters['controller'] === 'gantt' ? 'class="active"' : '' ?>> + <i class="fa fa-sliders fa-fw"></i> + <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?> + </li> + <?php endif ?> </ul> <form method="get" action="<?= $this->url->dir() ?>" class="search"> <?= $this->form->hidden('controller', $filters) ?> |