From de807f853872455b5ab3eded4c2b7e17f745f4fc Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 31 Oct 2022 16:45:32 +0000 Subject: [PATCH] Updated recycle bin list to new responsive layout --- .../settings/recycle-bin/index.blade.php | 92 +++++-------------- .../parts/recycle-bin-list-item.blade.php | 48 ++++++++++ 2 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php diff --git a/resources/views/settings/recycle-bin/index.blade.php b/resources/views/settings/recycle-bin/index.blade.php index 56e2437fe..9e82ba467 100644 --- a/resources/views/settings/recycle-bin/index.blade.php +++ b/resources/views/settings/recycle-bin/index.blade.php @@ -8,11 +8,11 @@

{{ trans('settings.recycle_bin') }}

-
-
-

{{ trans('settings.recycle_bin_desc') }}

+
+
+

{{ trans('settings.recycle_bin_desc') }}

-
+
-
- {!! $deletions->links() !!} +
+ {!! $deletions->links() !!} +
- - - - - - - - +
+
+
{{ trans('settings.audit_deleted_item') }}
+
{{ trans('settings.recycle_bin_deleted_parent') }}
+
{{ trans('settings.recycle_bin_deleted_by') }}
+
{{ trans('settings.recycle_bin_deleted_at') }}
+
+
@if(count($deletions) === 0) -
- - +
+

{{ trans('settings.recycle_bin_contents_empty') }}

+
@endif @foreach($deletions as $deletion) - - - - - - - + @include('settings.recycle-bin.parts.recycle-bin-list-item', ['deletion' => $deletion]) @endforeach -
{{ trans('settings.recycle_bin_deleted_item') }}{{ trans('settings.recycle_bin_deleted_parent') }}{{ trans('settings.recycle_bin_deleted_by') }}{{ trans('settings.recycle_bin_deleted_at') }}
-

{{ trans('settings.recycle_bin_contents_empty') }}

-
-
- @icon($deletion->deletable->getType()) -
- {{ $deletion->deletable->name }} -
-
- @if($deletion->deletable instanceof \BookStack\Entities\Models\Book || $deletion->deletable instanceof \BookStack\Entities\Models\Chapter) -
- @endif - @if($deletion->deletable instanceof \BookStack\Entities\Models\Book) -
-
- @icon('chapter') {{ trans_choice('entities.x_chapters', $deletion->deletable->chapters()->withTrashed()->count()) }} -
-
- @endif - @if($deletion->deletable instanceof \BookStack\Entities\Models\Book || $deletion->deletable instanceof \BookStack\Entities\Models\Chapter) -
-
- @icon('page') {{ trans_choice('entities.x_pages', $deletion->deletable->pages()->withTrashed()->count()) }} -
-
- @endif - 		- @if($deletion->deletable->getParent()) -
- @icon($deletion->deletable->getParent()->getType()) -
- {{ $deletion->deletable->getParent()->name }} -
-
- @endif - 		@include('settings.parts.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by]){{ $deletion->created_at }} -
- - -
-
+
- {!! $deletions->links() !!} +
+ {!! $deletions->links() !!} +
diff --git a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php new file mode 100644 index 000000000..8af598b1e --- /dev/null +++ b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php @@ -0,0 +1,48 @@ +
+
+
+ @icon($deletion->deletable->getType()) +
+ {{ $deletion->deletable->name }} +
+
+ @if($deletion->deletable instanceof \BookStack\Entities\Models\Book) +
+
+ @icon('chapter') {{ trans_choice('entities.x_chapters', $deletion->deletable->chapters()->withTrashed()->count()) }} +
+
+ @endif + @if($deletion->deletable instanceof \BookStack\Entities\Models\Book || $deletion->deletable instanceof \BookStack\Entities\Models\Chapter) +
+
+ @icon('page') {{ trans_choice('entities.x_pages', $deletion->deletable->pages()->withTrashed()->count()) }} +
+
+ @endif +
+
+ @if($deletion->deletable->getParent()) + {{ trans('settings.recycle_bin_deleted_parent') }}:
 +
+ @icon($deletion->deletable->getParent()->getType()) +
+ {{ $deletion->deletable->getParent()->name }} +
+
+ @endif +
+
+
{{ trans('settings.recycle_bin_deleted_by') }}:
@include('settings.parts.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])
+
+
{{ trans('settings.recycle_bin_deleted_at') }}:
{{ $deletion->created_at }}
+
+
+ + +
+
+
\ No newline at end of file