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

Rename methods to render fields in TaskHelper and SubtaskHelper

Browse Source
This commit is contained in:
Frederic Guillot
2017-01-08 18:07:38 -05:00
parent 07f9700179
commit 5ce0ebdd26
9 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Template/external_task_creation/step1.php
View File

@@ -12,5 +12,5 @@
<div class="alert alert-error"><?= $this->text->e($error_message) ?></div>
<?php endif ?>
<?= $this->modal->submitButtons(t('Next')) ?>
<?= $this->modal->submitButtons(array('submitLabel' => t('Next'))) ?>
</form>

7
app/Template/subtask/create.php
View File

@@ -6,9 +6,10 @@
<?= $this->form->csrf() ?>
<?= $this->form->hidden('task_id', $values) ?>
<?= $this->subtask->selectTitle($values, $errors, array('autofocus')) ?>
<?= $this->subtask->selectAssignee($users_list, $values, $errors) ?>
<?= $this->subtask->selectTimeEstimated($values, $errors) ?>
<?= $this->subtask->renderTitleField($values, $errors, array('autofocus')) ?>
<?= $this->subtask->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->subtask->renderTimeEstimatedField($values, $errors) ?>
<?= $this->hook->render('template:subtask:form:create', array('values' => $values, 'errors' => $errors)) ?>
<?= $this->form->checkbox('another_subtask', t('Create another sub-task'), 1, isset($values['another_subtask']) && $values['another_subtask'] == 1) ?>

10
app/Template/subtask/edit.php
View File

@@ -6,10 +6,12 @@
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $values) ?>
<?= $this->form->hidden('task_id', $values) ?>
<?= $this->subtask->selectTitle($values, $errors, array('autofocus')) ?>
<?= $this->subtask->selectAssignee($users_list, $values, $errors) ?>
<?= $this->subtask->selectTimeEstimated($values, $errors) ?>
<?= $this->subtask->selectTimeSpent($values, $errors) ?>
<?= $this->subtask->renderTitleField($values, $errors, array('autofocus')) ?>
<?= $this->subtask->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->subtask->renderTimeEstimatedField($values, $errors) ?>
<?= $this->subtask->renderTimeSpentField($values, $errors) ?>
<?= $this->hook->render('template:subtask:form:edit', array('values' => $values, 'errors' => $errors)) ?>
<?= $this->modal->submitButtons() ?>

6
app/Template/task_bulk/show.php
View File

@@ -8,9 +8,9 @@
<?= $this->form->hidden('swimlane_id', $values) ?>
<?= $this->form->hidden('project_id', $values) ?>
<?= $this->task->selectColor($values) ?>
<?= $this->task->selectAssignee($users_list, $values, $errors) ?>
<?= $this->task->selectCategory($categories_list, $values, $errors) ?>
<?= $this->task->renderColorField($values) ?>
<?= $this->task->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->task->renderCategoryField($categories_list, $values, $errors) ?>
<?= $this->form->label(t('Tasks'), 'tasks') ?>
<?= $this->form->textarea('tasks', $values, $errors, array('placeholder="'.t('My task title').'"')) ?>

30
app/Template/task_creation/show.php
View File

@@ -7,31 +7,31 @@
<div class="task-form-container">
<div class="task-form-main-column">
<?= $this->task->selectTitle($values, $errors) ?>
<?= $this->task->selectDescription($values, $errors) ?>
<?= $this->task->selectTags($project) ?>
<?= $this->task->renderTitleField($values, $errors) ?>
<?= $this->task->renderDescriptionField($values, $errors) ?>
<?= $this->task->renderTagField($project) ?>
<?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="task-form-secondary-column">
<?= $this->task->selectColor($values) ?>
<?= $this->task->selectAssignee($users_list, $values, $errors) ?>
<?= $this->task->selectCategory($categories_list, $values, $errors) ?>
<?= $this->task->selectSwimlane($swimlanes_list, $values, $errors) ?>
<?= $this->task->selectColumn($columns_list, $values, $errors) ?>
<?= $this->task->selectPriority($project, $values) ?>
<?= $this->task->renderColorField($values) ?>
<?= $this->task->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->task->renderCategoryField($categories_list, $values, $errors) ?>
<?= $this->task->renderSwimlaneField($swimlanes_list, $values, $errors) ?>
<?= $this->task->renderColumnField($columns_list, $values, $errors) ?>
<?= $this->task->renderPriorityField($project, $values) ?>
<?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="task-form-secondary-column">
<?= $this->task->selectDueDate($values, $errors) ?>
<?= $this->task->selectStartDate($values, $errors) ?>
<?= $this->task->selectTimeEstimated($values, $errors) ?>
<?= $this->task->selectTimeSpent($values, $errors) ?>
<?= $this->task->selectScore($values, $errors) ?>
<?= $this->task->selectReference($values, $errors) ?>
<?= $this->task->renderDueDateField($values, $errors) ?>
<?= $this->task->renderStartDateField($values, $errors) ?>
<?= $this->task->renderTimeEstimatedField($values, $errors) ?>
<?= $this->task->renderTimeSpentField($values, $errors) ?>
<?= $this->task->renderScoreField($values, $errors) ?>
<?= $this->task->renderReferenceField($values, $errors) ?>
<?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
</div>

26
app/Template/task_modification/show.php
View File

@@ -8,29 +8,29 @@
<div class="task-form-container">
<div class="task-form-main-column">
<?= $this->task->selectTitle($values, $errors) ?>
<?= $this->task->selectDescription($values, $errors) ?>
<?= $this->task->selectTags($project, $tags) ?>
<?= $this->task->renderTitleField($values, $errors) ?>
<?= $this->task->renderDescriptionField($values, $errors) ?>
<?= $this->task->renderTagField($project, $tags) ?>
<?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="task-form-secondary-column">
<?= $this->task->selectColor($values) ?>
<?= $this->task->selectAssignee($users_list, $values, $errors) ?>
<?= $this->task->selectCategory($categories_list, $values, $errors) ?>
<?= $this->task->selectPriority($project, $values) ?>
<?= $this->task->renderColorField($values) ?>
<?= $this->task->renderAssigneeField($users_list, $values, $errors) ?>
<?= $this->task->renderCategoryField($categories_list, $values, $errors) ?>
<?= $this->task->renderPriorityField($project, $values) ?>
<?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
</div>
<div class="task-form-secondary-column">
<?= $this->task->selectDueDate($values, $errors) ?>
<?= $this->task->selectStartDate($values, $errors) ?>
<?= $this->task->selectTimeEstimated($values, $errors) ?>
<?= $this->task->selectTimeSpent($values, $errors) ?>
<?= $this->task->selectScore($values, $errors) ?>
<?= $this->task->selectReference($values, $errors) ?>
<?= $this->task->renderDueDateField($values, $errors) ?>
<?= $this->task->renderStartDateField($values, $errors) ?>
<?= $this->task->renderTimeEstimatedField($values, $errors) ?>
<?= $this->task->renderTimeSpentField($values, $errors) ?>
<?= $this->task->renderScoreField($values, $errors) ?>
<?= $this->task->renderReferenceField($values, $errors) ?>
<?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
</div>