Updated page exports to use absolute time format

For #1065
BookStackApp · Dec 22, 2018 · f4ea5f1 · f4ea5f1
1 parent f62843c
commit f4ea5f1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php
@@ -23,7 +23,7 @@
                 <hr>
 
                 <div class="text-muted text-small">
-                    @include('partials.entity-meta', ['entity' => $page])
+                    @include('partials.entity-export-meta', ['entity' => $page])
                 </div>
 
             </div>

diff --git a/resources/views/partials/entity-export-meta.blade.php b/resources/views/partials/entity-export-meta.blade.php
@@ -0,0 +1,33 @@
+<div class="entity-meta">
+    @if($entity->isA('revision'))
+        @icon('history'){{ trans('entities.pages_revision') }}
+        {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
+        <br>
+    @endif
+
+    @if ($entity->isA('page'))
+        @if (userCan('page-update', $entity)) <a href="{{ $entity->getUrl('/revisions') }}"> @endif
+        @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }} <br>
+        @if (userCan('page-update', $entity))</a>@endif
+    @endif
+
+    @if ($entity->createdBy)
+        @icon('star'){!! trans('entities.meta_created_name', [
+            'timeLength' => '<span>'.$entity->created_at->toDayDateTimeString() . '</span>',
+            'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".htmlentities($entity->createdBy->name). "</a>"
+            ]) !!}
+    @else
+        @icon('star')<span>{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->toDayDateTimeString()]) }}</span>
+    @endif
+
+    <br>
+
+    @if ($entity->updatedBy)
+        @icon('edit'){!! trans('entities.meta_updated_name', [
+                'timeLength' => '<span>' . $entity->updated_at->toDayDateTimeString() .'</span>',
+                'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".htmlentities($entity->updatedBy->name). "</a>"
+            ]) !!}
+    @elseif (!$entity->isA('revision'))
+        @icon('edit')<span>{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->toDayDateTimeString()]) }}</span>
+    @endif
+</div>
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
@@ -123,4 +123,15 @@ public function test_page_html_export_contains_custom_head_if_set()
         $resp->assertSee($customHeadContent);
     }
 
+    public function test_page_html_export_use_absolute_dates()
+    {
+        $page = Page::first();
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+        $resp->assertSee($page->created_at->toDayDateTimeString());
+        $resp->assertDontSee($page->created_at->diffForHumans());
+        $resp->assertSee($page->updated_at->toDayDateTimeString());
+        $resp->assertDontSee($page->updated_at->diffForHumans());
+    }
+
 }