Improve 'task show' layout

This commit is contained in:
Frédéric Guillot
2014-05-09 21:25:39 -04:00
parent 6f796a8cc1
commit 0a5a11a7c9
6 changed files with 140 additions and 101 deletions

View File

@@ -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;

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',

View File

@@ -3,11 +3,29 @@
<h2>#<?= $task['id'] ?> - <?= Helper\escape($task['title']) ?></h2>
<ul>
<li><a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
<li><a href="?controller=task&amp;action=duplicate&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
<!-- <li><a href="#"><?= t('Duplicate to another project') ?></a></li> -->
</ul>
</div>
<section>
<section class="task-show">
<div class="task-show-sidebar">
<h2><?= t('Actions') ?></h2>
<div class="task-show-actions">
<ul>
<li><a href="?controller=task&amp;action=duplicate&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
<li><a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>"><?= t('Edit') ?></a></li>
<li>
<?php if ($task['is_active'] == 1): ?>
<a href="?controller=task&amp;action=confirmClose&amp;task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a>
<?php else: ?>
<a href="?controller=task&amp;action=confirmOpen&amp;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']): ?>
@@ -48,15 +66,6 @@
<?= t('Status is closed') ?>
<?php endif ?>
</li>
<li>
<a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>"><?= t('Edit') ?></a>
<?= t('or') ?>
<?php if ($task['is_active'] == 1): ?>
<a href="?controller=task&amp;action=confirmClose&amp;task_id=<?= $task['id'] ?>"><?= t('close this task') ?></a>
<?php else: ?>
<a href="?controller=task&amp;action=confirmOpen&amp;task_id=<?= $task['id'] ?>"><?= t('open this task') ?></a>
<?php endif ?>
</li>
</ul>
</article>
@@ -106,5 +115,8 @@
</div>
</form>
<?php endif ?>
</div>
</section>
</section>