diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php index ca708f8e0..0f76a8861 100644 --- a/resources/views/pages/export.blade.php +++ b/resources/views/pages/export.blade.php @@ -23,7 +23,7 @@
- @include('partials.entity-meta', ['entity' => $page]) + @include('partials.entity-export-meta', ['entity' => $page])
diff --git a/resources/views/partials/entity-export-meta.blade.php b/resources/views/partials/entity-export-meta.blade.php new file mode 100644 index 000000000..fa1394ed4 --- /dev/null +++ b/resources/views/partials/entity-export-meta.blade.php @@ -0,0 +1,33 @@ +
+ @if($entity->isA('revision')) + @icon('history'){{ trans('entities.pages_revision') }} + {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }} +
+ @endif + + @if ($entity->isA('page')) + @if (userCan('page-update', $entity)) @endif + @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
+ @if (userCan('page-update', $entity))
@endif + @endif + + @if ($entity->createdBy) + @icon('star'){!! trans('entities.meta_created_name', [ + 'timeLength' => ''.$entity->created_at->toDayDateTimeString() . '', + 'user' => "".htmlentities($entity->createdBy->name). "" + ]) !!} + @else + @icon('star'){{ trans('entities.meta_created', ['timeLength' => $entity->created_at->toDayDateTimeString()]) }} + @endif + +
+ + @if ($entity->updatedBy) + @icon('edit'){!! trans('entities.meta_updated_name', [ + 'timeLength' => '' . $entity->updated_at->toDayDateTimeString() .'', + 'user' => "".htmlentities($entity->updatedBy->name). "" + ]) !!} + @elseif (!$entity->isA('revision')) + @icon('edit'){{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->toDayDateTimeString()]) }} + @endif +
\ No newline at end of file diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php index 51090650c..fdcd83366 100644 --- a/tests/Entity/ExportTest.php +++ b/tests/Entity/ExportTest.php @@ -123,4 +123,15 @@ class ExportTest extends TestCase $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()); + } + } \ No newline at end of file