github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 12:55:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated page exports to use absolute time format

Browse Source 
For #1065
This commit is contained in:
Dan Brown 2018-12-22 16:35:04 +00:00
parent f62843c861
commit f4ea5f1f55
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/pages/export.blade.php
View File

@ -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>

33
resources/views/partials/entity-export-meta.blade.php Normal file
View File

@ -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>

11
tests/Entity/ExportTest.php
View File

@ -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());
}
}