Merge branch 'master' into feature/615

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 32e0a743c5cd8bcbe85d423e64b98aeb6bf93b8a..dff319506c20c4c3c7cddcc3e6a0d731e7c88992 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -33,22 +33,41 @@ class HomeController extends Controller
         $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
         $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
 
-        // Custom homepage
+
         $customHomepage = false;
-        $homepageSetting = setting('app-homepage');
-        if ($homepageSetting) {
-            $id = intval(explode(':', $homepageSetting)[0]);
-            $customHomepage = $this->entityRepo->getById('page', $id, false, true);
-            $this->entityRepo->renderPage($customHomepage, true);
+        $books = false;
+        $booksViewType = false;
+
+        // Check book homepage
+        $bookHomepageSetting = setting('app-book-homepage');
+        if ($bookHomepageSetting) {
+            $books = $this->entityRepo->getAllPaginated('book', 18);
+            $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books', 'list'));
+        } else {
+            // Check custom homepage
+            $homepageSetting = setting('app-homepage');
+            if ($homepageSetting) {
+                $id = intval(explode(':', $homepageSetting)[0]);
+                $customHomepage = $this->entityRepo->getById('page', $id, false, true);
+                $this->entityRepo->renderPage($customHomepage, true);
+            }
+        }
+
+        $view = 'home';
+        if ($bookHomepageSetting) {
+            $view = 'home-book';
+        } else if ($customHomepage) {
+            $view = 'home-custom';
         }
 
-        $view = $customHomepage ? 'home-custom' : 'home';
         return view($view, [
             'activity' => $activity,
             'recents' => $recents,
             'recentlyUpdatedPages' => $recentlyUpdatedPages,
             'draftPages' => $draftPages,
-            'customHomepage' => $customHomepage
+            'customHomepage' => $customHomepage,
+            'books' => $books,
+            'booksViewType' => $booksViewType
         ]);
     }
 

diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss
index 3ab2de522f64bcff88a879d6980fd98d19f8f849..6b3ed381549e3c1c8f3dedfb99b2a1ba06b09566 100644 (file)
--- a/resources/assets/sass/_forms.scss
+++ b/resources/assets/sass/_forms.scss
@@ -9,6 +9,7 @@
   color: #666;
   width: 250px;
   max-width: 100%;
+
   &.neg, &.invalid {
     border: 1px solid $negative;
   }

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index de48942802896372dd13332f29d8591ece565780..b699b5c4b4102da84cae724a41f2b98bfa1f282c 100755 (executable)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -34,6 +34,7 @@ return [
     'app_homepage' => 'Application Homepage',
     'app_homepage_desc' => 'Select a page to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
     'app_homepage_default' => 'Default homepage view chosen',
+    'app_homepage_books' => 'Or select the books page as your homepage. This will override any page selected as your homepage.',
     'app_disable_comments' => 'Disable comments',
     'app_disable_comments_desc' => 'Disable comments across all pages in the application. Existing comments are not shown.',
 

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index d1435ab662969c5f9128c6dc7d3d6dae9aae311f..84150203f081e2345f466a0f0b3399da3acb2298 100644 (file)
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -3,16 +3,7 @@
 @section('toolbar')
     <div class="col-xs-6">
         <div class="action-buttons text-left">
-            <form action="{{ baseUrl("/settings/users/{$currentUser->id}/switch-book-view") }}" method="POST" class="inline">
-                {!! csrf_field() !!}
-                {!! method_field('PATCH') !!}
-                <input type="hidden" value="{{ $booksViewType === 'list'? 'grid' : 'list' }}" name="book_view_type">
-                @if ($booksViewType === 'list')
-                    <button type="submit" class="text-pos text-button">@icon('grid'){{ trans('common.grid_view') }}</button>
-                @else
-                    <button type="submit" class="text-pos text-button">@icon('list'){{ trans('common.list_view') }}</button>
-                @endif
-            </form>
+            @include('books/view-toggle', ['booksViewType' => $booksViewType])
         </div>
     </div>
     <div class="col-xs-6 faded">
@@ -52,34 +43,5 @@
 @stop
 
 @section('body')
-    @if($booksViewType === 'list')
-        <div class="container small" ng-non-bindable>
-    @else
-        <div class="container" ng-non-bindable>
-    @endif
-        <h1>{{ trans('entities.books') }}</h1>
-        @if(count($books) > 0)
-            @if($booksViewType === 'list')
-                @foreach($books as $book)
-                    @include('books/list-item', ['book' => $book])
-                    <hr>
-                @endforeach
-                {!! $books->render() !!}
-            @else
-                 <div class="grid third">
-                    @foreach($books as $key => $book)
-                            @include('books/grid-item', ['book' => $book])
-                    @endforeach
-                 </div>
-                <div>
-                    {!! $books->render() !!}
-                </div>
-            @endif
-        @else
-            <p class="text-muted">{{ trans('entities.books_empty') }}</p>
-            @if(userCan('books-create-all'))
-                <a href="{{ baseUrl("/create-book") }}" class="text-pos">@icon('edit'){{ trans('entities.create_one_now') }}</a>
-            @endif
-        @endif
-    </div>
+    @include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
 @stop
\ No newline at end of file

diff --git a/resources/views/books/list.blade.php b/resources/views/books/list.blade.php
new file mode 100644 (file)
index 0000000..1c2056a
--- /dev/null
+++ b/resources/views/books/list.blade.php
@@ -0,0 +1,31 @@
+
+@if($booksViewType === 'list')
+    <div class="container small">
+@else
+    <div class="container">
+@endif
+    <h1>{{ trans('entities.books') }}</h1>
+    @if(count($books) > 0)
+        @if($booksViewType === 'list')
+            @foreach($books as $book)
+                @include('books/list-item', ['book' => $book])
+                <hr>
+            @endforeach
+            {!! $books->render() !!}
+        @else
+             <div class="grid third">
+                @foreach($books as $key => $book)
+                        @include('books/grid-item', ['book' => $book])
+                @endforeach
+             </div>
+            <div>
+                {!! $books->render() !!}
+            </div>
+        @endif
+    @else
+        <p class="text-muted">{{ trans('entities.books_empty') }}</p>
+        @if(userCan('books-create-all'))
+            <a href="{{ baseUrl("/create-book") }}" class="text-pos">@icon('edit'){{ trans('entities.create_one_now') }}</a>
+        @endif
+    @endif
+</div>
\ No newline at end of file

diff --git a/resources/views/books/view-toggle.blade.php b/resources/views/books/view-toggle.blade.php
new file mode 100644 (file)
index 0000000..61df7ab
--- /dev/null
+++ b/resources/views/books/view-toggle.blade.php
@@ -0,0 +1,10 @@
+<form action="{{ baseUrl("/settings/users/{$currentUser->id}/switch-book-view") }}" method="POST" class="inline">
+    {!! csrf_field() !!}
+    {!! method_field('PATCH') !!}
+    <input type="hidden" value="{{ $booksViewType === 'list'? 'grid' : 'list' }}" name="book_view_type">
+    @if ($booksViewType === 'list')
+        <button type="submit" class="text-pos text-button">@icon('grid'){{ trans('common.grid_view') }}</button>
+    @else
+        <button type="submit" class="text-pos text-button">@icon('list'){{ trans('common.list_view') }}</button>
+    @endif
+</form>
\ No newline at end of file

diff --git a/resources/views/home-book.blade.php b/resources/views/home-book.blade.php
new file mode 100644 (file)
index 0000000..03fce4b
--- /dev/null
+++ b/resources/views/home-book.blade.php
@@ -0,0 +1,48 @@
+@extends('sidebar-layout')
+
+@section('toolbar')
+    <div class="col-sm-6 faded">
+        <div class="action-buttons text-left">
+            <a expand-toggle=".entity-list.compact .entity-item-snippet" class="text-primary text-button">@icon('expand-text'){{ trans('common.toggle_details') }}</a>
+            @include('books/view-toggle', ['booksViewType' => $booksViewType])
+        </div>
+    </div>
+@stop
+
+@section('sidebar')
+    @if(count($draftPages) > 0)
+        <div id="recent-drafts" class="card">
+            <h3>@icon('edit') {{ trans('entities.my_recent_drafts') }}</h3>
+            @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact'])
+        </div>
+    @endif
+
+    <div class="card">
+        <h3>@icon($signedIn ? 'view' : 'star-circle') {{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}</h3>
+        @include('partials/entity-list', [
+            'entities' => $recents,
+            'style' => 'compact',
+            'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+            ])
+    </div>
+
+    <div class="card">
+        <h3>@icon('file') <a class="no-color" href="{{ baseUrl("/pages/recently-updated") }}">{{ trans('entities.recently_updated_pages') }}</a></h3>
+        <div id="recently-updated-pages">
+            @include('partials/entity-list', [
+            'entities' => $recentlyUpdatedPages,
+            'style' => 'compact',
+            'emptyText' => trans('entities.no_pages_recently_updated')
+            ])
+        </div>
+    </div>
+
+    <div id="recent-activity" class="card">
+        <h3>@icon('time') {{ trans('entities.recent_activity') }}</h3>
+        @include('partials/activity-list', ['activity' => $activity])
+    </div>
+@stop
+
+@section('body')
+    @include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
+@stop
\ No newline at end of file

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 51ca8ccb41403033c0c7e5ac08bbd24f12a7fc9c..64017e6e00ec9ceb71b538313b0ada29a9e0f8c5 100644 (file)
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -80,6 +80,8 @@
                             <label for="setting-app-homepage">{{ trans('settings.app_homepage') }}</label>
                             <p class="small">{{ trans('settings.app_homepage_desc') }}</p>
                             @include('components.page-picker', ['name' => 'setting-app-homepage', 'placeholder' => trans('settings.app_homepage_default'), 'value' => setting('app-homepage')])
+                            <p class="small">{{ trans('settings.app_homepage_books') }}</p>
+                            @include('components.toggle-switch', ['name' => 'setting-app-book-homepage', 'value' => setting('app-book-homepage')])
                         </div>
                     </div>
 

diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index 8570ed00b6fa8390e0475cad8fbc8fafe6bdc727..29e0985c3c416b47b340a198aaf472f95d956b90 100644 (file)
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -49,4 +49,23 @@ class HomepageTest extends TestCase
         $homeVisit->assertSee($name);
         $homeVisit->assertStatus(200);
     }
+
+    public function test_set_book_homepage()
+    {
+        $editor = $this->getEditor();
+        setting()->putUser($editor, 'books_view_type', 'grid');
+
+        $this->setSettings(['app-book-homepage' => true]);
+
+        $this->asEditor();
+        $homeVisit = $this->get('/');
+        $homeVisit->assertSee('Books');
+        $homeVisit->assertSee('book-grid-item grid-card');
+        $homeVisit->assertSee('grid-card-content');
+        $homeVisit->assertSee('grid-card-footer');
+        $homeVisit->assertSee('featured-image-container');
+
+        $this->setSettings(['app-book-homepage' => false]);
+        $this->test_default_homepage_visible();
+    }
 }