From de195c2fca2f4b77a54be68fb58cd0ccee10a5b7 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Tue, 15 Jan 2019 03:59:32 +0100
Subject: timeline is ok for messaging

---
 app/view/templates/timeline.php | 61 +++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 18 deletions(-)

(limited to 'app/view/templates')

diff --git a/app/view/templates/timeline.php b/app/view/templates/timeline.php
index 8ddc7f1..fcf8afd 100644
--- a/app/view/templates/timeline.php
+++ b/app/view/templates/timeline.php
@@ -19,25 +19,50 @@
 <ul>
 
 <?php
-foreach ($eventlist as $event) {
-    if($user->id() === $event->user()) {
-        $class = 'class="self event"';
-    } else {
-        $class = 'class="event"';
-    }
-    echo '<li '. $class .'>';
-    switch ($event->type()) {
-        case 'message':
-            echo '<h3>'. $event->user() .'</h3>';
-            echo '<p>'. $event->message() .'</p>';
-            echo '<i>'. $event->date('hrdi') .' ago</i>';
-            break;
-        
-        default:
+foreach ($groupedeventlist as $eventuser) {
+
+        if($user->id() === $eventuser['user']) {
+            $class = 'class="self user"';
+        } else {
+            $class = 'class="user"';
+        }
+        echo '<li '. $class .'>';
+        echo '<h3>'. $eventuser['user'] .'</h3>';
+        echo' <ul>';
+    foreach ($eventuser as $key => $event) {
+        if($key !== 'user') {
+            echo '<li class="event">';
+            switch ($event->type()) {
+                case 'message':
+                echo '<p class="eline">'. $event->message() .'</p>';
+                break;
+            }
+
+            ?>
+
+
+            <?= !empty($event->clap()) ? '<b class="eline">'. $event->clap() .'</b>' : '' ?>
+
+            <span class="details">
+
+            <?php if($user->id() !== $eventuser['user']) {?>
+            <form class="eline" method="post" action="<?= $this->url('timelineclap') ?>">
+            <input type="hidden" name="id" value="<?= $event->id() ?>">
+            <input type="submit" name="clap" value="👌">
+            </form>
+            <?php } ?>
+
+
+            <i class="eline"><?= $event->date('hrdi') ?> ago</i>
             
-            break;
-    echo '</li>';
+            </span>
+
+            </li>
+
+            <?php
+        }
     }
+    echo '</ul></li>';
 }
 ?>
 
@@ -50,7 +75,7 @@ foreach ($eventlist as $event) {
 <input type="hidden" name="user" value="<?= $user->id() ?>">
 
 <label for="message">message</label>
-<textarea name="message" id="message" cols="30" rows="10"></textarea>
+<textarea name="message" id="message" cols="30" rows="10" autofocus></textarea>
 <input type="submit" value="send">
 </form>
 
-- 
cgit v1.2.3