diff --git a/ChangeLog b/ChangeLog index 09c15d4b5..ab917f9d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 90db04504..a889f5880 100644 --- a/app/Template/action/index.php +++ b/app/Template/action/index.php @@ -14,13 +14,21 @@

- - - - - - + + + - -
+ + + text->in($action['action_name'], $available_actions) ?> +
    @@ -28,43 +36,32 @@ = text->in($action['event_name'], $available_events) ?> -
  • - = - text->in($action['action_name'], $available_actions) ?> -
  • -
      -
-
    - $param_value): ?> -
  • - text->in($param_name, $available_params[$action['action_name']]) ?> = - - text->contains($param_name, 'column_id')): ?> - text->in($param_value, $columns_list) ?> - text->contains($param_name, 'user_id')): ?> - text->in($param_value, $users_list) ?> - text->contains($param_name, 'project_id')): ?> - text->in($param_value, $projects_list) ?> - text->contains($param_name, 'color_id')): ?> - text->in($param_value, $colors_list) ?> - text->contains($param_name, 'category_id')): ?> - text->in($param_value, $categories_list) ?> - text->contains($param_name, 'link_id')): ?> - text->in($param_value, $links_list) ?> - text->contains($param_name, 'swimlane_id')): ?> - text->in($param_value, $swimlane_list) ?> - - text->e($param_value) ?> - - -
  • - + $param_value): ?> +
  • + text->in($param_name, $available_params[$action['action_name']]) ?> = + + text->contains($param_name, 'column_id')): ?> + text->in($param_value, $columns_list) ?> + text->contains($param_name, 'user_id')): ?> + text->in($param_value, $users_list) ?> + text->contains($param_name, 'project_id')): ?> + text->in($param_value, $projects_list) ?> + text->contains($param_name, 'color_id')): ?> + text->in($param_value, $colors_list) ?> + text->contains($param_name, 'category_id')): ?> + text->in($param_value, $categories_list) ?> + text->contains($param_name, 'link_id')): ?> + text->in($param_value, $links_list) ?> + text->contains($param_name, 'swimlane_id')): ?> + text->in($param_value, $swimlane_list) ?> + + text->e($param_value) ?> + + +
  • +
- modal->confirm('trash-o', t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id'])) ?> -