diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index 85a77e0cb..bed781b61 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -235,6 +235,7 @@ return [ 'pages_revisions_number' => '#', 'pages_revisions_numbered' => 'Revision #:id', 'pages_revisions_numbered_changes' => 'Revision #:id Changes', + 'pages_revisions_editor' => 'Editor Type', 'pages_revisions_changelog' => 'Changelog', 'pages_revisions_changes' => 'Changes', 'pages_revisions_current' => 'Current Version', diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index 87949837b..fb9e891bb 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -21,26 +21,39 @@ - - - - - - + + + + + @foreach($page->revisions as $index => $revision) - - + - - - - + +
{{ trans('entities.pages_revisions_number') }}{{ trans('entities.pages_name') }}{{ trans('entities.pages_revisions_created_by') }}{{ trans('entities.pages_revisions_date') }}{{ trans('entities.pages_revisions_changelog') }}{{ trans('common.actions') }}{{ trans('entities.pages_revisions_number') }} + {{ trans('entities.pages_name') }} / {{ trans('entities.pages_revisions_editor') }} + {{ trans('entities.pages_revisions_created_by') }} / {{ trans('entities.pages_revisions_date') }}{{ trans('entities.pages_revisions_changelog') }}{{ trans('common.actions') }}
{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}{{ $revision->name }} + + {{ $revision->name }} +
+ ({{ $revision->markdown ? 'Markdown' : 'WYSIWYG' }}) +
@if($revision->createdBy) {{ $revision->createdBy->name }} @endif @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif{{ $revision->created_at->formatLocalized('%e %B %Y %H:%M:%S') }}
({{ $revision->created_at->diffForHumans() }})
{{ $revision->summary }} + + @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif +
+
+ {{ $revision->created_at->formatLocalized('%e %B %Y %H:%M:%S') }} + ({{ $revision->created_at->diffForHumans() }}) +
+
+ {{ $revision->summary }} + {{ trans('entities.pages_revisions_changes') }}  |  diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php index fc6678788..ce203ea36 100644 --- a/tests/Entity/PageRevisionTest.php +++ b/tests/Entity/PageRevisionTest.php @@ -203,4 +203,19 @@ class PageRevisionTest extends TestCase $revisionCount = $page->revisions()->count(); $this->assertEquals(12, $revisionCount); } + + public function test_revision_list_shows_editor_type() + { + /** @var Page $page */ + $page = Page::first(); + $this->asAdmin()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html']); + + $resp = $this->get($page->refresh()->getUrl('/revisions')); + $resp->assertElementContains('td', '(WYSIWYG)'); + $resp->assertElementNotContains('td', '(Markdown)'); + + $this->asAdmin()->put($page->getUrl(), ['name' => 'Updated page', 'markdown' => '# Some markdown content']); + $resp = $this->get($page->refresh()->getUrl('/revisions')); + $resp->assertElementContains('td', '(Markdown)'); + } }