webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Refactored common list handling operations to new class

Browse Source
This commit is contained in:
Dan Brown
2022-10-30 15:16:06 +00:00
parent f75091a1c5
commit ec4cbbd004
17 changed files with 212 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/books/index.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layouts.tri')
@section('body')
@include('books.parts.list', ['books' => $books, 'view' => $view])
@include('books.parts.list', ['books' => $books, 'view' => $view, 'listOptions' => $listOptions])
@stop
@section('left')

8
resources/views/books/parts/list.blade.php
View File

@@ -2,13 +2,7 @@
<div class="grid half v-center no-row-gap">
<h1 class="list-heading">{{ trans('entities.books') }}</h1>
<div class="text-m-right my-m">
@include('common.sort', ['options' => [
'name' => trans('common.sort_name'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
], 'order' => $order, 'sort' => $sort, 'type' => 'books'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>
@if(count($books) > 0)

13
resources/views/settings/roles/index.blade.php
View File

@@ -22,18 +22,15 @@
<div>
<div class="block inline mr-xs">
<form method="get" action="{{ url("/settings/roles") }}">
<input type="text" name="search" placeholder="{{ trans('common.search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
<input type="text"
name="search"
placeholder="{{ trans('common.search') }}"
value="{{ $listOptions->getSearch() }}">
</form>
</div>
</div>
<div class="justify-flex-end">
@include('common.sort', ['options' => [
'display_name' => trans('common.sort_name'),
'users_count' => trans('settings.roles_assigned_users'),
'permissions_count' => trans('settings.roles_permissions_provided'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
], 'order' => $listDetails['order'], 'sort' => $listDetails['sort'], 'type' => 'roles'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>

13
resources/views/settings/webhooks/index.blade.php
View File

@@ -23,18 +23,15 @@
<div>
<div class="block inline mr-xs">
<form method="get" action="{{ url("/settings/webhooks") }}">
<input type="text" name="search" placeholder="{{ trans('common.search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
<input type="text"
name="search"
placeholder="{{ trans('common.search') }}"
value="{{ $listOptions->getSearch() }}">
</form>
</div>
</div>
<div class="justify-flex-end">
@include('common.sort', ['options' => [
'name' => trans('common.sort_name'),
'endpoint' => trans('settings.webhooks_endpoint'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
'active' => trans('common.status'),
], 'order' => $listDetails['order'], 'sort' => $listDetails['sort'], 'type' => 'webhooks'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>

2
resources/views/shelves/index.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layouts.tri')
@section('body')
@include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view])
@include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view, 'listOptions' => $listOptions])
@stop
@section('right')

2
resources/views/shelves/parts/list.blade.php
View File

@@ -3,7 +3,7 @@
<div class="grid half v-center">
<h1 class="list-heading">{{ trans('entities.shelves') }}</h1>
<div class="text-right">
@include('common.sort', ['options' => $sortOptions, 'order' => $order, 'sort' => $sort, 'type' => 'bookshelves'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>

7
resources/views/shelves/show.blade.php
View File

@@ -23,12 +23,7 @@
<h1 class="flex fit-content break-text">{{ $shelf->name }}</h1>
<div class="flex"></div>
<div class="flex fit-content text-m-right my-m ml-m">
@include('common.sort', ['options' => [
'default' => trans('common.sort_default'),
'name' => trans('common.sort_name'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
], 'order' => $order, 'sort' => $sort, 'type' => 'shelf_books'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>

13
resources/views/users/index.blade.php
View File

@@ -20,18 +20,15 @@
<div>
<div class="block inline mr-xs">
<form method="get" action="{{ url("/settings/users") }}">
<input type="text" name="search" placeholder="{{ trans('settings.users_search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
<input type="text"
name="search"
placeholder="{{ trans('settings.users_search') }}"
value="{{ $listOptions->getSearch() }}">
</form>
</div>
</div>
<div class="justify-flex-end">
@include('common.sort', ['options' => [
'name' => trans('common.sort_name'),
'email' => trans('auth.email'),
'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'),
'last_activity_at' => trans('settings.users_latest_activity'),
], 'order' => $listDetails['order'], 'sort' => $listDetails['sort'], 'type' => 'users'])
@include('common.sort', $listOptions->getSortControlData())
</div>
</div>