diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-08-18 21:39:43 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-08-18 21:39:43 -0400 |
| commit | 6b4786624be70c4c024b829407a7496eec361cbb (patch) | |
| tree | 51999c360f0f0c965b317ba31419118ef6ace8a3 /app/Template/project | |
| parent | b04cbc419b60df02ca59a9bbf87cd840614b09a4 (diff) | |
Add start and end date for projects
Diffstat (limited to 'app/Template/project')
| -rw-r--r-- | app/Template/project/edit.php | 6 | ||||
| -rw-r--r-- | app/Template/project/index.php | 21 |
2 files changed, 21 insertions, 6 deletions
diff --git a/app/Template/project/edit.php b/app/Template/project/edit.php index c8f235c7..3c64a399 100644 --- a/app/Template/project/edit.php +++ b/app/Template/project/edit.php @@ -13,6 +13,12 @@ <?= $this->form->text('identifier', $values, $errors, array('maxlength="50"')) ?> <p class="form-help"><?= t('The project identifier is an optional alphanumeric code used to identify your project.') ?></p> + <?= $this->form->label(t('Start date'), 'start_date') ?> + <?= $this->form->text('start_date', $values, $errors, array('maxlength="10"'), 'form-date') ?> + + <?= $this->form->label(t('End date'), 'end_date') ?> + <?= $this->form->text('end_date', $values, $errors, array('maxlength="10"'), 'form-date') ?> + <?php if ($this->user->isAdmin() || $this->user->isProjectAdministrationAllowed($project['id'])): ?> <?= $this->form->checkbox('is_private', t('Private project'), 1, $project['is_private'] == 1) ?> <?php endif ?> diff --git a/app/Template/project/index.php b/app/Template/project/index.php index b2cfc7e7..f24a8c4a 100644 --- a/app/Template/project/index.php +++ b/app/Template/project/index.php @@ -14,14 +14,16 @@ <?php if ($paginator->isEmpty()): ?> <p class="alert"><?= t('No project') ?></p> <?php else: ?> - <table class="table-stripped"> + <table class="table-stripped table-small"> <tr> - <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th> + <th class="column-3"><?= $paginator->order(t('Id'), 'id') ?></th> <th class="column-5"><?= $paginator->order(t('Status'), 'is_active') ?></th> - <th class="column-20"><?= $paginator->order(t('Project'), 'name') ?></th> + <th class="column-15"><?= $paginator->order(t('Project'), 'name') ?></th> + <th class="column-8"><?= $paginator->order(t('Start date'), 'start_date') ?></th> + <th class="column-8"><?= $paginator->order(t('End date'), 'end_date') ?></th> <?php if ($this->user->isAdmin() || $this->user->isProjectAdmin()): ?> - <th class="column-15"><?= t('Managers') ?></th> - <th class="column-15"><?= t('Members') ?></th> + <th class="column-12"><?= t('Managers') ?></th> + <th class="column-12"><?= t('Members') ?></th> <?php endif ?> <th><?= t('Columns') ?></th> </tr> @@ -48,12 +50,19 @@ <i class="fa fa-lock fa-fw" title="<?= t('Private project') ?>"></i> <?php endif ?> - <?= $this->url->link($this->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?> <?php if (! empty($project['description'])): ?> <span class="tooltip" title='<?= $this->e($this->text->markdown($project['description'])) ?>'> <i class="fa fa-info-circle"></i> </span> <?php endif ?> + + <?= $this->url->link($this->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?> + </td> + <td> + <?= $project['start_date'] ?> + </td> + <td> + <?= $project['end_date'] ?> </td> <?php if ($this->user->isAdmin() || $this->user->isProjectAdmin()): ?> <td> |