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

Improve tags management in project settings

This commit is contained in:
Frederic Guillot 2017-02-18 14:08:38 -05:00
parent c7b7c060a6
commit 45771b685d
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controller/ProjectTagController.php
View File

@ -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,
)));
}

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

@ -28,7 +28,7 @@
<td>
<i class="fa fa-arrows-alt draggable-row-handle" title="<?= t('Change column position') ?>"></i>&nbsp;
<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'])) ?>

18
app/Template/project_tag/index.php
View File

@ -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 ?>