From 0efed43389027cfddae5c2caa0e45ea217f97305 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 13 Jan 2019 15:54:55 +0000 Subject: [PATCH] Converted more views to new layout and made breadcrumbs more flexible --- app/Http/Controllers/UserController.php | 2 +- resources/assets/sass/_grid.scss | 14 +- resources/assets/sass/_lists.scss | 76 ++---- resources/views/books/create.blade.php | 13 +- resources/views/books/edit.blade.php | 32 +-- resources/views/books/index.blade.php | 2 +- resources/views/books/show.blade.php | 201 ++++++++------- .../views/chapters/_breadcrumbs.blade.php | 11 +- resources/views/chapters/list-item.blade.php | 50 ++-- resources/views/chapters/show.blade.php | 228 ++++++++++-------- resources/views/pages/_breadcrumbs.blade.php | 10 +- resources/views/pages/list-item.blade.php | 54 +---- resources/views/pages/show.blade.php | 71 +++--- .../views/partials/breadcrumbs.blade.php | 57 +++-- resources/views/tri-layout.blade.php | 8 +- 15 files changed, 403 insertions(+), 426 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 933b3d594..fc0431e94 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -281,7 +281,7 @@ class UserController extends Controller $viewType = 'list'; } - $user = $this->userRepo->getById($id); + $user = $this->userRepo->getById($userId); $key = $listName . '_view_type'; setting()->putUser($user, $key, $viewType); diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss index f326b2acf..e6eb489b9 100644 --- a/resources/assets/sass/_grid.scss +++ b/resources/assets/sass/_grid.scss @@ -56,6 +56,7 @@ body.flexbox { margin-right: auto; margin-bottom: $-xl; overflow: auto; + min-height: 60vh; } .tri-layout-container { @@ -63,8 +64,11 @@ body.flexbox { grid-template-columns: 1fr minmax(auto, 940px) 1fr; grid-template-areas: "a b c"; .tri-layout-right-contents, .tri-layout-left-contents { - padding-right: $-xl; - padding-left: $-xl; + padding-right: 3vw; + padding-left: 3vw; + max-width: 460px; + margin-left: auto; + margin-right: auto; } .tri-layout-right { grid-area: c; @@ -113,7 +117,7 @@ body.flexbox { padding-left: $-m; padding-right: $-m; } - .tri-layout-right, .tri-layout-left { + .tri-layout-right-contents > div, .tri-layout-left-contents > div { opacity: 0.6; z-index: 0; } @@ -146,8 +150,8 @@ body.flexbox { } } -.tri-layout-left, .tri-layout-right { - opacity: 0.7; +.tri-layout-left-contents > div, .tri-layout-right-contents > div { + opacity: 0.6; transition: opacity ease-in-out 120ms; &:hover { opacity: 1; diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index d26997c8f..622dd32b1 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -1,63 +1,17 @@ -.page-list { - h4 { - margin: $-l 0 $-xs 0; - font-size: 1.666em; + +.book-contents .entity-list-item { + .icon { + margin-top: $-xs; } - a.chapter { - color: $color-chapter; + p { + margin-bottom: 0; + } + .inner-page { + padding-top: 0; + padding-bottom: 0; } .inset-list { display: none; - overflow: hidden; - } - h5 { - display: block; - margin: $-s 0 0 0; - border-left: 5px solid $color-page; - padding: $-xs 0 $-xs $-m; - font-size: 1.1em; - font-weight: normal; - &.draft { - border-left-color: $color-page-draft; - } - } - .entity-list-item { - margin-bottom: $-m; - } - hr { - margin-top: 0; - } - .page, .chapter, .book { - padding-left: $-l; - } - .page { - border-left: 5px solid $color-page; - } - .page.draft { - border-left: 5px solid $color-page-draft; - .text-page { - color: $color-page-draft; - fill: $color-page-draft; - } - } - .chapter { - border-left: 5px solid $color-chapter; - } - .book { - border-left: 5px solid $color-book; - } - .meta { - margin-top: -$-m; - font-size: 0.95em; - } - .meta span { - margin-right: $-s; - } -} - -@include smaller-than($s) { - .page-list h4 { - font-size: 1.333em; } } @@ -205,7 +159,7 @@ } .activity-list-item { - padding: $-s $-m; + padding: $-s 0; display: grid; grid-template-columns: min-content 1fr; grid-column-gap: $-m; @@ -213,6 +167,9 @@ fill: #888; font-size: 0.9em; } +.card .activity-list-item { + padding: $-s $-m; +} ul.pagination { display: inline-block; @@ -298,9 +255,12 @@ ul.pagination { } } -.card a.entity-list-item:hover { +.card .entity-list-item:hover { background-color: #F2F2F2; } +.card .entity-list-item .entity-list-item:hover { + background-color: #EEEEEE; +} .entity-list-item-image { width: 140px; diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php index b21fb3012..4915d64cf 100644 --- a/resources/views/books/create.blade.php +++ b/resources/views/books/create.blade.php @@ -2,14 +2,11 @@ @section('body')
-
- - @icon('book'){{ trans('entities.books') }} - -
@icon('chevron-right')
- - @icon('add'){{ trans('entities.books_create') }} - +
+ @include('partials.breadcrumbs', ['crumbs' => [ + '/books' => trans('entities.books'), + '/create-book' => trans('entities.books_create') + ]])
diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php index cb1ffc461..351f88845 100644 --- a/resources/views/books/edit.blade.php +++ b/resources/views/books/edit.blade.php @@ -1,24 +1,24 @@ @extends('simple-layout') -@section('toolbar') -
- @include('books._breadcrumbs', ['book' => $book]) -
-@stop - @section('body')
-

 

-
-

@icon('edit') {{ trans('entities.books_edit') }}

-
-
- - @include('books/form', ['model' => $book]) -
-
+ +
+ @include('partials.breadcrumbs', ['crumbs' => [ + $book, + $book->getUrl() => trans('entities.books_edit') + ]]) +
+ +
+

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

+
+ + @include('books/form', ['model' => $book]) +
-@include('components.image-manager', ['imageType' => 'cover']) + + @include('components.image-manager', ['imageType' => 'cover']) @stop \ No newline at end of file diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index fcf9cb4bb..0c2eea88b 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -36,7 +36,7 @@ @section('right')
-
Actions
+
{{ trans('common.actions') }}
@if($currentUser->can('book-create-all')) diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index e5845b495..75b8a9e41 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -1,67 +1,132 @@ -@extends('sidebar-layout') +@extends('tri-layout') -@section('toolbar') -
- @include('books._breadcrumbs', ['book' => $book]) +@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 + @include('pages.list-item', ['page' => $childElement]) + @endif + @endforeach +
+ @else +
+ {{--TODO--}} +

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

+ @if(userCan('page-create', $book)) + @icon('page'){{ 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)) + @icon('chapter'){{ trans('entities.books_empty_add_chapter') }} + @endif +
+ @endif +
+ +
+ {{--TODO--}} +

{{ trans('entities.search_results') }} @icon('close'){{ trans('entities.search_clear') }}

+
+ @include('partials/loading-icon') +
+
+
-
-
- -
@icon('export'){{ trans('entities.export') }}
+ +@stop + + +@section('right') + +
+
{{ trans('common.actions') }}
+
+
+
+ @icon('export') + {{ trans('entities.export') }} +
- +
+ @if(userCan('page-create', $book)) - @icon('add'){{ trans('entities.pages_new') }} + + @icon('add') + {{ trans('entities.pages_new') }} + @endif @if(userCan('chapter-create', $book)) - @icon('add'){{ trans('entities.chapters_new') }} + + @icon('add') + {{ trans('entities.chapters_new') }} + @endif - @if(userCan('book-update', $book) || userCan('restrictions-manage', $book) || userCan('book-delete', $book)) -
- @icon('more'){{ trans('common.more') }} - -
+ @if(userCan('book-update', $book)) + + @icon('edit') + {{ trans('common.edit') }} + + + @icon('sort') + {{ trans('common.sort') }} + + @endif + @if(userCan('restrictions-manage', $book)) + + @icon('lock') + {{ trans('entities.permissions') }} + + @endif + @if(userCan('book-delete', $book)) + + @icon('delete') + {{ trans('common.delete') }} + @endif
+ @stop -@section('sidebar') +@section('left') @if($book->tags->count() > 0) -
+
@include('components.tag-list', ['entity' => $book]) -
+
@endif -
-
-
- - - -
-
+
+
+ + + +
-
-

@icon('info') {{ trans('common.details') }}

-
+
+
{{ trans('common.details') }}
+
@include('partials.entity-meta', ['entity' => $book]) @if($book->restricted)
@@ -76,60 +141,10 @@
@if(count($activity) > 0) -
-

@icon('time') {{ trans('entities.recent_activity') }}

+
+
{{ trans('entities.recent_activity') }}
@include('partials/activity-list', ['activity' => $activity])
@endif @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 - @include('pages/list-item', ['page' => $childElement]) - @endif -
- @endforeach -
- @else -
-

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

- @if(userCan('page-create', $book)) - @icon('page'){{ 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)) - @icon('chapter'){{ trans('entities.books_empty_add_chapter') }} - @endif -
- @endif - -
-
-

{{ trans('entities.search_results') }} @icon('close'){{ trans('entities.search_clear') }}

-
- @include('partials/loading-icon') -
-
-
-
- -@stop diff --git a/resources/views/chapters/_breadcrumbs.blade.php b/resources/views/chapters/_breadcrumbs.blade.php index 279f1c1a4..81e270694 100644 --- a/resources/views/chapters/_breadcrumbs.blade.php +++ b/resources/views/chapters/_breadcrumbs.blade.php @@ -1,7 +1,4 @@ -
- @if (userCan('view', $chapter->book)) - @icon('book'){{ $chapter->book->getShortName() }} - » - @endif - @icon('chapter'){{$chapter->getShortName()}} -
\ No newline at end of file +@include('partials.breadcrumbs', ['crumbs' => [ + $chapter->book, + $chapter, +]]) \ No newline at end of file diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php index e5d8b207c..62864e7ad 100644 --- a/resources/views/chapters/list-item.blade.php +++ b/resources/views/chapters/list-item.blade.php @@ -1,31 +1,29 @@ -
-

- @if (isset($showPath) && $showPath) - - @icon('book'){{ $chapter->book->getShortName() }} - -   »   - @endif - - @icon('chapter'){{ $chapter->name }} - -

+
+
@icon('chapter')
+
+

{{ $chapter->name }}

 +
-
- @if(isset($chapter->searchSnippet)) -

{!! $chapter->searchSnippet !!}

- @else -

{{ $chapter->getExcerpt() }}

- @endif -
+
+

{{ $chapter->getExcerpt() }}

+
+ @if(count($chapter->pages) > 0) +

@icon('caret-right') @icon('page') {{ trans_choice('entities.x_pages', $chapter->pages->count()) }}

+
+ @foreach($chapter->pages as $page) + +
@icon('page')
+
+
{{ $page->name }}
+ {{ $slot ?? '' }} +
+ + @endforeach +
+ @endif - @if(!isset($hidePages) && count($chapter->pages) > 0) -

@icon('caret-right') @icon('page') {{ trans_choice('entities.x_pages', $chapter->pages->count()) }}

-
- @foreach($chapter->pages as $page) -
@icon('page'){{$page->name}}
- @endforeach
- @endif +
\ No newline at end of file diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index f5f990145..43248df5f 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -1,44 +1,4 @@ -@extends('sidebar-layout') - -@section('toolbar') -
- @include('chapters._breadcrumbs', ['chapter' => $chapter]) -
-
-
- -
@icon('export'){{ trans('entities.export') }}
- - - @if(userCan('page-create', $chapter)) - @icon('add'){{ trans('entities.pages_new') }} - @endif - @if(userCan('chapter-update', $chapter)) - @icon('edit'){{ trans('common.edit') }} - @endif - @if((userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter) )|| userCan('restrictions-manage', $chapter) || userCan('chapter-delete', $chapter)) -
- @icon('more') {{ trans('common.more') }} - -
- @endif -
-
-@stop +@extends('tri-layout') @section('container-attrs') id="entity-dashboard" @@ -46,27 +6,139 @@ entity-type="chapter" @stop -@section('sidebar') +@section('body') - @if($chapter->tags->count() > 0) -
- @include('components.tag-list', ['entity' => $chapter]) -
- @endif +
+ @include('chapters._breadcrumbs', ['chapter' => $chapter]) +
-
-
-
- - - -
+
+

{{ $chapter->name }}

+
+

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

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

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

+

+ @if(userCan('page-create', $chapter)) + @icon('page'){{ 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)) + @icon('book'){{ trans('entities.books_empty_sort_current_book') }} + @endif +

+
+ @endif +
+ +
+ {{--TODO--}} +

{{ trans('entities.search_results') }} @icon('close'){{ trans('entities.search_clear') }}

+
+ @include('partials/loading-icon') +
+
-
-

@icon('info') {{ trans('common.details') }}

-
+@stop + +@section('right') + +
+
{{ trans('common.actions') }}
+
+ +
+
+ @icon('export') + {{ trans('entities.export') }} +
+ +
+ + @if(userCan('page-create', $chapter)) + + @icon('add') + {{ trans('entities.pages_new') }} + + @endif + @if(userCan('chapter-update', $chapter)) + + @icon('edit') + {{ trans('common.edit') }} + + @endif + @if(userCan('chapter-update', $chapter) && userCan('chapter-delete', $chapter)) + + @icon('folder') + {{ trans('common.move') }} + + @endif + @if(userCan('restrictions-manage', $chapter)) + + @icon('lock') + {{ trans('entities.permissions') }} + + @endif + @if(userCan('chapter-delete', $chapter)) + + @icon('delete') + {{ trans('common.delete') }} + + @endif + + {{--@if(userCan('page-create', $book))--}} + {{----}} + {{--@icon('add')--}} + {{--{{ trans('entities.pages_new') }}--}} + {{----}} + {{--@endif--}} +
+
+ +
+
+ +
+
+@stop + + + +@section('left') + + @if($chapter->tags->count() > 0) +
+ @include('components.tag-list', ['entity' => $chapter]) +
+ @endif + +
+
+ + + +
+
+ +
+
{{ trans('common.details') }}
+
@include('partials.entity-meta', ['entity' => $chapter]) @if($book->restricted) @@ -94,46 +166,4 @@ @include('partials/book-tree', ['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)) - @icon('page'){{ 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)) - @icon('book'){{ trans('entities.books_empty_sort_current_book') }} - @endif -

-
- @endif -
- -
-

{{ trans('entities.search_results') }} @icon('close'){{ trans('entities.search_clear') }}

-
- @include('partials/loading-icon') -
-
-
-
- -@stop diff --git a/resources/views/pages/_breadcrumbs.blade.php b/resources/views/pages/_breadcrumbs.blade.php index f10f7ebe8..f28bb464a 100644 --- a/resources/views/pages/_breadcrumbs.blade.php +++ b/resources/views/pages/_breadcrumbs.blade.php @@ -1,5 +1,5 @@ -@include('partials.breadcrumbs', [ - 'page' => $page, - 'chapter' => $page->hasChapter() ? $page->chapter : null, - 'book' => $page->book, -]) \ No newline at end of file +@include('partials.breadcrumbs', ['crumbs' => [ + $page->book, + $page->hasChapter() ? $page->chapter : null, + $page, +]]) \ No newline at end of file diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php index f3c79791a..1e26cf1d5 100644 --- a/resources/views/pages/list-item.blade.php +++ b/resources/views/pages/list-item.blade.php @@ -1,51 +1,5 @@ -
-
@icon('page')
-
- -

- @if (isset($showPath) && $showPath) - - @icon('book'){{ $page->book->getShortName() }} - -   »   - @if($page->chapter) - - @icon('chapter'){{ $page->chapter->getShortName() }} - -   »   - @endif - @endif - {{ $page->name }} -

- - -
- @if(isset($page->searchSnippet)) -

{!! $page->searchSnippet !!}

- @else -

{{ $page->getExcerpt() }}

- @endif -
- - @if(isset($style) && $style === 'detailed') -
-
- @include('partials.entity-meta', ['entity' => $page]) -
-
- @icon('book'){{ $page->book->getShortName(30) }} -
- @if($page->chapter) - @icon('chapter'){{ $page->chapter->getShortName(30) }} - @else - @icon('chapter') {{ trans('entities.pages_not_in_chapter') }} - @endif -
-
- @endif - +@component('partials.entity-list-item-basic', ['entity' => $page]) +
+

{{ $page->getExcerpt() }}

- - - -
\ No newline at end of file +@endcomponent \ No newline at end of file diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index f7f8e2cf2..773d74a1e 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -1,5 +1,39 @@ @extends('tri-layout') -@section('container-classes', 'mt-xl') + +@section('body') + +
+ @include('pages._breadcrumbs', ['page' => $page]) +
+ +
+
+ +
+
+ @icon('link') @icon('include', ['style' => 'display:none;']) + + + + + @if(userCan('page-update', $page)) + @icon('edit') + @endif +
+
+ + @include('pages.page-display') +
+
+ + @if ($commentsEnabled) +
+ @include('comments.comments', ['page' => $page]) +
+
+ @endif +@stop @section('left') @@ -77,41 +111,6 @@ @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) @stop -@section('body') - -
- @include('pages._breadcrumbs', ['page' => $page]) -
- -
-
- -
-
- @icon('link') @icon('include', ['style' => 'display:none;']) - - - - - @if(userCan('page-update', $page)) - @icon('edit') - @endif -
-
- - @include('pages.page-display') -
-
- - @if ($commentsEnabled) -
- @include('comments.comments', ['page' => $page]) -
-
- @endif -@stop - @section('right')
Actions
diff --git a/resources/views/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php index cda9e5047..d30712530 100644 --- a/resources/views/partials/breadcrumbs.blade.php +++ b/resources/views/partials/breadcrumbs.blade.php @@ -1,19 +1,42 @@
- @if (isset($book) && userCan('view', $book)) - - @icon('book'){{ $book->getShortName() }} - -
@icon('chevron-right')
- @endif - @if(isset($chapter) && userCan('view', $chapter)) - - @icon('chapter'){{ $chapter->getShortName() }} - -
@icon('chevron-right')
- @endif - @if(isset($page) && userCan('view', $page)) - - @icon('page'){{ $page->getShortName() }} - - @endif + + @foreach($crumbs as $key => $crumb) + @if (is_null($crumb)) + + @endif + @if ($breadcrumbCount !== 0) +
@icon('chevron-right')
+ @endif + + @if (is_string($crumb)) + + {{ $crumb }} + + @else + + @icon($crumb->getType()){{ $crumb->getShortName() }} + + @endif + + @endforeach + + {{--@if (isset($book) && userCan('view', $book))--}} + {{----}} + {{--@icon('book'){{ $book->getShortName() }}--}} + {{----}} + {{--
@icon('chevron-right')
--}} + {{--@endif--}} + {{--@if(isset($chapter) && userCan('view', $chapter))--}} + {{----}} + {{--@icon('chapter'){{ $chapter->getShortName() }}--}} + {{----}} + {{--@if (isset($page))--}} + {{--
@icon('chevron-right')
--}} + {{--@endif--}} + {{--@endif--}} + {{--@if(isset($page) && userCan('view', $page))--}} + {{----}} + {{--@icon('page'){{ $page->getShortName() }}--}} + {{----}} + {{--@endif--}}
\ No newline at end of file diff --git a/resources/views/tri-layout.blade.php b/resources/views/tri-layout.blade.php index 9ae65b037..1eeaf970a 100644 --- a/resources/views/tri-layout.blade.php +++ b/resources/views/tri-layout.blade.php @@ -4,11 +4,11 @@ @section('content') -
- @yield('toolbar') -
+ {{--
--}} + {{--@yield('toolbar')--}} + {{--
--}} -
+