diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 3d36fd7bd..a829e891b 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -729,3 +729,19 @@ ul.pagination {
}
}
}
+
+.entity-meta-item {
+ display: flex;
+ line-height: 1.2;
+ margin: 0.6em 0;
+ align-content: start;
+ gap: $-s;
+ a {
+ line-height: 1.2;
+ }
+ svg {
+ flex-shrink: 0;
+ width: 1em;
+ margin: 0;
+ }
+}
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 5263bc810..e0cb4b862 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -67,14 +67,20 @@
@section('right')
<div class="mb-xl">
<h5>{{ trans('common.details') }}</h5>
- <div class="text-small text-muted blended-links">
+ <div class="blended-links">
@include('entities.meta', ['entity' => $book])
@if($book->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $book))
- <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+ <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.books_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index edd39edde..3e015616a 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -64,15 +64,21 @@
<div class="mb-xl">
<h5>{{ trans('common.details') }}</h5>
- <div class="blended-links text-small text-muted">
+ <div class="blended-links">
@include('entities.meta', ['entity' => $chapter])
@if($book->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $book))
- <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+ <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.books_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
@@ -80,9 +86,15 @@
@if($chapter->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $chapter))
- <a href="{{ $chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
+ <a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.chapters_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.chapters_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.chapters_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
diff --git a/resources/views/entities/meta.blade.php b/resources/views/entities/meta.blade.php
index 298cc7c3e..83ff23762 100644
--- a/resources/views/entities/meta.blade.php
+++ b/resources/views/entities/meta.blade.php
@@ -1,50 +1,62 @@
<div class="entity-meta">
@if($entity->isA('revision'))
- <div>
- @icon('history'){{ trans('entities.pages_revision') }}
- {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
+ <div class="entity-meta-item">
+ @icon('history')
+ <div>
+ {{ trans('entities.pages_revision') }}
+ {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
+ </div>
</div>
@endif
@if ($entity->isA('page'))
- <div>
- @if (userCan('page-update', $entity)) <a href="{{ $entity->getUrl('/revisions') }}"> @endif
- @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
- @if (userCan('page-update', $entity))</a>@endif
- </div>
+ @if (userCan('page-update', $entity)) <a href="{{ $entity->getUrl('/revisions') }}" class="entity-meta-item"> @else <div class="entity-meta-item"> @endif
+ @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
+ @if (userCan('page-update', $entity))</a> @else </div> @endif
@endif
@if ($entity->ownedBy && $entity->owned_by !== $entity->created_by)
- <div>
- @icon('user'){!! trans('entities.meta_owned_name', [
- 'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>"
- ]) !!}
+ <div class="entity-meta-item">
+ @icon('user')
+ <div>
+ {!! trans('entities.meta_owned_name', [
+ 'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>"
+ ]) !!}
+ </div>
</div>
@endif
@if ($entity->createdBy)
- <div>
- @icon('star'){!! trans('entities.meta_created_name', [
- 'timeLength' => '<span title="'.$entity->created_at->toDayDateTimeString().'">'.$entity->created_at->diffForHumans() . '</span>',
- 'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".e($entity->createdBy->name). "</a>"
- ]) !!}
+ <div class="entity-meta-item">
+ @icon('star')
+ <div>
+ {!! trans('entities.meta_created_name', [
+ 'timeLength' => '<span title="'.$entity->created_at->toDayDateTimeString().'">'.$entity->created_at->diffForHumans() . '</span>',
+ 'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".e($entity->createdBy->name). "</a>"
+ ]) !!}
+ </div>
</div>
@else
- <div>
- @icon('star')<span title="{{$entity->created_at->toDayDateTimeString()}}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span>
+ <div class="entity-meta-item">
+ @icon('star')
+ <span title="{{$entity->created_at->toDayDateTimeString()}}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span>
</div>
@endif
@if ($entity->updatedBy)
- <div>
- @icon('edit'){!! trans('entities.meta_updated_name', [
- 'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
- 'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".e($entity->updatedBy->name). "</a>"
- ]) !!}
+ <div class="entity-meta-item">
+ @icon('edit')
+ <div>
+ {!! trans('entities.meta_updated_name', [
+ 'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
+ 'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".e($entity->updatedBy->name). "</a>"
+ ]) !!}
+ </div>
</div>
@elseif (!$entity->isA('revision'))
- <div>
- @icon('edit')<span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>
+ <div class="entity-meta-item">
+ @icon('edit')
+ <span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>
</div>
@endif
</div>
\ No newline at end of file
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 0111047c6..2a71c6021 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -76,15 +76,21 @@
@section('right')
<div id="page-details" class="entity-details mb-xl">
<h5>{{ trans('common.details') }}</h5>
- <div class="body text-small blended-links">
+ <div class="blended-links">
@include('entities.meta', ['entity' => $page])
@if($book->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $book))
- <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+ <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.books_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.books_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
@@ -92,9 +98,15 @@
@if($page->chapter && $page->chapter->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $page->chapter))
- <a href="{{ $page->chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
+ <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.chapters_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.chapters_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.chapters_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
@@ -102,16 +114,23 @@
@if($page->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $page))
- <a href="{{ $page->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.pages_permissions_active') }}</a>
+ <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.pages_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.pages_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.pages_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif
@if($page->template)
- <div>
- @icon('template'){{ trans('entities.pages_is_template') }}
+ <div class="entity-meta-item">
+ @icon('template')
+ <div>{{ trans('entities.pages_is_template') }}</div>
</div>
@endif
</div>
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 0d592468d..4d440b635 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -81,14 +81,20 @@
<div id="details" class="mb-xl">
<h5>{{ trans('common.details') }}</h5>
- <div class="text-small text-muted blended-links">
+ <div class="blended-links">
@include('entities.meta', ['entity' => $shelf])
@if($shelf->restricted)
<div class="active-restriction">
@if(userCan('restrictions-manage', $shelf))
- <a href="{{ $shelf->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.shelves_permissions_active') }}</a>
+ <a href="{{ $shelf->getUrl('/permissions') }}" class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.shelves_permissions_active') }}</div>
+ </a>
@else
- @icon('lock'){{ trans('entities.shelves_permissions_active') }}
+ <div class="entity-meta-item">
+ @icon('lock')
+ <div>{{ trans('entities.shelves_permissions_active') }}</div>
+ </div>
@endif
</div>
@endif