summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-07-20 21:10:09 -0400
committerFrederic Guillot <fred@kanboard.net>2015-07-20 21:10:09 -0400
commit8cd1e6f4c1642b2cad8fc29704c042d6e4e527b1 (patch)
tree49143224b6ae741f2c25e78750c682627da06927 /app/Template
parent32aab02549f45b71b494cf966126cf715d3f75e4 (diff)
Add current values when moving/duplicate a task to another project and add a loading icon
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/task_duplication/copy.php5
-rw-r--r--app/Template/task_duplication/move.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index f9106c1d..63ecb534 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -20,18 +20,23 @@
array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
'task-reload-project-destination'
) ?>
+ <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
<?= $this->form->label(t('Swimlane'), 'swimlane_id') ?>
<?= $this->form->select('swimlane_id', $swimlanes_list, $values) ?>
+ <p class="form-help"><?= t('Current swimlane: %s', $task['swimlane_name'] ?: $task['default_swimlane']) ?></p>
<?= $this->form->label(t('Column'), 'column_id') ?>
<?= $this->form->select('column_id', $columns_list, $values) ?>
+ <p class="form-help"><?= t('Current column: %s', $task['column_title']) ?></p>
<?= $this->form->label(t('Category'), 'category_id') ?>
<?= $this->form->select('category_id', $categories_list, $values) ?>
+ <p class="form-help"><?= t('Current category: %s', $task['category_name'] ?: e('no category')) ?></p>
<?= $this->form->label(t('Assignee'), 'owner_id') ?>
<?= $this->form->select('owner_id', $users_list, $values) ?>
+ <p class="form-help"><?= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?></p>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index e90424a2..8613fce3 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -20,18 +20,23 @@
array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'),
'task-reload-project-destination'
) ?>
+ <span class="loading-icon" style="display: none">&nbsp;<i class="fa fa-spinner fa-spin"></i></span>
<?= $this->form->label(t('Swimlane'), 'swimlane_id') ?>
<?= $this->form->select('swimlane_id', $swimlanes_list, $values) ?>
+ <p class="form-help"><?= t('Current swimlane: %s', $task['swimlane_name'] ?: $task['default_swimlane']) ?></p>
<?= $this->form->label(t('Column'), 'column_id') ?>
<?= $this->form->select('column_id', $columns_list, $values) ?>
+ <p class="form-help"><?= t('Current column: %s', $task['column_title']) ?></p>
<?= $this->form->label(t('Category'), 'category_id') ?>
<?= $this->form->select('category_id', $categories_list, $values) ?>
+ <p class="form-help"><?= t('Current category: %s', $task['category_name'] ?: e('no category')) ?></p>
<?= $this->form->label(t('Assignee'), 'owner_id') ?>
<?= $this->form->select('owner_id', $users_list, $values) ?>
+ <p class="form-help"><?= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?></p>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>