diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/TaskImportController.php | 7 | ||||
| -rw-r--r-- | app/Template/project_header/dropdown.php | 2 | ||||
| -rw-r--r-- | app/Template/task_import/show.php | 15 | ||||
| -rw-r--r-- | app/Template/task_import/sidebar.php | 8 |
4 files changed, 11 insertions, 21 deletions
diff --git a/app/Controller/TaskImportController.php b/app/Controller/TaskImportController.php index 3ce275a5..2e323979 100644 --- a/app/Controller/TaskImportController.php +++ b/app/Controller/TaskImportController.php @@ -23,15 +23,14 @@ class TaskImportController extends BaseController { $project = $this->getProject(); - $this->response->html($this->helper->layout->project('task_import/show', array( + $this->response->html($this->template->render('task_import/show', array( 'project' => $project, 'values' => $values, 'errors' => $errors, 'max_size' => get_upload_max_size(), 'delimiters' => Csv::getDelimiters(), 'enclosures' => Csv::getEnclosures(), - 'title' => t('Import tasks from CSV file'), - ), 'task_import/sidebar')); + ))); } /** @@ -58,7 +57,7 @@ class TaskImportController extends BaseController $this->flash->failure(t('Nothing have been imported!')); } - $this->response->redirect($this->helper->url->to('TaskImportController', 'show', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('TaskImportController', 'show', array('project_id' => $project['id'])), true); } } diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php index eac4fc57..7fcdfb55 100644 --- a/app/Template/project_header/dropdown.php +++ b/app/Template/project_header/dropdown.php @@ -58,7 +58,7 @@ <?php if ($this->user->hasProjectAccess('TaskImportController', 'tasks', $project['id'])): ?> <li> - <?= $this->url->icon('download', t('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> + <?= $this->modal->medium('download', t('Import tasks'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> </li> <?php endif ?> diff --git a/app/Template/task_import/show.php b/app/Template/task_import/show.php index 54264f30..20b020d3 100644 --- a/app/Template/task_import/show.php +++ b/app/Template/task_import/show.php @@ -15,14 +15,11 @@ <p class="form-help"><?= t('Maximum size: ') ?><?= is_integer($max_size) ? $this->text->bytes($max_size) : $max_size ?></p> - <div class="form-actions"> - <button type="submit" class="btn btn-blue"><?= t('Import') ?></button> - </div> + <?= $this->modal->submitButtons(array('submitLabel' => t('Import'))) ?> </form> -<div class="page-header"> - <h2><?= t('Instructions') ?></h2> -</div> -<div class="alert"> + +<div class="panel"> + <h3><?= t('Instructions') ?></h3> <ul> <li><?= t('Your file must use the predefined CSV format') ?></li> <li><?= t('Your file must be encoded in UTF-8') ?></li> @@ -30,5 +27,7 @@ <li><?= t('Duplicates are not verified for you') ?></li> <li><?= t('The due date must use the ISO format: YYYY-MM-DD') ?></li> </ul> + <p class="margin-top"> + <?= $this->url->icon('download', t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?> + </p> </div> -<p><?= $this->url->icon('download', t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?></p> diff --git a/app/Template/task_import/sidebar.php b/app/Template/task_import/sidebar.php deleted file mode 100644 index 04896948..00000000 --- a/app/Template/task_import/sidebar.php +++ /dev/null @@ -1,8 +0,0 @@ -<div class="sidebar"> - <ul> - <li <?= $this->app->checkMenuSelection('TaskImportController', 'show') ?>> - <?= $this->url->link(t('Tasks').' (CSV)', 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> - </li> - <?= $this->hook->render('template:task-import:sidebar') ?> - </ul> -</div> |