diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/ProjectTagController.php | 16 | ||||
| -rw-r--r-- | app/Template/column/index.php | 2 | ||||
| -rw-r--r-- | app/Template/project_tag/index.php | 18 |
3 files changed, 22 insertions, 14 deletions
diff --git a/app/Controller/ProjectTagController.php b/app/Controller/ProjectTagController.php index acf514d3..d225f0ca 100644 --- a/app/Controller/ProjectTagController.php +++ b/app/Controller/ProjectTagController.php @@ -18,8 +18,8 @@ class ProjectTagController extends BaseController $this->response->html($this->helper->layout->project('project_tag/index', array( 'project' => $project, - 'tags' => $this->tagModel->getAllByProject($project['id']), - 'title' => t('Project tags management'), + 'tags' => $this->tagModel->getAllByProject($project['id']), + 'title' => t('Project tags management'), ))); } @@ -33,8 +33,8 @@ class ProjectTagController extends BaseController $this->response->html($this->template->render('project_tag/create', array( 'project' => $project, - 'values' => $values, - 'errors' => $errors, + 'values' => $values, + 'errors' => $errors, ))); } @@ -69,9 +69,9 @@ class ProjectTagController extends BaseController $this->response->html($this->template->render('project_tag/edit', array( 'project' => $project, - 'tag' => $tag, - 'values' => $values, - 'errors' => $errors, + 'tag' => $tag, + 'values' => $values, + 'errors' => $errors, ))); } @@ -107,7 +107,7 @@ class ProjectTagController extends BaseController $tag = $this->tagModel->getById($tag_id); $this->response->html($this->template->render('project_tag/remove', array( - 'tag' => $tag, + 'tag' => $tag, 'project' => $project, ))); } diff --git a/app/Template/column/index.php b/app/Template/column/index.php index 3c60d021..7c29d4bf 100644 --- a/app/Template/column/index.php +++ b/app/Template/column/index.php @@ -28,7 +28,7 @@ <td> <i class="fa fa-arrows-alt draggable-row-handle" title="<?= t('Change column position') ?>"></i> <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> + <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a> <ul> <li> <?= $this->modal->medium('edit', t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?> diff --git a/app/Template/project_tag/index.php b/app/Template/project_tag/index.php index 29d7082b..7c347056 100644 --- a/app/Template/project_tag/index.php +++ b/app/Template/project_tag/index.php @@ -12,15 +12,23 @@ <?php else: ?> <table class="table-striped table-scrolling"> <tr> - <th class="column-80"><?= t('Tag') ?></th> - <th><?= t('Action') ?></th> + <th><?= t('Tag') ?></th> </tr> <?php foreach ($tags as $tag): ?> <tr> - <td><?= $this->text->e($tag['name']) ?></td> <td> - <?= $this->modal->medium('edit', t('Edit'), 'ProjectTagController', 'edit', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?> - <?= $this->modal->confirm('trash-o', t('Remove'), 'ProjectTagController', 'confirm', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?> + <div class="dropdown"> + <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a> + <ul> + <li> + <?= $this->modal->medium('edit', t('Edit'), 'ProjectTagController', 'edit', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?> + </li> + <li> + <?= $this->modal->confirm('trash-o', t('Remove'), 'ProjectTagController', 'confirm', array('tag_id' => $tag['id'], 'project_id' => $project['id'])) ?> + </li> + </ul> + </div> + <?= $this->text->e($tag['name']) ?> </td> </tr> <?php endforeach ?> |