diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index 8996ae64a..6283ac8d1 100644 --- a/app/Http/Controllers/BookController.php +++ b/app/Http/Controllers/BookController.php @@ -36,7 +36,7 @@ class BookController extends Controller */ public function index() { - $books = $this->entityRepo->getAllPaginated('book', 10); + $books = $this->entityRepo->getAllPaginated('book', 20); $recents = $this->signedIn ? $this->entityRepo->getRecentlyViewed('book', 4, 0) : false; $popular = $this->entityRepo->getPopular('book', 4, 0); $this->setPageTitle('Books'); @@ -84,7 +84,12 @@ class BookController extends Controller $bookChildren = $this->entityRepo->getBookChildren($book); Views::add($book); $this->setPageTitle($book->getShortName()); - return view('books/show', ['book' => $book, 'current' => $book, 'bookChildren' => $bookChildren]); + return view('books/show', [ + 'book' => $book, + 'current' => $book, + 'bookChildren' => $bookChildren, + 'activity' => Activity::entityActivity($book, 20, 0) + ]); } /** diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7f60d7009..ad3b41655 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -29,13 +29,11 @@ class HomeController extends Controller $activity = Activity::latest(10); $draftPages = $this->signedIn ? $this->entityRepo->getUserDraftPages(6) : []; $recentFactor = count($draftPages) > 0 ? 0.5 : 1; - $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 10*$recentFactor); - $recentlyCreatedPages = $this->entityRepo->getRecentlyCreated('page', 5); - $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 5); + $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor); + $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12); return view('home', [ 'activity' => $activity, 'recents' => $recents, - 'recentlyCreatedPages' => $recentlyCreatedPages, 'recentlyUpdatedPages' => $recentlyUpdatedPages, 'draftPages' => $draftPages ]); diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index 49bd74b07..3e92ce828 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -171,6 +171,10 @@ header .search-box { background-color: $primary-faded; } +.toolbar-container { + background-color: #FFF; +} + .breadcrumbs .text-button, .action-buttons .text-button { display: inline-block; padding: $-s; diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss index 27ca04eb7..9e47f4387 100644 --- a/resources/assets/sass/_html.scss +++ b/resources/assets/sass/_html.scss @@ -16,6 +16,9 @@ body { line-height: 1.6; color: #616161; -webkit-font-smoothing: antialiased; + &.shaded { + background-color: #F2F2F2; + } } button { diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index 61b2aa858..0cb58432c 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -310,6 +310,11 @@ ul.pagination { } } +.card .entity-list-item { + padding-left: $-m; + padding-right: $-m; +} + .entity-list.compact { font-size: 0.6em; h4, a { diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index e1d74c95e..06b980970 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -10,6 +10,7 @@ return [ 'save' => 'Save', 'continue' => 'Continue', 'select' => 'Select', + 'more' => 'More', /** * Form Labels @@ -35,7 +36,6 @@ return [ 'remove' => 'Remove', 'add' => 'Add', - /** * Misc */ @@ -44,6 +44,7 @@ return [ 'no_items' => 'No items available', 'back_to_top' => 'Back to top', 'toggle_details' => 'Toggle Details', + 'details' => 'Details', /** * Header diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index c090a127e..3c05f32a5 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -1,59 +1,50 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') - -
-
-
-
-
-
- @if($currentUser->can('book-create-all')) - {{ trans('entities.books_create') }} - @endif -
-
-
+@section('toolbar') +
+
+
+ @if($currentUser->can('book-create-all')) + {{ trans('entities.books_create') }} + @endif
+@stop - -
-
-
-

{{ trans('entities.books') }}

- @if(count($books) > 0) - @foreach($books as $book) - @include('books/list-item', ['book' => $book]) -
- @endforeach - {!! $books->render() !!} - @else -

{{ trans('entities.books_empty') }}

- @if(userCan('books-create-all')) - {{ trans('entities.create_one_now') }} - @endif - @endif -
-
-
- @if($recents) -
 
-

{{ trans('entities.recently_viewed') }}

- @include('partials/entity-list', ['entities' => $recents]) - @endif -
-
 
- -
+@section('sidebar') + @if($recents) +
+

{{ trans('entities.recently_viewed') }}

+ @include('partials/entity-list', ['entities' => $recents, 'style' => 'compact'])
+ @endif + + +@stop + +@section('body') + +
+

{{ trans('entities.books') }}

+ @if(count($books) > 0) + @foreach($books as $book) + @include('books/list-item', ['book' => $book]) +
+ @endforeach + {!! $books->render() !!} + @else +

{{ trans('entities.books_empty') }}

+ @if(userCan('books-create-all')) + {{ trans('entities.create_one_now') }} + @endif + @endif
@stop \ No newline at end of file diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 97942ee67..28cd08928 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -1,128 +1,138 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') - -
-
-
-
- @include('books._breadcrumbs', ['book' => $book]) -
-
-
- -
{{ trans('entities.export') }}
- - - @if(userCan('page-create', $book)) - {{ trans('entities.pages_new') }} - @endif - @if(userCan('chapter-create', $book)) - {{ trans('entities.chapters_new') }} - @endif +@section('toolbar') +
+ @include('books._breadcrumbs', ['book' => $book]) +
+
+
+ +
{{ trans('entities.export') }}
+ + + @if(userCan('page-create', $book)) + {{ trans('entities.pages_new') }} + @endif + @if(userCan('chapter-create', $book)) + {{ trans('entities.chapters_new') }} + @endif + @if(userCan('book-update', $book) || userCan('restrictions-manage', $book) || userCan('book-delete', $book)) +
+ {{ trans('common.more') }} +
+ @if(userCan('book-delete', $book)) +
  • {{ trans('common.delete') }}
    • + @endif +
    -
    + @endif +
    +
    +@stop + +@section('sidebar') + +
    +
    +
    + + + +
    - -
    -
    -
    - -

    {{$book->name}}

    -
    -

    {!! nl2br(e($book->description)) !!}

    - -
    -
    - @if(count($bookChildren) > 0) - @foreach($bookChildren as $childElement) - @if($childElement->isA('chapter')) - @include('chapters/list-item', ['chapter' => $childElement]) - @else - @include('pages/list-item', ['page' => $childElement]) - @endif -
    - @endforeach - @else -

    {{ trans('entities.books_empty_contents') }}

    -

    - @if(userCan('page-create', $book)) - {{ trans('entities.books_empty_create_page') }} - @endif - @if(userCan('page-create', $book) && userCan('chapter-create', $book)) -   -{{ trans('entities.books_empty_or') }}-    - @endif - @if(userCan('chapter-create', $book)) - {{ trans('entities.books_empty_add_chapter') }} - @endif -

    -
    - @endif - @include('partials.entity-meta', ['entity' => $book]) -
    -
    -
    -

    {{ trans('entities.search_results') }} {{ trans('entities.search_clear') }}

    -
    - @include('partials/loading-icon') -
    -
    -
    - - + @if($book->restricted) +
    +

    {{ trans('entities.permissions') }}

    +
    +

    + @if(userCan('restrictions-manage', $book)) + {{ trans('entities.books_permissions_active') }} + @else + {{ trans('entities.books_permissions_active') }} + @endif +

    +
    + @endif -
    -
    + @if(count($activity) > 0) +
    +

    {{ trans('entities.recent_activity') }}

    +
    + @include('partials/activity-list', ['activity' => $activity]) +
    +
    + @endif - @if($book->restricted) -

    - @if(userCan('restrictions-manage', $book)) - {{ trans('entities.books_permissions_active') }} +

    +

    {{ trans('common.details') }}

    +
    + @include('partials.entity-meta', ['entity' => $book]) +
    +
    +@stop + +@section('container-attrs') + id="entity-dashboard" + entity-id="{{ $book->id }}" + entity-type="book" +@stop + +@section('body') + +
    +

    {{$book->name}}

    +
    +

    {!! nl2br(e($book->description)) !!}

    + +
    +
    + @if(count($bookChildren) > 0) + @foreach($bookChildren as $childElement) + @if($childElement->isA('chapter')) + @include('chapters/list-item', ['chapter' => $childElement]) @else - {{ trans('entities.books_permissions_active') }} + @include('pages/list-item', ['page' => $childElement]) + @endif +
    + @endforeach + @else +

    {{ trans('entities.books_empty_contents') }}

    +

    + @if(userCan('page-create', $book)) + {{ trans('entities.books_empty_create_page') }} + @endif + @if(userCan('page-create', $book) && userCan('chapter-create', $book)) +   -{{ trans('entities.books_empty_or') }}-    + @endif + @if(userCan('chapter-create', $book)) + {{ trans('entities.books_empty_add_chapter') }} @endif

    +
    @endif - -
    - - - -
    - -
    -

    {{ trans('entities.recent_activity') }}

    - @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)]) -
    +
    +

    {{ trans('entities.search_results') }} {{ trans('entities.search_clear') }}

    +
    + @include('partials/loading-icon') +
    +
    +
    @stop diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index 62a7eaa74..701084280 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -1,15 +1,11 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') - -
    -
    -
    -
    - @include('chapters._breadcrumbs', ['chapter' => $chapter]) -
    -
    -
    +@section('toolbar') +
    + @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
    +
    +
    {{ trans('entities.export') }}
     - @if(userCan('page-create', $chapter)) - {{ trans('entities.pages_new') }} - @endif + @if(userCan('page-create', $chapter)) + {{ trans('entities.pages_new') }} + @endif + @if(userCan('chapter-update', $chapter)) + {{ trans('common.edit') }} + @endif + @if(userCan('chapter-update', $chapter) || userCan('restrictions-manage', $chapter) || userCan('chapter-delete', $chapter)) +
    + {{ trans('common.more') }} +
    + @if(userCan('chapter-delete', $chapter)) +
  • {{ trans('common.delete') }}
    • + @endif +
    -
    + @endif +
    +
    +@stop + +@section('container-attrs') + id="entity-dashboard" + entity-id="{{ $chapter->id }}" + entity-type="chapter" +@stop + +@section('sidebar') +
    +
    +
    + + + +
    - -
    -
    -
    -

    {{ $chapter->name }}

    -
    -

    {!! nl2br(e($chapter->description)) !!}

    - - @if(count($pages) > 0) -
    -
    - @foreach($pages as $page) - @include('pages/list-item', ['page' => $page]) -
    - @endforeach -
    - @else -
    -

    {{ trans('entities.chapters_empty') }}

    -

    - @if(userCan('page-create', $chapter)) - {{ trans('entities.books_empty_create_page') }} - @endif - @if(userCan('page-create', $chapter) && userCan('book-update', $book)) -   -{{ trans('entities.books_empty_or') }}-    - @endif - @if(userCan('book-update', $book)) - {{ trans('entities.books_empty_sort_current_book') }} - @endif -

    -
    - @endif - - @include('partials.entity-meta', ['entity' => $chapter]) -
    - -
    -

    {{ trans('entities.search_results') }} {{ trans('entities.search_clear') }}

    -
    - @include('partials/loading-icon') -
    -
    -
    -
    -
    -
    - @if($book->restricted || $chapter->restricted) -
    - - @if($book->restricted) -

    - @if(userCan('restrictions-manage', $book)) - {{ trans('entities.books_permissions_active') }} - @else - {{ trans('entities.books_permissions_active') }} - @endif -

    + @if($book->restricted || $chapter->restricted) +
    +

    {{ trans('entities.permissions') }}

    +
    + @if($book->restricted) +

    + @if(userCan('restrictions-manage', $book)) + {{ trans('entities.books_permissions_active') }} + @else + {{ trans('entities.books_permissions_active') }} @endif - - @if($chapter->restricted) - @if(userCan('restrictions-manage', $chapter)) - {{ trans('entities.chapters_permissions_active') }} - @else - {{ trans('entities.chapters_permissions_active') }} - @endif - @endif -

    +

    @endif -
    - - - -
    - - @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree]) - + @if($chapter->restricted) +

    + @if(userCan('restrictions-manage', $chapter)) + {{ trans('entities.chapters_permissions_active') }} + @else + {{ trans('entities.chapters_permissions_active') }} + @endif +

    + @endif
    + @endif + +
    +

    {{ trans('common.details') }}

    +
    + @include('partials.entity-meta', ['entity' => $chapter]) +
    + @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree]) +@stop +@section('body') +
    +

    {{ $chapter->name }}

    +
    +

    {!! nl2br(e($chapter->description)) !!}

    + + @if(count($pages) > 0) +
    +
    + @foreach($pages as $page) + @include('pages/list-item', ['page' => $page]) +
    + @endforeach +
    + @else +
    +

    {{ trans('entities.chapters_empty') }}

    +

    + @if(userCan('page-create', $chapter)) + {{ trans('entities.books_empty_create_page') }} + @endif + @if(userCan('page-create', $chapter) && userCan('book-update', $book)) +   -{{ trans('entities.books_empty_or') }}-    + @endif + @if(userCan('book-update', $book)) + {{ trans('entities.books_empty_sort_current_book') }} + @endif +

    +
    + @endif +
    + +
    +

    {{ trans('entities.search_results') }} {{ trans('entities.search_clear') }}

    +
    + @include('partials/loading-icon') +
    +
    +
    +
    @stop diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 87c84ec1e..6cd450a82 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,64 +1,56 @@ -@extends('base') +@extends('simple-layout') -@section('content') - -
    -
    -
    -
    -
    - {{ trans('common.toggle_details') }} -
    -
    -
    +@section('toolbar') +
    +
    + {{ trans('common.toggle_details') }}
    +@stop + +@section('body')
    -
    - @if(count($draftPages) > 0) -

    {{ trans('entities.my_recent_drafts') }}

    + @if(count($draftPages) > 0) +
    +

    {{ trans('entities.my_recent_drafts') }}

    @include('partials/entity-list', ['entities' => $draftPages, 'style' => 'compact']) - @endif -
    - @if($signedIn) -

    {{ trans('entities.my_recently_viewed') }}

    - @else -

    {{ trans('entities.books_recent') }}

    +
    @endif - @include('partials/entity-list', [ - 'entities' => $recents, - 'style' => 'compact', - 'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty') - ]) + +
    +

    {{ trans('entities.' . ($signedIn ? 'my_recently_viewed' : 'books_recent')) }}

    + @include('partials/entity-list', [ + 'entities' => $recents, + 'style' => 'compact', + 'emptyText' => $signedIn ? trans('entities.no_pages_viewed') : trans('entities.books_empty') + ]) +
    -

    {{ trans('entities.recently_created_pages') }}

    -
    - @include('partials/entity-list', [ - 'entities' => $recentlyCreatedPages, - 'style' => 'compact', - 'emptyText' => trans('entities.no_pages_recently_created') - ]) -
    - -

    {{ trans('entities.recently_updated_pages') }}

    -
    - @include('partials/entity-list', [ - 'entities' => $recentlyUpdatedPages, - 'style' => 'compact', - 'emptyText' => trans('entities.no_pages_recently_updated') - ]) +
    +

    {{ trans('entities.recently_updated_pages') }}

    +
    + @include('partials/entity-list', [ + 'entities' => $recentlyUpdatedPages, + 'style' => 'compact', + 'emptyText' => trans('entities.no_pages_recently_updated') + ]) +
    -

    {{ trans('entities.recent_activity') }}

    - @include('partials/activity-list', ['activity' => $activity]) +
    +

    {{ trans('entities.recent_activity') }}

    +
    + @include('partials/activity-list', ['activity' => $activity]) +
    +
    diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 6b06b4611..bd2580a66 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -6,14 +6,14 @@
    - -
    {{ trans('entities.export') }}
    - -     + +
    {{ trans('entities.export') }}
    + +     @if(userCan('page-update', $page)) {{ trans('common.edit') }} @endif @@ -41,38 +41,50 @@ @section('sidebar') @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted) -
    +
    +

    {{ trans('entities.permissions') }}

    +
    +
    - @if($book->restricted) - @if(userCan('restrictions-manage', $book)) - {{ trans('entities.books_permissions_active') }} - @else - {{ trans('entities.books_permissions_active') }} - @endif -
    - @endif + @if($book->restricted) + @if(userCan('restrictions-manage', $book)) + {{ trans('entities.books_permissions_active') }} + @else + {{ trans('entities.books_permissions_active') }} + @endif +
    + @endif - @if($page->chapter && $page->chapter->restricted) - @if(userCan('restrictions-manage', $page->chapter)) - {{ trans('entities.chapters_permissions_active') }} - @else - {{ trans('entities.chapters_permissions_active') }} - @endif -
    - @endif + @if($page->chapter && $page->chapter->restricted) + @if(userCan('restrictions-manage', $page->chapter)) + {{ trans('entities.chapters_permissions_active') }} + @else + {{ trans('entities.chapters_permissions_active') }} + @endif +
    + @endif - @if($page->restricted) - @if(userCan('restrictions-manage', $page)) - {{ trans('entities.pages_permissions_active') }} - @else - {{ trans('entities.pages_permissions_active') }} - @endif -
    - @endif + @if($page->restricted) + @if(userCan('restrictions-manage', $page)) + {{ trans('entities.pages_permissions_active') }} + @else + {{ trans('entities.pages_permissions_active') }} + @endif +
    + @endif +
    +
    @endif @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]) + +
    +

    {{ trans('common.details') }}

    +
    + @include('partials.entity-meta', ['entity' => $book]) +
    +
    @stop @section('body') @@ -88,10 +100,6 @@ @include('pages/page-display') -
    - - @include('partials.entity-meta', ['entity' => $page]) -
    @include('comments/comments', ['pageId' => $page->id]) diff --git a/resources/views/sidebar-layout.blade.php b/resources/views/sidebar-layout.blade.php index 78e053690..55701b8ba 100644 --- a/resources/views/sidebar-layout.blade.php +++ b/resources/views/sidebar-layout.blade.php @@ -2,16 +2,18 @@ @section('content') -
    -
    -
    - @yield('toolbar') +
    +
    +
    +
    + @yield('toolbar') +
    -
    +
    @@ -20,9 +22,7 @@
    -
    - @yield('body') -
    + @yield('body')
    diff --git a/resources/views/simple-layout.blade.php b/resources/views/simple-layout.blade.php new file mode 100644 index 000000000..eeb4129e0 --- /dev/null +++ b/resources/views/simple-layout.blade.php @@ -0,0 +1,27 @@ +@extends('base') + +@section('body-class', 'shaded') + +@section('content') + +
    +
    +
    +
    + @yield('toolbar') +
    +
    +
    +
    + + +
    +
    +
    + @yield('body') +
    +
    +
    + + +@stop