mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-27 20:51:57 +00:00
Merge branch 'feature/615'
This commit is contained in:
commit
019b8196ad
@ -33,22 +33,41 @@ class HomeController extends Controller
|
|||||||
$recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
|
$recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
|
||||||
$recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
|
$recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
|
||||||
|
|
||||||
// Custom homepage
|
|
||||||
$customHomepage = false;
|
$customHomepage = false;
|
||||||
$homepageSetting = setting('app-homepage');
|
$books = false;
|
||||||
if ($homepageSetting) {
|
$booksViewType = false;
|
||||||
$id = intval(explode(':', $homepageSetting)[0]);
|
|
||||||
$customHomepage = $this->entityRepo->getById('page', $id, false, true);
|
// Check book homepage
|
||||||
$this->entityRepo->renderPage($customHomepage, true);
|
$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 = $customHomepage ? 'home-custom' : 'home';
|
$view = 'home';
|
||||||
return view($view, [
|
if ($bookHomepageSetting) {
|
||||||
|
$view = 'home-book';
|
||||||
|
} else if ($customHomepage) {
|
||||||
|
$view = 'home-custom';
|
||||||
|
}
|
||||||
|
|
||||||
|
return view('common/' . $view, [
|
||||||
'activity' => $activity,
|
'activity' => $activity,
|
||||||
'recents' => $recents,
|
'recents' => $recents,
|
||||||
'recentlyUpdatedPages' => $recentlyUpdatedPages,
|
'recentlyUpdatedPages' => $recentlyUpdatedPages,
|
||||||
'draftPages' => $draftPages,
|
'draftPages' => $draftPages,
|
||||||
'customHomepage' => $customHomepage
|
'customHomepage' => $customHomepage,
|
||||||
|
'books' => $books,
|
||||||
|
'booksViewType' => $booksViewType
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,7 +150,7 @@ class HomeController extends Controller
|
|||||||
$allowRobots = $sitePublic;
|
$allowRobots = $sitePublic;
|
||||||
}
|
}
|
||||||
return response()
|
return response()
|
||||||
->view('robots', ['allowRobots' => $allowRobots])
|
->view('common/robots', ['allowRobots' => $allowRobots])
|
||||||
->header('Content-Type', 'text/plain');
|
->header('Content-Type', 'text/plain');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
color: #666;
|
color: #666;
|
||||||
width: 250px;
|
width: 250px;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
|
||||||
&.neg, &.invalid {
|
&.neg, &.invalid {
|
||||||
border: 1px solid $negative;
|
border: 1px solid $negative;
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ return [
|
|||||||
'app_homepage' => 'Application Homepage',
|
'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_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_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' => 'Disable comments',
|
||||||
'app_disable_comments_desc' => 'Disable comments across all pages in the application. Existing comments are not shown.',
|
'app_disable_comments_desc' => 'Disable comments across all pages in the application. Existing comments are not shown.',
|
||||||
|
|
||||||
|
@ -3,16 +3,7 @@
|
|||||||
@section('toolbar')
|
@section('toolbar')
|
||||||
<div class="col-xs-6">
|
<div class="col-xs-6">
|
||||||
<div class="action-buttons text-left">
|
<div class="action-buttons text-left">
|
||||||
<form action="{{ baseUrl("/settings/users/{$currentUser->id}/switch-book-view") }}" method="POST" class="inline">
|
@include('books/view-toggle', ['booksViewType' => $booksViewType])
|
||||||
{!! 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>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-6 faded">
|
<div class="col-xs-6 faded">
|
||||||
@ -52,34 +43,5 @@
|
|||||||
@stop
|
@stop
|
||||||
|
|
||||||
@section('body')
|
@section('body')
|
||||||
@if($booksViewType === 'list')
|
@include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
|
||||||
<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>
|
|
||||||
@stop
|
@stop
|
31
resources/views/books/list.blade.php
Normal file
31
resources/views/books/list.blade.php
Normal file
@ -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>
|
10
resources/views/books/view-toggle.blade.php
Normal file
10
resources/views/books/view-toggle.blade.php
Normal file
@ -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>
|
18
resources/views/common/home-book.blade.php
Normal file
18
resources/views/common/home-book.blade.php
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
@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')
|
||||||
|
@include('common/home-sidebar')
|
||||||
|
@stop
|
||||||
|
|
||||||
|
@section('body')
|
||||||
|
@include('books/list', ['books' => $books, 'bookViewType' => $booksViewType])
|
||||||
|
@stop
|
19
resources/views/common/home-custom.blade.php
Normal file
19
resources/views/common/home-custom.blade.php
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
@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>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@stop
|
||||||
|
|
||||||
|
@section('sidebar')
|
||||||
|
@include('common/home-sidebar')
|
||||||
|
@stop
|
||||||
|
|
||||||
|
@section('body')
|
||||||
|
<div class="page-content" page-display="{{ $customHomepage->id }}">
|
||||||
|
@include('pages/page-display', ['page' => $customHomepage])
|
||||||
|
</div>
|
||||||
|
@stop
|
31
resources/views/common/home-sidebar.blade.php
Normal file
31
resources/views/common/home-sidebar.blade.php
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
@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>
|
@ -1,56 +0,0 @@
|
|||||||
@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>
|
|
||||||
</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')
|
|
||||||
<div class="page-content" ng-non-bindable>
|
|
||||||
@include('pages/page-display', ['page' => $customHomepage])
|
|
||||||
</div>
|
|
||||||
@stop
|
|
||||||
|
|
||||||
@section('scripts')
|
|
||||||
<script>
|
|
||||||
setupPageShow({{$customHomepage->id}});
|
|
||||||
</script>
|
|
||||||
@stop
|
|
||||||
|
|
@ -118,7 +118,7 @@
|
|||||||
@stop
|
@stop
|
||||||
|
|
||||||
@section('body')
|
@section('body')
|
||||||
<div class="page-content" page-display="{{ $page->id }}" ng-non-bindable>
|
<div class="page-content" page-display="{{ $page->id }}">
|
||||||
|
|
||||||
<div class="pointer-container" id="pointer">
|
<div class="pointer-container" id="pointer">
|
||||||
<div class="pointer anim" >
|
<div class="pointer anim" >
|
||||||
|
@ -80,6 +80,8 @@
|
|||||||
<label for="setting-app-homepage">{{ trans('settings.app_homepage') }}</label>
|
<label for="setting-app-homepage">{{ trans('settings.app_homepage') }}</label>
|
||||||
<p class="small">{{ trans('settings.app_homepage_desc') }}</p>
|
<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')])
|
@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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -49,4 +49,23 @@ class HomepageTest extends TestCase
|
|||||||
$homeVisit->assertSee($name);
|
$homeVisit->assertSee($name);
|
||||||
$homeVisit->assertStatus(200);
|
$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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user