From: Dan Brown Date: Sat, 14 Apr 2018 15:23:16 +0000 (+0100) Subject: Updated move card width and made sidebar order more consistent X-Git-Tag: v0.21.0~1^2~8 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d34b91f2c9e07f2d975046195c527988df27dab3 Updated move card width and made sidebar order more consistent --- diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 9f021b2b0..9e1edbbbc 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -68,13 +68,6 @@ @endif -
-

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

-
- @include('partials.entity-meta', ['entity' => $book]) -
-
- @if($book->tags->count() > 0)

@icon('tag') {{ trans('entities.book_tags') }}

@@ -84,6 +77,14 @@
@endif + +
+

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

+
+ @include('partials.entity-meta', ['entity' => $book]) +
+
+ @if(count($activity) > 0)

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

diff --git a/resources/views/chapters/move.blade.php b/resources/views/chapters/move.blade.php index f43373324..143d048b9 100644 --- a/resources/views/chapters/move.blade.php +++ b/resources/views/chapters/move.blade.php @@ -8,7 +8,7 @@ @section('body') -
+

@icon('folder') {{ trans('entities.chapters_move') }}

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index ea9820022..274a0f8ae 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -84,12 +84,6 @@
@endif -
-

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

-
- @include('partials.entity-meta', ['entity' => $chapter]) -
-
@if($chapter->tags->count() > 0)
@@ -100,6 +94,13 @@
@endif +
+

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

+
+ @include('partials.entity-meta', ['entity' => $chapter]) +
+
+ @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) @stop diff --git a/resources/views/pages/move.blade.php b/resources/views/pages/move.blade.php index 9785af357..2bbefaae0 100644 --- a/resources/views/pages/move.blade.php +++ b/resources/views/pages/move.blade.php @@ -8,7 +8,7 @@ @section('body') -
+

 

@icon('folder') {{ trans('entities.pages_move') }}