Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-07-07 20:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master

Browse Source
This commit is contained in:
Dan Brown 2021-06-26 11:19:21 +01:00
commit 8a9505bf8c
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en/settings.php
View File

@ -92,6 +92,7 @@ return [
'recycle_bin' => 'Recycle Bin',
'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
'recycle_bin_deleted_item' => 'Deleted Item',
'recycle_bin_deleted_parent' => 'Parent',
'recycle_bin_deleted_by' => 'Deleted By',
'recycle_bin_deleted_at' => 'Deletion Time',
'recycle_bin_permanently_delete' => 'Permanently Delete',

13
resources/views/settings/recycle-bin/index.blade.php
View File

@ -39,7 +39,8 @@
<table class="table">
<tr>
<th width="50%">{{ trans('settings.recycle_bin_deleted_item') }}</th>
<th width="30%">{{ trans('settings.recycle_bin_deleted_item') }}</th>
<th width="20%">{{ trans('settings.recycle_bin_deleted_parent') }}</th>
<th width="20%">{{ trans('settings.recycle_bin_deleted_by') }}</th>
<th width="15%">{{ trans('settings.recycle_bin_deleted_at') }}</th>
<th width="15%"></th>
@ -78,6 +79,16 @@
</div>
@endif
</td>
<td>
@if($deletion->deletable->getParent())
<div class="table-entity-item">
<span role="presentation" class="icon text-{{$deletion->deletable->getParent()->getType()}}">@icon($deletion->deletable->getParent()->getType())</span>
<div class="text-{{ $deletion->deletable->getParent()->getType() }}">
{{ $deletion->deletable->getParent()->name }}
</div>
</div>
@endif
</td>
<td>@include('partials.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])</td>
<td width="200">{{ $deletion->created_at }}</td>
<td width="150" class="text-right">