Improve 'task show' layout
This commit is contained in:
Frédéric Guillot
parent
6f796a8cc1
commit
0a5a11a7c9
|
|
@ -52,7 +52,8 @@ h1, h2, h3 {
|
|||
}
|
||||
|
||||
h2 {
|
||||
font-size: 1.6em;
|
||||
font-size: 1.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
|
|
@ -112,7 +113,7 @@ td li {
|
|||
form {
|
||||
padding: 10px;
|
||||
margin-bottom: 20px;
|
||||
background: #fcfcfc;
|
||||
background: #fafafa;
|
||||
border: 1px solid #eee;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
|
@ -645,6 +646,32 @@ article .task-score {
|
|||
padding: 10px;
|
||||
}
|
||||
|
||||
.task-show {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.task-show-main {
|
||||
margin-left: 330px;
|
||||
}
|
||||
|
||||
.task-show-sidebar {
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0;
|
||||
width: 250px;
|
||||
padding: 10px;
|
||||
padding-top: 0;
|
||||
border: 1px solid #ccc;
|
||||
background: #f0f0f0;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.task-show-sidebar li {
|
||||
list-style-type: square;
|
||||
margin-left: 30px;
|
||||
line-height: 1.8em;
|
||||
}
|
||||
|
||||
/* markdown content */
|
||||
.markdown {
|
||||
line-height: 1.4em;
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ return array(
|
|||
'Column on the board:' => 'Columna en el tablero: ',
|
||||
'Status is open' => 'Estado abierto',
|
||||
'Status is closed' => 'Estado cerrado',
|
||||
'close this task' => 'cerrar esta tarea',
|
||||
'open this task' => 'abrir esta tarea',
|
||||
'Close this task' => 'Cerrar esta tarea',
|
||||
'Open this task' => 'Abrir esta tarea',
|
||||
'There is no description.' => 'No hay descripción.',
|
||||
'Add a new task' => 'Añadir una nueva tarea',
|
||||
'The username is required' => 'El nombre de usuario es obligatorio',
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ return array(
|
|||
'Column on the board:' => 'Colonne sur le tableau : ',
|
||||
'Status is open' => 'État ouvert',
|
||||
'Status is closed' => 'État fermé',
|
||||
'close this task' => 'fermer cette tâche',
|
||||
'open this task' => 'ouvrir cette tâche',
|
||||
'Close this task' => 'Fermer cette tâche',
|
||||
'Open this task' => 'Ouvrir cette tâche',
|
||||
'There is no description.' => 'Il n\'y a pas de description.',
|
||||
'Add a new task' => 'Ajouter une nouvelle tâche',
|
||||
'The username is required' => 'Le nom d\'utilisateur est obligatoire',
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ return array(
|
|||
'Column on the board:' => 'Kolumna na tablicy:',
|
||||
'Status is open' => 'Status otwarty',
|
||||
'Status is closed' => 'Status zamknięty',
|
||||
'close this task' => 'zamknij zadanie',
|
||||
'open this task' => 'otwórz zadanie',
|
||||
'Close this task' => 'Zamknij zadanie',
|
||||
'Open this task' => 'Otwórz zadanie',
|
||||
'There is no description.' => 'Brak opisu.',
|
||||
'Add a new task' => 'Dodaj zadanie',
|
||||
'The username is required' => 'Nazwa użytkownika jest wymagana',
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ return array(
|
|||
'Column on the board:' => 'Coluna no quadro:',
|
||||
'Status is open' => 'Status está aberto',
|
||||
'Status is closed' => 'Status está fechado',
|
||||
'close this task' => 'fechar esta tarefa',
|
||||
'open this task' => 'abrir esta tarefa',
|
||||
'Close this task' => 'Fechar esta tarefa',
|
||||
'Open this task' => 'Abrir esta tarefa',
|
||||
'There is no description.' => 'Não há descrição.',
|
||||
'Add a new task' => 'Adicionar uma nova tarefa',
|
||||
'The username is required' => 'O nome de usuário é obrigatório',
|
||||
|
|
|
|||
|
|
@ -3,108 +3,120 @@
|
|||
<h2>#<?= $task['id'] ?> - <?= Helper\escape($task['title']) ?></h2>
|
||||
<ul>
|
||||
<li><a href="?controller=board&action=show&project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
|
||||
<li><a href="?controller=task&action=duplicate&project_id=<?= $task['project_id'] ?>&task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
|
||||
<!-- <li><a href="#"><?= t('Duplicate to another project') ?></a></li> -->
|
||||
</ul>
|
||||
</div>
|
||||
<section>
|
||||
<h2><?= t('Details') ?></h2>
|
||||
<article id="infos" class="task task-<?= $task['color_id'] ?>">
|
||||
<?php if ($task['score']): ?>
|
||||
<span class="task-score"><?= Helper\escape($task['score']) ?></span>
|
||||
<?php endif ?>
|
||||
<ul>
|
||||
<li>
|
||||
<?= dt('Created on %B %e, %G at %k:%M %p', $task['date_creation']) ?>
|
||||
</li>
|
||||
<?php if ($task['date_completed']): ?>
|
||||
<li>
|
||||
<?= dt('Completed on %B %e, %G at %k:%M %p', $task['date_completed']) ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<?php if ($task['date_due']): ?>
|
||||
<li>
|
||||
<strong><?= dt('Must be done before %B %e, %G', $task['date_due']) ?></strong>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<li>
|
||||
<strong>
|
||||
<?php if ($task['username']): ?>
|
||||
<?= t('Assigned to %s', $task['username']) ?>
|
||||
<?php else: ?>
|
||||
<?= t('There is nobody assigned') ?>
|
||||
<?php endif ?>
|
||||
</strong>
|
||||
</li>
|
||||
<li>
|
||||
<?= t('Column on the board:') ?>
|
||||
<strong><?= Helper\escape($task['column_title']) ?></strong>
|
||||
(<?= Helper\escape($task['project_name']) ?>)
|
||||
</li>
|
||||
<li>
|
||||
<?php if ($task['is_active'] == 1): ?>
|
||||
<?= t('Status is open') ?>
|
||||
<?php else: ?>
|
||||
<?= t('Status is closed') ?>
|
||||
<?php endif ?>
|
||||
</li>
|
||||
<li>
|
||||
<a href="?controller=task&action=edit&task_id=<?= $task['id'] ?>"><?= t('Edit') ?></a>
|
||||
<?= t('or') ?>
|
||||
<?php if ($task['is_active'] == 1): ?>
|
||||
<a href="?controller=task&action=confirmClose&task_id=<?= $task['id'] ?>"><?= t('close this task') ?></a>
|
||||
<?php else: ?>
|
||||
<a href="?controller=task&action=confirmOpen&task_id=<?= $task['id'] ?>"><?= t('open this task') ?></a>
|
||||
<?php endif ?>
|
||||
</li>
|
||||
</ul>
|
||||
</article>
|
||||
<section class="task-show">
|
||||
|
||||
<h2><?= t('Description') ?></h2>
|
||||
<?php if ($task['description']): ?>
|
||||
<article id="description" class="markdown">
|
||||
<?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
|
||||
<div class="task-show-sidebar">
|
||||
|
||||
<h2><?= t('Actions') ?></h2>
|
||||
<div class="task-show-actions">
|
||||
<ul>
|
||||
<li><a href="?controller=task&action=duplicate&project_id=<?= $task['project_id'] ?>&task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
|
||||
<li><a href="?controller=task&action=edit&task_id=<?= $task['id'] ?>"><?= t('Edit') ?></a></li>
|
||||
<li>
|
||||
<?php if ($task['is_active'] == 1): ?>
|
||||
<a href="?controller=task&action=confirmClose&task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a>
|
||||
<?php else: ?>
|
||||
<a href="?controller=task&action=confirmOpen&task_id=<?= $task['id'] ?>"><?= t('Open this task') ?></a>
|
||||
<?php endif ?>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-show-main">
|
||||
<h2><?= t('Details') ?></h2>
|
||||
<article id="infos" class="task task-<?= $task['color_id'] ?>">
|
||||
<?php if ($task['score']): ?>
|
||||
<span class="task-score"><?= Helper\escape($task['score']) ?></span>
|
||||
<?php endif ?>
|
||||
<ul>
|
||||
<li>
|
||||
<?= dt('Created on %B %e, %G at %k:%M %p', $task['date_creation']) ?>
|
||||
</li>
|
||||
<?php if ($task['date_completed']): ?>
|
||||
<li>
|
||||
<?= dt('Completed on %B %e, %G at %k:%M %p', $task['date_completed']) ?>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<?php if ($task['date_due']): ?>
|
||||
<li>
|
||||
<strong><?= dt('Must be done before %B %e, %G', $task['date_due']) ?></strong>
|
||||
</li>
|
||||
<?php endif ?>
|
||||
<li>
|
||||
<strong>
|
||||
<?php if ($task['username']): ?>
|
||||
<?= t('Assigned to %s', $task['username']) ?>
|
||||
<?php else: ?>
|
||||
<?= t('There is nobody assigned') ?>
|
||||
<?php endif ?>
|
||||
</strong>
|
||||
</li>
|
||||
<li>
|
||||
<?= t('Column on the board:') ?>
|
||||
<strong><?= Helper\escape($task['column_title']) ?></strong>
|
||||
(<?= Helper\escape($task['project_name']) ?>)
|
||||
</li>
|
||||
<li>
|
||||
<?php if ($task['is_active'] == 1): ?>
|
||||
<?= t('Status is open') ?>
|
||||
<?php else: ?>
|
||||
<?= t('Status is closed') ?>
|
||||
<?php endif ?>
|
||||
</li>
|
||||
</ul>
|
||||
</article>
|
||||
<?php else: ?>
|
||||
<form method="post" action="?controller=task&action=description&task_id=<?= $task['id'] ?>" autocomplete="off">
|
||||
|
||||
<?= Helper\form_hidden('id', $description_form['values']) ?>
|
||||
<?= Helper\form_textarea('description', $description_form['values'], $description_form['errors'], array('required', 'placeholder="'.t('Leave a description').'"')) ?><br/>
|
||||
<h2><?= t('Description') ?></h2>
|
||||
<?php if ($task['description']): ?>
|
||||
<article id="description" class="markdown">
|
||||
<?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
|
||||
</article>
|
||||
<?php else: ?>
|
||||
<form method="post" action="?controller=task&action=description&task_id=<?= $task['id'] ?>" autocomplete="off">
|
||||
|
||||
<?= Helper\form_hidden('id', $description_form['values']) ?>
|
||||
<?= Helper\form_textarea('description', $description_form['values'], $description_form['errors'], array('required', 'placeholder="'.t('Leave a description').'"')) ?><br/>
|
||||
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
|
||||
|
||||
<div class="form-actions">
|
||||
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
|
||||
</div>
|
||||
</form>
|
||||
<?php endif ?>
|
||||
|
||||
<h2><?= t('Comments') ?></h2>
|
||||
<?php if ($comments): ?>
|
||||
<ul id="comments">
|
||||
<?php foreach ($comments as $comment): ?>
|
||||
<?= Helper\template('comment_show', array(
|
||||
'comment' => $comment,
|
||||
'task' => $task,
|
||||
'display_edit_form' => $comment['id'] == $comment_edit_form['values']['id'],
|
||||
'values' => $comment_edit_form['values'] + array('comment' => $comment['comment']),
|
||||
'errors' => $comment_edit_form['errors']
|
||||
)) ?>
|
||||
<?php endforeach ?>
|
||||
</ul>
|
||||
<?php endif ?>
|
||||
|
||||
<?php if (! isset($hide_comment_form) || $hide_comment_form === false): ?>
|
||||
<form method="post" action="?controller=comment&action=save&task_id=<?= $task['id'] ?>" autocomplete="off">
|
||||
|
||||
<?= Helper\form_hidden('task_id', $comment_form['values']) ?>
|
||||
<?= Helper\form_hidden('user_id', $comment_form['values']) ?>
|
||||
<?= Helper\form_textarea('comment', $comment_form['values'], $comment_form['errors'], array('required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
|
||||
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
|
||||
|
||||
<div class="form-actions">
|
||||
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
|
||||
<input type="submit" value="<?= t('Post comment') ?>" class="btn btn-blue"/>
|
||||
</div>
|
||||
</form>
|
||||
<?php endif ?>
|
||||
<?php endif ?>
|
||||
|
||||
<h2><?= t('Comments') ?></h2>
|
||||
<?php if ($comments): ?>
|
||||
<ul id="comments">
|
||||
<?php foreach ($comments as $comment): ?>
|
||||
<?= Helper\template('comment_show', array(
|
||||
'comment' => $comment,
|
||||
'task' => $task,
|
||||
'display_edit_form' => $comment['id'] == $comment_edit_form['values']['id'],
|
||||
'values' => $comment_edit_form['values'] + array('comment' => $comment['comment']),
|
||||
'errors' => $comment_edit_form['errors']
|
||||
)) ?>
|
||||
<?php endforeach ?>
|
||||
</ul>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
|
||||
<?php if (! isset($hide_comment_form) || $hide_comment_form === false): ?>
|
||||
<form method="post" action="?controller=comment&action=save&task_id=<?= $task['id'] ?>" autocomplete="off">
|
||||
|
||||
<?= Helper\form_hidden('task_id', $comment_form['values']) ?>
|
||||
<?= Helper\form_hidden('user_id', $comment_form['values']) ?>
|
||||
<?= Helper\form_textarea('comment', $comment_form['values'], $comment_form['errors'], array('required', 'placeholder="'.t('Leave a comment').'"'), 'comment-textarea') ?><br/>
|
||||
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
|
||||
|
||||
<div class="form-actions">
|
||||
<input type="submit" value="<?= t('Post comment') ?>" class="btn btn-blue"/>
|
||||
</div>
|
||||
</form>
|
||||
<?php endif ?>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
Loading…
Reference in New Issue