From 63d7062f3c114cd05122044a4f5ed3a2f3df18f3 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 28 Oct 2016 16:34:23 -0400
Subject: [PATCH] Make dates a little more user friendly

---
 resources/views/server/files/index.blade.php |  2 +-
 resources/views/server/files/list.blade.php  | 22 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/resources/views/server/files/index.blade.php b/resources/views/server/files/index.blade.php
index 34a13c308..1889d41ba 100644
--- a/resources/views/server/files/index.blade.php
+++ b/resources/views/server/files/index.blade.php
@@ -51,7 +51,7 @@
                     <h3 class="panel-title">File Path Information</h3>
                 </div>
                 <div class="panel-body">
-                    When configuring any file paths in your server plugins or settings you should use <code>/home/container</code> as your base path. While your SFTP client sees the files as <code>/public</code> this is not true for the server process.
+                    When configuring any file paths in your server plugins or settings you should use <code>/home/container</code> as your base path.
                 </div>
             </div>
         </div>
diff --git a/resources/views/server/files/list.blade.php b/resources/views/server/files/list.blade.php
index f915e0ce5..a4245d6de 100644
--- a/resources/views/server/files/list.blade.php
+++ b/resources/views/server/files/list.blade.php
@@ -63,7 +63,16 @@
                     <a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">{{ $folder['entry'] }}</a>
                 </td>
                 <td data-identifier="size">{{ $folder['size'] }}</td>
-                <td data-identifier="modified">{{ date('m/d/y H:i:s', $folder['date']) }}</td>
+                <td data-identifier="modified">
+                    <?php $carbon = Carbon::createFromTimestamp($folder['date'])->timezone(env('APP_TIMEZONE', 'America/New_York')); ?>
+                    @if($carbon->diffInMinutes(Carbon::now()) > 60)
+                        {{ $carbon->format('m/d/y H:i:s') }}
+                    @elseif($carbon->diffInSeconds(Carbon::now()) < 5 || $carbon->isFuture())
+                        <em>seconds ago</em>
+                    @else
+                        {{ $carbon->diffForHumans() }}
+                    @endif
+                </td>
             </tr>
         @endforeach
         @foreach ($files as $file)
@@ -130,7 +139,16 @@
                     @endif
                 </td>
                 <td data-identifier="size">{{ $file['size'] }}</td>
-                <td data-identifier="modified">{{ date('m/d/y H:i:s', $file['date']) }}</td>
+                <td data-identifier="modified">
+                    <?php $carbon = Carbon::createFromTimestamp($file['date'])->timezone(env('APP_TIMEZONE', 'America/New_York')); ?>
+                    @if($carbon->diffInMinutes(Carbon::now()) > 60)
+                        {{ $carbon->format('m/d/y H:i:s') }}
+                    @elseif($carbon->diffInSeconds(Carbon::now()) < 5 || $carbon->isFuture())
+                        <em>seconds ago</em>
+                    @else
+                        {{ $carbon->diffForHumans() }}
+                    @endif
+                </td>
             </tr>
         @endforeach
     </tbody>