From 4b834d1cb98c074de254751fa2416a38cbb0cbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?=
 <fguillot@users.noreply.github.com>
Date: Fri, 9 May 2014 21:52:14 -0400
Subject: [PATCH] Improve 'task show' title

---
 assets/css/app.css             | 51 +++++++++++++++++++++-------------
 locales/es_ES/translations.php |  1 +
 locales/fr_FR/translations.php |  3 +-
 locales/pl_PL/translations.php |  1 +
 locales/pt_BR/translations.php |  1 +
 templates/task_show.php        |  9 +++---
 6 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 5dedf33be..576a0bef8 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -606,7 +606,6 @@ div.task-title a {
     font-weight: normal;
 }
 
-#infos,
 div.task {
     position: relative;
 }
@@ -628,24 +627,6 @@ div.task .task-score {
 }
 
 /* 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 {
     position: relative;
 }
@@ -672,6 +653,38 @@ article .task-score {
     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 {
     line-height: 1.4em;
diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php
index 4d2a606fb..ea7da4ba7 100644
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@@ -304,4 +304,5 @@ return array(
     // 'Unlink my Google Account' => '',
     // 'Login with my Google Account' => '',
     // 'Project not found.' => '',
+    // 'Task #%d' => '',
 );
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index cf6764407..0db189011 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -303,5 +303,6 @@ return array(
     'Link my Google Account' => 'Lier mon compte Google',
     'Unlink my Google Account' => 'Ne plus utiliser 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',
 );
diff --git a/locales/pl_PL/translations.php b/locales/pl_PL/translations.php
index 2a2ddbd85..d2018ef8c 100644
--- a/locales/pl_PL/translations.php
+++ b/locales/pl_PL/translations.php
@@ -309,4 +309,5 @@ return array(
     // 'Unlink my Google Account' => '',
     // 'Login with my Google Account' => '',
     // 'Project not found.' => '',
+    // 'Task #%d' => '',
 );
diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php
index 9c740bf7c..9ef5a7f8a 100644
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@@ -305,4 +305,5 @@ return array(
     // 'Unlink my Google Account' => '',
     // 'Login with my Google Account' => '',
     // 'Project not found.' => '',
+    // 'Task #%d' => '',
 );
diff --git a/templates/task_show.php b/templates/task_show.php
index eaabdfb1a..97ce7f8c3 100644
--- a/templates/task_show.php
+++ b/templates/task_show.php
@@ -1,6 +1,6 @@
 <section id="main">
     <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>
             <li><a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
         </ul>
@@ -26,8 +26,8 @@
         </div>
 
         <div class="task-show-main">
-            <h2><?= t('Details') ?></h2>
-            <article id="infos" class="task task-<?= $task['color_id'] ?>">
+            <article class="task task-<?= $task['color_id'] ?> task-show-details">
+                <h2><?= Helper\escape($task['title']) ?></h2>
             <?php if ($task['score']): ?>
                 <span class="task-score"><?= Helper\escape($task['score']) ?></span>
             <?php endif ?>
@@ -71,7 +71,7 @@
 
             <h2><?= t('Description') ?></h2>
             <?php if ($task['description']): ?>
-                <article id="description" class="markdown">
+                <article class="markdown task-show-description">
                     <?= Helper\markdown($task['description']) ?: t('There is no description.') ?>
                 </article>
             <?php else: ?>
@@ -115,7 +115,6 @@
                 </div>
             </form>
             <?php endif ?>
-
         </div>
 
     </section>