mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-04-30 16:14:04 +08:00
Reorganised home and robots views
Extracted home view sidebar into own view. Moved home and robot views into 'common' folder so that we only have layouts in the top-level views folder.
This commit is contained in:
Dan Brown
parent
8df9dab80a
commit
63f96c1c6f
@ -60,7 +60,7 @@ class HomeController extends Controller
|
|||||||
$view = 'home-custom';
|
$view = 'home-custom';
|
||||||
}
|
}
|
||||||
|
|
||||||
return view($view, [
|
return view('common/' . $view, [
|
||||||
'activity' => $activity,
|
'activity' => $activity,
|
||||||
'recents' => $recents,
|
'recents' => $recents,
|
||||||
'recentlyUpdatedPages' => $recentlyUpdatedPages,
|
'recentlyUpdatedPages' => $recentlyUpdatedPages,
|
||||||
@ -150,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');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
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,48 +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>
|
|
||||||
@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
|
|
||||||
@ -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" >
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user