From 36f524a354ee95753c449e608e245279ae6a5041 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 26 Aug 2017 15:41:33 +0100 Subject: [PATCH] Updated page view styles to align with 2017 update --- app/Http/Controllers/PageController.php | 2 + app/PageRevision.php | 12 ++ resources/assets/js/pages/page-show.js | 16 +-- resources/assets/sass/_blocks.scss | 17 +++ resources/assets/sass/_lists.scss | 17 --- resources/lang/en/entities.php | 1 + resources/views/chapters/show.blade.php | 2 +- resources/views/pages/delete.blade.php | 43 +++---- .../views/pages/detailed-listing.blade.php | 21 ++-- resources/views/pages/edit.blade.php | 2 - resources/views/pages/form.blade.php | 2 +- resources/views/pages/move.blade.php | 46 ++++---- resources/views/pages/restrictions.blade.php | 27 +++-- resources/views/pages/revision.blade.php | 14 ++- resources/views/pages/revisions.blade.php | 110 +++++++++--------- resources/views/pages/show.blade.php | 50 +++++++- .../views/pages/sidebar-tree-list.blade.php | 87 -------------- resources/views/partials/book-tree.blade.php | 36 ++++++ .../views/partials/entity-meta.blade.php | 7 +- resources/views/sidebar-layout.blade.php | 2 +- 20 files changed, 268 insertions(+), 246 deletions(-) create mode 100644 resources/views/partials/book-tree.blade.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 9a8525c23..573907e56 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -380,6 +380,7 @@ class PageController extends Controller return view('pages/revision', [ 'page' => $page, 'book' => $page->book, + 'revision' => $revision ]); } @@ -409,6 +410,7 @@ class PageController extends Controller 'page' => $page, 'book' => $page->book, 'diff' => $diff, + 'revision' => $revision ]); } diff --git a/app/PageRevision.php b/app/PageRevision.php index ff469f0ed..0a9764729 100644 --- a/app/PageRevision.php +++ b/app/PageRevision.php @@ -47,4 +47,16 @@ class PageRevision extends Model return null; } + /** + * Allows checking of the exact class, Used to check entity type. + * Included here to align with entities in similar use cases. + * (Yup, Bit of an awkward hack) + * @param $type + * @return bool + */ + public static function isA($type) + { + return $type === 'revision'; + } + } diff --git a/resources/assets/js/pages/page-show.js b/resources/assets/js/pages/page-show.js index 7754840af..832ec4b36 100644 --- a/resources/assets/js/pages/page-show.js +++ b/resources/assets/js/pages/page-show.js @@ -106,25 +106,25 @@ let setupPageShow = window.setupPageShow = function (pageId) { goToText(event.target.getAttribute('href').substr(1)); }); - // Make the book-tree sidebar stick in view on scroll + // Make the sidebar stick in view on scroll let $window = $(window); - let $bookTree = $(".book-tree"); - let $bookTreeParent = $bookTree.parent(); + let $sidebar = $("#sidebar .scroll-body"); + let $bookTreeParent = $sidebar.parent(); // Check the page is scrollable and the content is taller than the tree - let pageScrollable = ($(document).height() > $window.height()) && ($bookTree.height() < $('.page-content').height()); + let pageScrollable = ($(document).height() > $window.height()) && ($sidebar.height() < $('.page-content').height()); // Get current tree's width and header height let headerHeight = $("#header").height() + $(".toolbar").height(); let isFixed = $window.scrollTop() > headerHeight; // Function to fix the tree as a sidebar function stickTree() { - $bookTree.width($bookTreeParent.width() + 15); - $bookTree.addClass("fixed"); + $sidebar.width($bookTreeParent.width() + 15); + $sidebar.addClass("fixed"); isFixed = true; } // Function to un-fix the tree back into position function unstickTree() { - $bookTree.css('width', 'auto'); - $bookTree.removeClass("fixed"); + $sidebar.css('width', 'auto'); + $sidebar.removeClass("fixed"); isFixed = false; } // Checks if the tree stickiness state should change diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss index c5b850507..c804b9aa8 100644 --- a/resources/assets/sass/_blocks.scss +++ b/resources/assets/sass/_blocks.scss @@ -204,4 +204,21 @@ background-color: #F8F8F8; padding: $-m; border: 1px solid #DDD; +} + +#sidebar .scroll-body { + &.fixed { + z-index: 5; + position: fixed; + top: 0; + padding-right: $-m; + width: 30%; + left: 0; + height: 100%; + overflow-y: scroll; + -ms-overflow-style: none; + //background-color: $primary-faded; + border-left: 1px solid #DDD; + &::-webkit-scrollbar { width: 0 !important } + } } \ No newline at end of file diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index 5d607ba16..2dd4732f2 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -86,25 +86,8 @@ // Sidebar list .book-tree { - position: relative; - right: 0; - top: 0; transition: ease-in-out 240ms; transition-property: right, border; - &.fixed { - z-index: 5; - position: fixed; - top: 0; - padding-right: $-l + 5px; - width: 30%; - left: 0; - height: 100%; - overflow-y: scroll; - -ms-overflow-style: none; - //background-color: $primary-faded; - border-left: 1px solid #DDD; - &::-webkit-scrollbar { width: 0 !important } - } } .book-tree h4 { padding: $-m $-s 0 $-s; diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php index 76555fee4..b8be379cd 100644 --- a/resources/lang/en/entities.php +++ b/resources/lang/en/entities.php @@ -165,6 +165,7 @@ return [ 'pages_move_success' => 'Page moved to ":parentName"', 'pages_permissions' => 'Page Permissions', 'pages_permissions_success' => 'Page permissions updated', + 'pages_revision' => 'Revision', 'pages_revisions' => 'Page Revisions', 'pages_revisions_named' => 'Page Revisions for :pageName', 'pages_revision_named' => 'Page Revision for :pageName', diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index ac2dbfffd..e5a044aa7 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -91,7 +91,7 @@ - @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree]) + @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) @stop @section('body') diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php index f94a614fb..47906a1f6 100644 --- a/resources/views/pages/delete.blade.php +++ b/resources/views/pages/delete.blade.php @@ -1,27 +1,30 @@ -@extends('base') +@extends('simple-layout') -@section('content') +@section('toolbar') +
+ @include('pages._breadcrumbs', ['page' => $page]) +
+@stop -
-
-
-
- @include('pages._breadcrumbs', ['page' => $page]) -
+@section('body') + +
+

 

+
+

{{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}

+
+

{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}

+ +
+ {!! csrf_field() !!} + +
+ {{ trans('common.cancel') }} + +
+
-
-

{{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}

-

{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}

- -
- {!! csrf_field() !!} - - {{ trans('common.cancel') }} - -
-
- @stop \ No newline at end of file diff --git a/resources/views/pages/detailed-listing.blade.php b/resources/views/pages/detailed-listing.blade.php index 85b77fae1..b4991d79d 100644 --- a/resources/views/pages/detailed-listing.blade.php +++ b/resources/views/pages/detailed-listing.blade.php @@ -1,18 +1,15 @@ -@extends('base') +@extends('simple-layout') -@section('content') - -
-
- -
-

{{ $title }}

- @include('partials/entity-list', ['entities' => $pages, 'style' => 'detailed']) +@section('body') +
+

 

+
+

{{ $title }}

+ @include('partials/entity-list', ['entities' => $pages, 'style' => 'detailed']) +
{!! $pages->links() !!}
- -
-
+
@stop \ No newline at end of file diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 6de47aaf1..79a4878fe 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -16,8 +16,6 @@ @include('pages/form', ['model' => $page]) @include('pages/form-toolbox') - -
@include('components.image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id]) diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index b73b67ef7..ffc1c3fa6 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -5,7 +5,7 @@ {{--Header Bar--}}
-
+
diff --git a/resources/views/pages/move.blade.php b/resources/views/pages/move.blade.php index a9b6d69d7..8f934a30e 100644 --- a/resources/views/pages/move.blade.php +++ b/resources/views/pages/move.blade.php @@ -1,29 +1,31 @@ -@extends('base') +@extends('simple-layout') -@section('content') +@section('toolbar') +
+ @include('pages._breadcrumbs', ['page' => $page]) +
+@stop -
-
-
-
- @include('pages._breadcrumbs', ['page' => $page]) -
+@section('body') + +
+

 

+
+

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

+
+
+ {!! csrf_field() !!} + + + @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter']) + +
+ {{ trans('common.cancel') }} + +
+
-
-

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

- -
- {!! csrf_field() !!} - - - @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter']) - - {{ trans('common.cancel') }} - -
-
- @stop diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php index cfef2ed21..8f0e5353d 100644 --- a/resources/views/pages/restrictions.blade.php +++ b/resources/views/pages/restrictions.blade.php @@ -1,20 +1,19 @@ -@extends('base') +@extends('simple-layout') -@section('content') +@section('toolbar') +
+ @include('pages._breadcrumbs', ['page' => $page]) +
+@stop -
-
-
-
- @include('pages._breadcrumbs', ['page' => $page]) -
+@section('body') +
+

 

+
+

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

+
+ @include('form.restriction-form', ['model' => $page])
- -
-

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

- @include('form.restriction-form', ['model' => $page]) -
- @stop diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php index a4b5fb4b5..ca74e4afa 100644 --- a/resources/views/pages/revision.blade.php +++ b/resources/views/pages/revision.blade.php @@ -1,12 +1,20 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') +@section('sidebar') +
+

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

+
+ @include('partials.entity-meta', ['entity' => $revision]) +
+
+@stop +@section('body')
-
+
@include('pages.page-display')
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php index bdc8460ef..ed3aa4832 100644 --- a/resources/views/pages/revisions.blade.php +++ b/resources/views/pages/revisions.blade.php @@ -1,62 +1,62 @@ -@extends('base') +@extends('simple-layout') -@section('content') +@section('toolbar') +
+ @include('pages._breadcrumbs', ['page' => $page]) +
+@stop -
-
-
-
- @include('pages._breadcrumbs', ['page' => $page]) -
+@section('body') +
+

 

+ +
+

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

+
+ @if(count($page->revisions) > 0) + + + + + + + + + + + @foreach($page->revisions as $index => $revision) + + + + + + + + + + @endforeach +
{{ trans('entities.pages_revisions_number') }}{{ trans('entities.pages_name') }}{{ trans('entities.pages_revisions_created_by') }}{{ trans('entities.pages_revisions_date') }}{{ trans('entities.pages_revisions_changelog') }}{{ trans('common.actions') }}
{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}{{ $revision->name }} + @if($revision->createdBy) + {{ $revision->createdBy->name }} + @endif + @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif{{ $revision->created_at->format('jS F, Y H:i:s') }}
({{ $revision->created_at->diffForHumans() }})		{{ $revision->summary }} + {{ trans('entities.pages_revisions_changes') }} +  |  + + @if ($index === 0) + {{ trans('entities.pages_revisions_current') }} + @else + {{ trans('entities.pages_revisions_preview') }} +  |  + {{ trans('entities.pages_revisions_restore') }} + @endif +
+ + @else +

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

+ @endif
-
- -
-

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

- - @if(count($page->revisions) > 0) - - - - - - - - - - - @foreach($page->revisions as $index => $revision) - - - - - - - - - - @endforeach -
{{ trans('entities.pages_revisions_number') }}{{ trans('entities.pages_name') }}{{ trans('entities.pages_revisions_created_by') }}{{ trans('entities.pages_revisions_date') }}{{ trans('entities.pages_revisions_changelog') }}{{ trans('common.actions') }}
{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}{{ $revision->name }} - @if($revision->createdBy) - {{ $revision->createdBy->name }} - @endif - @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif{{ $revision->created_at->format('jS F, Y H:i:s') }}
({{ $revision->created_at->diffForHumans() }})		{{ $revision->summary }} - {{ trans('entities.pages_revisions_changes') }} -  |  - - @if ($index === 0) - {{ trans('entities.pages_revisions_current') }} - @else - {{ trans('entities.pages_revisions_preview') }} -  |  - {{ trans('entities.pages_revisions_restore') }} - @endif -
- - @else -

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

- @endif
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 121f6f38e..07ecdfdfc 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -19,7 +19,7 @@ @endif @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
- + {{ trans('common.more') }}
@endif - @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]) + @if($page->tags->count() > 0) +
+

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

+
+ + + @foreach($page->tags as $tag) + + + @if($tag->value) @endif + + @endforeach + +
value) colspan="2" @endif>{{ $tag->name }}{{$tag->value}}
+
+
+ @endif + + @if ($page->attachments->count() > 0) +
+

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

+
+ @foreach($page->attachments as $attachment) +
+ external) target="_blank" @endif>{{ $attachment->name }} +
+ @endforeach +
+
+ @endif + + @if (isset($pageNav) && count($pageNav)) +
+

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

+
+
+ @foreach($pageNav as $navItem) +
  • + {{ $navItem['text'] }} +
    • + @endforeach +
    +
    +
    + @endif + + @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])

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

    diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php index 902a6def2..e69de29bb 100644 --- a/resources/views/pages/sidebar-tree-list.blade.php +++ b/resources/views/pages/sidebar-tree-list.blade.php @@ -1,87 +0,0 @@ - -
    - - @if(isset($page) && $page->tags->count() > 0) -
    -

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

    -
    - - - @foreach($page->tags as $tag) - - - @if($tag->value) @endif - - @endforeach - -
    value) colspan="2" @endif>{{ $tag->name }}{{$tag->value}}
    -
    -
    - @endif - - @if (isset($page) && $page->attachments->count() > 0) -
    -

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

    -
    - @foreach($page->attachments as $attachment) -
    - external) target="_blank" @endif>{{ $attachment->name }} -
    - @endforeach -
    -
    - @endif - - @if (isset($pageNav) && count($pageNav)) -
    -

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

    -
    -
    - @foreach($pageNav as $navItem) -
  • - {{ $navItem['text'] }} -
    • - @endforeach -
    -
    -
    - @endif - -
    -

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

    -
    - -
    -
    - -
    diff --git a/resources/views/partials/book-tree.blade.php b/resources/views/partials/book-tree.blade.php new file mode 100644 index 000000000..80f7262ca --- /dev/null +++ b/resources/views/partials/book-tree.blade.php @@ -0,0 +1,36 @@ +
    +

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

    +
    + +
    +
    \ No newline at end of file diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php index 0442ce50c..49671ba50 100644 --- a/resources/views/partials/entity-meta.blade.php +++ b/resources/views/partials/entity-meta.blade.php @@ -1,4 +1,9 @@

    + @if($entity->isA('revision')) + {{ trans('entities.pages_revision') }} + {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }} +
    + @endif @if ($entity->isA('page')) {{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
    @endif @if ($entity->createdBy) {!! trans('entities.meta_created_name', [ @@ -14,7 +19,7 @@ 'timeLength' => '' . $entity->updated_at->diffForHumans() .'', 'user' => "".htmlentities($entity->updatedBy->name). "" ]) !!} - @else + @elseif (!$entity->isA('revision')) {{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }} @endif

    \ No newline at end of file diff --git a/resources/views/sidebar-layout.blade.php b/resources/views/sidebar-layout.blade.php index 55701b8ba..0880f881d 100644 --- a/resources/views/sidebar-layout.blade.php +++ b/resources/views/sidebar-layout.blade.php @@ -15,7 +15,7 @@
    -
    +