Adds button to allow users to toggle the book view via the books list page.

Closes #613

Signed-off-by: Abijeet <redacted>

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index e181aec8967285956ab5f707dc9a4fd09e326bf7..aa8f89ea493cd88f6e8e86058ab69917ad381d42 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -46,7 +46,7 @@ class BookController extends Controller
             'books' => $books,
             'recents' => $recents,
             'popular' => $popular,
             'books' => $books,
             'recents' => $recents,
             'popular' => $popular,

-            'new' => $new, 
+            'new' => $new,

             'booksViewType' => $booksViewType
         ]);
     }
             'booksViewType' => $booksViewType
         ]);
     }

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index fe5c7a243b6c4e7899cf5730da9755225268f371..5c10133a2cbe1aa6c4a2cf3e6cfd86777bfb0c01 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -249,4 +249,25 @@ class UserController extends Controller
             'assetCounts' => $assetCounts
         ]);
     }
             'assetCounts' => $assetCounts
         ]);
     }

+
+    public function switchBookView($id, Request $request) {
+        $this->checkPermission('users-manage');
+        $viewType = $request->get('book_view_type');
+
+        if (!in_array($viewType, ['grid', 'list'])) {
+            $viewType = 'list';
+        }
+
+        $user = $this->user->findOrFail($id);
+        setting()->putUser($user, 'books_view_type', $viewType);
+
+        $previousUrl = url()->previous();
+        if (empty($previousUrl)) {
+            // if no previous URL, redirect to settings
+            return redirect("/settings/users/$id");
+        } else {
+            // redirect to the previous page.
+            return redirect($previousUrl);
+        }
+    }

 }
 }

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 4dc5ccc382c1a242ca4a2f13153eb8f09a0d7191..6e481d03bf8b559d5e83a1720228657145fb6830 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -99,6 +99,7 @@ return [
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_show_other' => 'Show Other Books',
     'books_sort_save' => 'Save New Order',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_show_other' => 'Show Other Books',
     'books_sort_save' => 'Save New Order',

+    'books_toggle_view' => 'Toggle Book View',

 
     /**
      * Chapters
 
     /**
      * Chapters

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index d392af045aab36ee3a99e03a21a8a2a9200517d5..5ca01a550e92dd52b51ecee9c906f57809d86297 100644 (file)
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -4,6 +4,11 @@
     <div class="col-xs-1"></div>
     <div class="col-xs-11 faded">
         <div class="action-buttons">
     <div class="col-xs-1"></div>
     <div class="col-xs-11 faded">
         <div class="action-buttons">

+            <form action="{{ baseUrl("/settings/users/{$currentUser->id}/switch-book-view") }}" method="POST" class="inline">
+                {!! csrf_field() !!}
+                <input type="hidden" value="{{ $booksViewType === 'list'? 'grid' : 'list' }}" name="book_view_type">
+                <button type="submit" class="text-pos text-button"><i class="zmdi zmdi-wrap-text"></i>{{ trans('entities.books_toggle_view') }}</button>
+            </form>

             @if($currentUser->can('book-create-all'))
                 <a href="{{ baseUrl("/books/create") }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.books_create') }}</a>
             @endif
             @if($currentUser->can('book-create-all'))
                 <a href="{{ baseUrl("/books/create") }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.books_create') }}</a>
             @endif


@@ -52,7 +57,7 @@
                     <hr>
                 @endforeach
                 {!! $books->render() !!}
                     <hr>
                 @endforeach
                 {!! $books->render() !!}

-            @else 
+            @else

              <div class="row auto-clear">
                     @foreach($books as $key => $book)
                             @include('books/grid-item', ['book' => $book])
              <div class="row auto-clear">
                     @foreach($books as $key => $book)
                             @include('books/grid-item', ['book' => $book])

diff --git a/routes/web.php b/routes/web.php
index f5e59f1095a3adeb1289e945ad3da826dff65640..31de09737034eba8f1154691162e2cd3cdc1ed6d 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -146,6 +146,7 @@ Route::group(['middleware' => 'auth'], function () {
         Route::get('/users', 'UserController@index');
         Route::get('/users/create', 'UserController@create');
         Route::get('/users/{id}/delete', 'UserController@delete');
         Route::get('/users', 'UserController@index');
         Route::get('/users/create', 'UserController@create');
         Route::get('/users/{id}/delete', 'UserController@delete');

+        Route::post('/users/{id}/switch-book-view', 'UserController@switchBookView');

         Route::post('/users/create', 'UserController@store');
         Route::get('/users/{id}', 'UserController@edit');
         Route::put('/users/{id}', 'UserController@update');
         Route::post('/users/create', 'UserController@store');
         Route::get('/users/{id}', 'UserController@edit');
         Route::put('/users/{id}', 'UserController@update');