From eb30a63c819ca50ebbc896eb293a0745dcd043be Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Sat, 12 Jan 2019 19:49:41 +0100 Subject: timeline message working --- app/view/templates/backtopbar.php | 1 + app/view/templates/timeline.php | 65 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 app/view/templates/timeline.php (limited to 'app/view') diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php index 78e9181..07b19e8 100644 --- a/app/view/templates/backtopbar.php +++ b/app/view/templates/backtopbar.php @@ -22,6 +22,7 @@ +>timeline >id() ?> level() ?> diff --git a/app/view/templates/timeline.php b/app/view/templates/timeline.php new file mode 100644 index 0000000..8ddc7f1 --- /dev/null +++ b/app/view/templates/timeline.php @@ -0,0 +1,65 @@ +layout('layout', ['title' => 'timeline', 'css' => $css . 'home.css', 'favicon' => '']) ?> + + + + +start('page') ?> + + + + + insert('backtopbar', ['user' => $user, 'tab' => 'timeline']) ?> + +iseditor()) { ?> + +
+ +

Timeline

+ + + +
+ + + + + + + + +
+ +
+ + + + + + + +stop() ?> \ No newline at end of file -- cgit v1.2.3 From 8130427ec508f1d66553b52052c840c311081061 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Mon, 14 Jan 2019 19:24:19 +0100 Subject: fix save art out of session --- app/view/templates/backtopbar.php | 1 + app/view/templates/connect.php | 4 ++++ app/view/templates/navart.php | 2 ++ 3 files changed, 7 insertions(+) (limited to 'app/view') diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php index 07b19e8..d6b522e 100644 --- a/app/view/templates/backtopbar.php +++ b/app/view/templates/backtopbar.php @@ -15,6 +15,7 @@
+
diff --git a/app/view/templates/connect.php b/app/view/templates/connect.php index 06fe9c8..5d7ee5c 100644 --- a/app/view/templates/connect.php +++ b/app/view/templates/connect.php @@ -11,7 +11,11 @@ isvisitor()) { ?> +Your edits have been temporary saved. You need to connect and update to store it completly

' : '' ?> +
+ +
diff --git a/app/view/templates/navart.php b/app/view/templates/navart.php index be3b248..1e6b551 100644 --- a/app/view/templates/navart.php +++ b/app/view/templates/navart.php @@ -72,6 +72,7 @@
  • +
    @@ -82,6 +83,7 @@
  • +
    • -- cgit v1.2.3 From de195c2fca2f4b77a54be68fb58cd0ccee10a5b7 Mon Sep 17 00:00:00 2001 From: vincent-peugnet 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') 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 @@
      id() === $event->user()) { - $class = 'class="self event"'; - } else { - $class = 'class="event"'; - } - echo '
    • '; - switch ($event->type()) { - case 'message': - echo '

      '. $event->user() .'

      '; - echo '

      '. $event->message() .'

      '; - echo ''. $event->date('hrdi') .' ago'; - break; - - default: +foreach ($groupedeventlist as $eventuser) { + + if($user->id() === $eventuser['user']) { + $class = 'class="self user"'; + } else { + $class = 'class="user"'; + } + echo '
    • '; + echo '

      '. $eventuser['user'] .'

      '; + echo'
        '; + foreach ($eventuser as $key => $event) { + if($key !== 'user') { + echo '
      • '; + switch ($event->type()) { + case 'message': + echo '

        '. $event->message() .'

        '; + break; + } + + ?> + + + clap()) ? ''. $event->clap() .'' : '' ?> + + + + id() !== $eventuser['user']) {?> +
        + + +
        + + + + date('hrdi') ?> ago - break; - echo '
        • '; + + + + + '; } ?> @@ -50,7 +75,7 @@ foreach ($eventlist as $event) { - + -- cgit v1.2.3