From 6351cb0e27eea05a2b0a8063b8b0df0abc49896d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 19 Mar 2016 16:22:00 -0400
Subject: Improve activity stream layout

---
 app/Template/event/comment_create.php       |  5 +++--
 app/Template/event/comment_update.php       |  5 +++--
 app/Template/event/events.php               | 29 ++++++++---------------------
 app/Template/event/subtask_create.php       |  3 ++-
 app/Template/event/subtask_update.php       |  3 ++-
 app/Template/event/task_assignee_change.php |  7 ++++---
 app/Template/event/task_close.php           |  7 ++++---
 app/Template/event/task_create.php          |  7 ++++---
 app/Template/event/task_file_create.php     |  7 ++++---
 app/Template/event/task_move_column.php     |  7 ++++---
 app/Template/event/task_move_position.php   |  7 ++++---
 app/Template/event/task_move_swimlane.php   |  7 ++++---
 app/Template/event/task_open.php            |  7 ++++---
 app/Template/event/task_update.php          |  7 ++++---
 app/Template/task/changes.php               |  2 +-
 15 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 43c521cf..9869c94b 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -3,8 +3,9 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
 <div class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em><br/>
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
     <div class="markdown"><?= $this->text->markdown($comment['comment']) ?></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index 80a33031..19420cf9 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -3,7 +3,8 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
 <div class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em><br/>
-</div>
\ No newline at end of file
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index 6bef8df4..ef651321 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -1,32 +1,19 @@
 <?php if (empty($events)): ?>
     <p class="alert"><?= t('There is no activity yet.') ?></p>
 <?php else: ?>
-
     <?php foreach ($events as $event): ?>
         <div class="activity-event">
-            <p class="activity-datetime">
-                <?php if ($this->text->contains($event['event_name'], 'subtask')): ?>
-                    <i class="fa fa-tasks"></i>
-                <?php elseif ($this->text->contains($event['event_name'], 'task.move')): ?>
-                    <i class="fa fa-arrows-alt"></i>
-                <?php elseif ($this->text->contains($event['event_name'], 'task')): ?>
-                    <i class="fa fa-newspaper-o"></i>
-                <?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
-                    <i class="fa fa-comments-o"></i>
-                <?php endif ?>
-                &nbsp;<?= $this->dt->datetime($event['date_creation']) ?>
-            </p>
-            <div class="activity-content">
-                <?= $this->avatar->render(
-                    $event['creator_id'],
-                    $event['author_username'],
-                    $event['author_name'],
-                    $event['email']
-                ) ?>
+            <?= $this->avatar->render(
+                $event['creator_id'],
+                $event['author_username'],
+                $event['author_name'],
+                $event['email']
+            ) ?>
 
+            <div class="activity-content">
                 <?= $event['event_content'] ?>
             </div>
         </div>
     <?php endforeach ?>
+<?php endif ?>
 
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index ae6ddd44..7e41d5c9 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -3,9 +3,10 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
 <div class="activity-description">
-    <p><em><?= $this->text->e($task['title']) ?></em></p>
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
 
     <ul>
         <li>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 1d560fb0..9fea4fe8 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -3,9 +3,10 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
 <div class="activity-description">
-    <p><em><?= $this->text->e($task['title']) ?></em></p>
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
 
     <ul>
         <li>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index 6964a50e..db78e7df 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -10,7 +10,8 @@
     <?php else: ?>
         <?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
     <?php endif ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
\ No newline at end of file
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 2ba77156..04157b0d 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -3,7 +3,8 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 21facc9e..6e26cdb8 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -3,7 +3,8 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 837f5dc0..0d8e545d 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -3,7 +3,8 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($file['name']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($file['name']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index b9ae65cc..0a78bca7 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -4,7 +4,8 @@
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
             $this->text->e($task['column_title'])
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index dbe73f4b..eeadfa02 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -5,7 +5,8 @@
             $task['position'],
             $this->text->e($task['column_title'])
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index b0635a06..a190bc0a 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -11,7 +11,8 @@
                 $this->text->e($task['swimlane_name'])
             ) ?>
     <?php endif ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index ce92bb18..d9cd90b3 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -3,7 +3,8 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
-</p>
\ No newline at end of file
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 83f1661b..07b94ff8 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -3,12 +3,13 @@
             $this->text->e($author),
             $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
         ) ?>
+    <span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
 </p>
-<p class="activity-description">
-    <em><?= $this->text->e($task['title']) ?></em>
+<div class="activity-description">
+    <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
     <?php if (isset($changes)): ?>
         <div class="activity-changes">
             <?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
         </div>
     <?php endif ?>
-</p>
\ No newline at end of file
+</div>
diff --git a/app/Template/task/changes.php b/app/Template/task/changes.php
index 779bdfa9..9d36f09f 100644
--- a/app/Template/task/changes.php
+++ b/app/Template/task/changes.php
@@ -68,7 +68,7 @@
     </ul>
 
     <?php if (! empty($changes['description'])): ?>
-        <p><?= t('The description has been modified') ?></p>
+        <p><strong><?= t('The description has been modified:') ?></strong></p>
         <div class="markdown"><?= $this->text->markdown($task['description']) ?></div>
     <?php endif ?>
 <?php endif ?>
\ No newline at end of file
-- 
cgit v1.2.3