diff --git a/resources/assets/icons/star.svg b/resources/assets/icons/star.svg new file mode 100644 index 000000000..c7686389d --- /dev/null +++ b/resources/assets/icons/star.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss index f876ff281..76d4d5e0c 100644 --- a/resources/assets/sass/_blocks.scss +++ b/resources/assets/sass/_blocks.scss @@ -208,6 +208,12 @@ } } +.sidebar .card { + h3, .body, .empty-text { + padding: $-s $-m; + } +} + .card.drag-card { border: 1px solid #DDD; border-radius: 4px; diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss index f4883384a..2b6fa9cb0 100644 --- a/resources/assets/sass/_lists.scss +++ b/resources/assets/sass/_lists.scss @@ -446,3 +446,12 @@ ul.pagination { margin: 0; } } + +.card.entity-details { + .active-restriction { + margin-top: $-xs; + } + .active-restriction + .active-restriction { + margin-top: 0; + } +} \ No newline at end of file diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index d894a00e7..da11846d8 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -101,6 +101,13 @@ a, .link { } } +.blended-links a { + color: inherit; + svg { + fill: currentColor; + } +} + /* * Other HTML Text Elements */ diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index 9e1edbbbc..e97d9bb69 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -53,21 +53,6 @@ - @if($book->restricted) -
-

@icon('permission') {{ trans('entities.permissions') }}

-
-

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

-
-
- @endif - @if($book->tags->count() > 0)

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

@@ -78,10 +63,19 @@ @endif -
+

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

-
+
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php index 274a0f8ae..acb8e118a 100644 --- a/resources/views/chapters/show.blade.php +++ b/resources/views/chapters/show.blade.php @@ -57,34 +57,6 @@
- @if($book->restricted || $chapter->restricted) -
-

@icon('permission') {{ trans('entities.permissions') }}

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

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

- @endif - - @if($chapter->restricted) -

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

- @endif -
-
- @endif - - @if($chapter->tags->count() > 0)

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

@@ -94,10 +66,30 @@
@endif -
+

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

-
+
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index 288de3d84..d9c984a60 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -41,42 +41,6 @@ @stop @section('sidebar') - @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted) -
-

@icon('permission') {{ trans('entities.permissions') }}

-
-
- - @if($book->restricted) - @if(userCan('restrictions-manage', $book)) - @icon('lock'){{ trans('entities.books_permissions_active') }} - @else - @icon('lock'){{ trans('entities.books_permissions_active') }} - @endif -
- @endif - - @if($page->chapter && $page->chapter->restricted) - @if(userCan('restrictions-manage', $page->chapter)) - @icon('lock'){{ trans('entities.chapters_permissions_active') }} - @else - @icon('lock'){{ trans('entities.chapters_permissions_active') }} - @endif -
- @endif - - @if($page->restricted) - @if(userCan('restrictions-manage', $page)) - @icon('lock'){{ trans('entities.pages_permissions_active') }} - @else - @icon('lock'){{ trans('entities.pages_permissions_active') }} - @endif -
- @endif -
-
-
- @endif @if($page->tags->count() > 0)
@@ -115,10 +79,40 @@
@endif -
+

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

-
+
diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php index 49671ba50..2784f03f0 100644 --- a/resources/views/partials/entity-meta.blade.php +++ b/resources/views/partials/entity-meta.blade.php @@ -1,25 +1,34 @@ -

+

@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->isA('page')) + @if (userCan('page-update', $entity)) @endif + @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
+ @if (userCan('page-update', $entity))
@endif + @endif + + @if ($entity->createdBy) - {!! trans('entities.meta_created_name', [ + @icon('star'){!! trans('entities.meta_created_name', [ 'timeLength' => ''.$entity->created_at->diffForHumans() . '', 'user' => "".htmlentities($entity->createdBy->name). "" ]) !!} @else - {{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }} + @icon('star'){{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }} @endif +
+ @if ($entity->updatedBy) - {!! trans('entities.meta_updated_name', [ + @icon('edit'){!! trans('entities.meta_updated_name', [ 'timeLength' => '' . $entity->updated_at->diffForHumans() .'', 'user' => "".htmlentities($entity->updatedBy->name). "" ]) !!} @elseif (!$entity->isA('revision')) - {{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }} + @icon('edit'){{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }} @endif -

\ No newline at end of file +
\ No newline at end of file