From b10d4f51ebfb61e397a6a8783f3027b703deda8d Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fguillot@users.noreply.github.com>
Date: Sat, 3 May 2014 09:52:55 -0400
Subject: Add icons for comments and description

---
 templates/board_index.php    | 12 ++++++++----
 templates/board_public.php   | 12 ++++++++----
 templates/layout.php         |  3 ++-
 templates/project_search.php |  9 +++++++++
 templates/project_tasks.php  |  9 +++++++++
 5 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'templates')

diff --git a/templates/board_index.php b/templates/board_index.php
index f7fa4bdd..764020de 100644
--- a/templates/board_index.php
+++ b/templates/board_index.php
@@ -91,11 +91,15 @@
                                 </div>
                                 <?php endif ?>
 
-                                <?php if (! empty($task['nb_comments'])): ?>
-                                <div class="task-comment-counter">
-                                    <?= $task['nb_comments'] ?>
+                                <div class="task-icons">
+                                    <?php if (! empty($task['nb_comments'])): ?>
+                                        <?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i>
+                                    <?php endif ?>
+
+                                    <?php if (! empty($task['description'])): ?>
+                                        <i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i>
+                                    <?php endif ?>
                                 </div>
-                                <?php endif ?>
                             </div>
                         </div>
                     </div>
diff --git a/templates/board_public.php b/templates/board_public.php
index c3d69f35..208be487 100644
--- a/templates/board_public.php
+++ b/templates/board_public.php
@@ -47,11 +47,15 @@
                                 </div>
                                 <?php endif ?>
 
-                                <?php if (! empty($task['nb_comments'])): ?>
-                                <div class="task-comment-counter">
-                                    <?= $task['nb_comments'] ?>
+                                <div class="task-icons">
+                                    <?php if (! empty($task['nb_comments'])): ?>
+                                        <?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i>
+                                    <?php endif ?>
+
+                                    <?php if (! empty($task['description'])): ?>
+                                        <i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i>
+                                    <?php endif ?>
                                 </div>
-                                <?php endif ?>
                             </div>
 
                         </div>
diff --git a/templates/layout.php b/templates/layout.php
index 40c0b321..b57ac496 100644
--- a/templates/layout.php
+++ b/templates/layout.php
@@ -4,6 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" href="assets/css/app.css" media="screen">
+        <link rel="stylesheet" href="assets/css/font-awesome.min.css" media="screen">
         <link rel="icon" type="image/png" href="assets/img/favicon.png">
         <link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png">
         <link rel="apple-touch-icon" sizes="72x72" href="assets/img/touch-icon-ipad.png">
@@ -36,7 +37,7 @@
                     </li>
                     <li>
                         <a href="?controller=user&amp;action=logout"><?= t('Logout') ?></a>
-                        (<?= Helper\escape($_SESSION['user']['username']) ?>)
+                        (<?= Helper\escape(Helper\get_username()) ?>)
                     </li>
                 </ul>
             </nav>
diff --git a/templates/project_search.php b/templates/project_search.php
index d7d7748e..ee1e5025 100644
--- a/templates/project_search.php
+++ b/templates/project_search.php
@@ -45,6 +45,15 @@
                 </td>
                 <td>
                     <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a>
+                    <div class="task-table-icons">
+                        <?php if (! empty($task['nb_comments'])): ?>
+                            <?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i>
+                        <?php endif ?>
+
+                        <?php if (! empty($task['description'])): ?>
+                            <i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i>
+                        <?php endif ?>
+                    </div>
                 </td>
                 <td>
                     <?php if ($task['username']): ?>
diff --git a/templates/project_tasks.php b/templates/project_tasks.php
index 1ffd52ac..2c152497 100644
--- a/templates/project_tasks.php
+++ b/templates/project_tasks.php
@@ -31,6 +31,15 @@
                 </td>
                 <td>
                     <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a>
+                    <div class="task-table-icons">
+                        <?php if (! empty($task['nb_comments'])): ?>
+                            <?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i>
+                        <?php endif ?>
+
+                        <?php if (! empty($task['description'])): ?>
+                            <i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i>
+                        <?php endif ?>
+                    </div>
                 </td>
                 <td>
                     <?php if ($task['username']): ?>
-- 
cgit v1.2.3