Improve 'task show' title

This commit is contained in:
Frédéric Guillot
2014-05-09 21:52:14 -04:00
parent 0a5a11a7c9
commit 4b834d1cb9
6 changed files with 41 additions and 25 deletions

View File

@@ -606,7 +606,6 @@ div.task-title a {
font-weight: normal; font-weight: normal;
} }
#infos,
div.task { div.task {
position: relative; position: relative;
} }
@@ -628,24 +627,6 @@ div.task .task-score {
} }
/* task view */ /* task view */
article.task li {
margin-left: 20px;
list-style-type: square;
}
article .task-score {
font-size: 1.9em;
right: 10px;
top: 5px;
}
#description {
border: 1px solid #999;
border-radius: 5px;
background: #f0f0f0;
padding: 10px;
}
.task-show { .task-show {
position: relative; position: relative;
} }
@@ -672,6 +653,38 @@ article .task-score {
line-height: 1.8em; line-height: 1.8em;
} }
.task-show-details {
position: relative;
border-radius: 5px;
}
.task-show-details h2 {
font-size: 1.8em;
margin: 0;
margin-bottom: 25px;
padding: 0;
padding-left: 10px;
padding-right: 10px;
}
.task-show-details li {
margin-left: 25px;
list-style-type: circle;
}
.task-show-details .task-score {
font-size: 1.9em;
right: 10px;
bottom: 5px;
}
.task-show-description {
border: 1px solid #999;
border-radius: 5px;
background: #f0f0f0;
padding: 10px;
}
/* markdown content */ /* markdown content */
.markdown { .markdown {
line-height: 1.4em; line-height: 1.4em;

View File

@@ -304,4 +304,5 @@ return array(
// 'Unlink my Google Account' => '', // 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '', // 'Login with my Google Account' => '',
// 'Project not found.' => '', // 'Project not found.' => '',
// 'Task #%d' => '',
); );

View File

@@ -303,5 +303,6 @@ return array(
'Link my Google Account' => 'Lier mon compte Google', 'Link my Google Account' => 'Lier mon compte Google',
'Unlink my Google Account' => 'Ne plus utiliser mon compte Google', 'Unlink my Google Account' => 'Ne plus utiliser mon compte Google',
'Login with my Google Account' => 'Se connecter avec mon compte Google', 'Login with my Google Account' => 'Se connecter avec mon compte Google',
'Project not found.' => 'Projet introuvable.' 'Project not found.' => 'Projet introuvable.',
'Task #%d' => 'Tâche n°%d',
); );

View File

@@ -309,4 +309,5 @@ return array(
// 'Unlink my Google Account' => '', // 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '', // 'Login with my Google Account' => '',
// 'Project not found.' => '', // 'Project not found.' => '',
// 'Task #%d' => '',
); );

View File

@@ -305,4 +305,5 @@ return array(
// 'Unlink my Google Account' => '', // 'Unlink my Google Account' => '',
// 'Login with my Google Account' => '', // 'Login with my Google Account' => '',
// 'Project not found.' => '', // 'Project not found.' => '',
// 'Task #%d' => '',
); );

View File

@@ -1,6 +1,6 @@
<section id="main"> <section id="main">
<div class="page-header"> <div class="page-header">
<h2>#<?= $task['id'] ?> - <?= Helper\escape($task['title']) ?></h2> <h2><?= Helper\escape($task['project_name']) ?> &gt; <?= t('Task #%d', $task['id']) ?></h2>
<ul> <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=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
</ul> </ul>
@@ -26,8 +26,8 @@
</div> </div>
<div class="task-show-main"> <div class="task-show-main">
<h2><?= t('Details') ?></h2> <article class="task task-<?= $task['color_id'] ?> task-show-details">
<article id="infos" class="task task-<?= $task['color_id'] ?>"> <h2><?= Helper\escape($task['title']) ?></h2>
<?php if ($task['score']): ?> <?php if ($task['score']): ?>
<span class="task-score"><?= Helper\escape($task['score']) ?></span> <span class="task-score"><?= Helper\escape($task['score']) ?></span>
<?php endif ?> <?php endif ?>
@@ -71,7 +71,7 @@
<h2><?= t('Description') ?></h2> <h2><?= t('Description') ?></h2>
<?php if ($task['description']): ?> <?php if ($task['description']): ?>
<article id="description" class="markdown"> <article class="markdown task-show-description">
<?= Helper\markdown($task['description']) ?: t('There is no description.') ?> <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
</article> </article>
<?php else: ?> <?php else: ?>
@@ -115,7 +115,6 @@
</div> </div>
</form> </form>
<?php endif ?> <?php endif ?>
</div> </div>
</section> </section>