diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | app/Template/action/index.php | 77 |
2 files changed, 38 insertions, 40 deletions
@@ -7,6 +7,7 @@ New features: Improvements: +* Simplify automatic actions table * Show category description in tooltip * Show category creation form in modal dialog * Prevent people to remove swimlanes that contains tasks diff --git a/app/Template/action/index.php b/app/Template/action/index.php index 90db0450..a889f588 100644 --- a/app/Template/action/index.php +++ b/app/Template/action/index.php @@ -14,13 +14,21 @@ <p class="alert"><?= t('There is no action at the moment.') ?></p> <?php else: ?> <table class="table-scrolling"> + <?php foreach ($actions as $action): ?> <tr> - <th class="column-60"><?= t('Automatic actions') ?></th> - <th class="column-25"><?= t('Action parameters') ?></th> - <th><?= t('Action') ?></th> - </tr> + <th> + <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->confirm('trash-o', t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id'])) ?> + </li> + </ul> + </div> - <?php foreach ($actions as $action): ?> + <?= $this->text->in($action['action_name'], $available_actions) ?> + </th> + </tr> <tr> <td> <ul> @@ -28,43 +36,32 @@ <?= t('Event name') ?> = <strong><?= $this->text->in($action['event_name'], $available_events) ?></strong> </li> - <li> - <?= t('Action name') ?> = - <strong><?= $this->text->in($action['action_name'], $available_actions) ?></strong> - </li> - <ul> - </td> - <td> - <ul> - <?php foreach ($action['params'] as $param_name => $param_value): ?> - <li> - <?= $this->text->in($param_name, $available_params[$action['action_name']]) ?> = - <strong> - <?php if ($this->text->contains($param_name, 'column_id')): ?> - <?= $this->text->in($param_value, $columns_list) ?> - <?php elseif ($this->text->contains($param_name, 'user_id')): ?> - <?= $this->text->in($param_value, $users_list) ?> - <?php elseif ($this->text->contains($param_name, 'project_id')): ?> - <?= $this->text->in($param_value, $projects_list) ?> - <?php elseif ($this->text->contains($param_name, 'color_id')): ?> - <?= $this->text->in($param_value, $colors_list) ?> - <?php elseif ($this->text->contains($param_name, 'category_id')): ?> - <?= $this->text->in($param_value, $categories_list) ?> - <?php elseif ($this->text->contains($param_name, 'link_id')): ?> - <?= $this->text->in($param_value, $links_list) ?> - <?php elseif ($this->text->contains($param_name, 'swimlane_id')): ?> - <?= $this->text->in($param_value, $swimlane_list) ?> - <?php else: ?> - <?= $this->text->e($param_value) ?> - <?php endif ?> - </strong> - </li> - <?php endforeach ?> + <?php foreach ($action['params'] as $param_name => $param_value): ?> + <li> + <?= $this->text->in($param_name, $available_params[$action['action_name']]) ?> = + <strong> + <?php if ($this->text->contains($param_name, 'column_id')): ?> + <?= $this->text->in($param_value, $columns_list) ?> + <?php elseif ($this->text->contains($param_name, 'user_id')): ?> + <?= $this->text->in($param_value, $users_list) ?> + <?php elseif ($this->text->contains($param_name, 'project_id')): ?> + <?= $this->text->in($param_value, $projects_list) ?> + <?php elseif ($this->text->contains($param_name, 'color_id')): ?> + <?= $this->text->in($param_value, $colors_list) ?> + <?php elseif ($this->text->contains($param_name, 'category_id')): ?> + <?= $this->text->in($param_value, $categories_list) ?> + <?php elseif ($this->text->contains($param_name, 'link_id')): ?> + <?= $this->text->in($param_value, $links_list) ?> + <?php elseif ($this->text->contains($param_name, 'swimlane_id')): ?> + <?= $this->text->in($param_value, $swimlane_list) ?> + <?php else: ?> + <?= $this->text->e($param_value) ?> + <?php endif ?> + </strong> + </li> + <?php endforeach ?> </ul> </td> - <td> - <?= $this->modal->confirm('trash-o', t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id'])) ?> - </td> </tr> <?php endforeach ?> </table> |