mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-28 21:22:30 +00:00
Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master
This commit is contained in:
commit
8a9505bf8c
@ -92,6 +92,7 @@ return [
|
|||||||
'recycle_bin' => 'Recycle Bin',
|
'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_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_item' => 'Deleted Item',
|
||||||
|
'recycle_bin_deleted_parent' => 'Parent',
|
||||||
'recycle_bin_deleted_by' => 'Deleted By',
|
'recycle_bin_deleted_by' => 'Deleted By',
|
||||||
'recycle_bin_deleted_at' => 'Deletion Time',
|
'recycle_bin_deleted_at' => 'Deletion Time',
|
||||||
'recycle_bin_permanently_delete' => 'Permanently Delete',
|
'recycle_bin_permanently_delete' => 'Permanently Delete',
|
||||||
|
@ -39,7 +39,8 @@
|
|||||||
|
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<tr>
|
<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="20%">{{ trans('settings.recycle_bin_deleted_by') }}</th>
|
||||||
<th width="15%">{{ trans('settings.recycle_bin_deleted_at') }}</th>
|
<th width="15%">{{ trans('settings.recycle_bin_deleted_at') }}</th>
|
||||||
<th width="15%"></th>
|
<th width="15%"></th>
|
||||||
@ -78,6 +79,16 @@
|
|||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</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>@include('partials.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])</td>
|
||||||
<td width="200">{{ $deletion->created_at }}</td>
|
<td width="200">{{ $deletion->created_at }}</td>
|
||||||
<td width="150" class="text-right">
|
<td width="150" class="text-right">
|
||||||
|
Loading…
Reference in New Issue
Block a user