colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Organised entity action buttons a little more

This commit is contained in:
Dan Brown 2019-04-13 12:46:15 +01:00
parent 07adfb2ff1
commit cc24d478aa
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
7 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/sass/_blocks.scss
View File

@ -176,7 +176,7 @@
}
.content-wrap.card {
padding: $-l $-xxl;
padding: $-m $-xxl;
margin-left: auto;
margin-right: auto;
margin-bottom: $-xl;

11
resources/assets/sass/_lists.scss
View File

@ -363,6 +363,17 @@ ul.pagination {
}
}
.icon-list hr {
margin: $-s $-m;
max-width: 140px;
opacity: 0.25;
height: 1.1px;
}
.icon-list hr + hr, .icon-list hr:first-child, .icon-list hr:last-child {
display: none;
}
.entity-list-item, .icon-list-item {
padding: $-s $-m;
display: flex;

3
resources/views/books/index.blade.php
View File

@ -38,13 +38,14 @@
<div class="actions mb-xl">
<h5>{{ trans('common.actions') }}</h5>
<div class="icon-list text-primary">
@include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
@if($currentUser->can('book-create-all'))
<a href="{{ baseUrl("/create-book") }}" class="icon-list-item">
<span>@icon('add')</span>
<span>{{ trans('entities.books_create') }}</span>
</a>
@endif
@include('partials.view-toggle', ['view' => $view, 'type' => 'book'])
</div>
</div>

28
resources/views/books/show.blade.php
View File

@ -80,17 +80,6 @@
<div class="actions mb-xl">
<h5>{{ trans('common.actions') }}</h5>
<div class="icon-list text-primary">
<div dropdown class="dropdown-container">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $book->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $book->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $book->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
@if(userCan('page-create', $book))
<a href="{{ $book->getUrl('/create-page') }}" class="icon-list-item">
@ -104,6 +93,9 @@
<span>{{ trans('entities.chapters_new') }}</span>
</a>
@endif
<hr class="primary-background">
@if(userCan('book-update', $book))
<a href="{{ $book->getUrl('/edit') }}" class="icon-list-item">
<span>@icon('edit')</span>
@ -126,6 +118,20 @@
<span>{{ trans('common.delete') }}</span>
</a>
@endif
<hr class="primary-background">
<div dropdown class="dropdown-container">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $book->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $book->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $book->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
</div>
</div>

29
resources/views/chapters/show.blade.php
View File

@ -87,24 +87,15 @@
<h5>{{ trans('common.actions') }}</h5>
<div class="icon-list text-primary">
<div dropdown class="dropdown-container">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
@if(userCan('page-create', $chapter))
<a href="{{ $chapter->getUrl('/create-page') }}" class="icon-list-item">
<span>@icon('add')</span>
<span>{{ trans('entities.pages_new') }}</span>
</a>
@endif
<hr class="primary-background"/>
@if(userCan('chapter-update', $chapter))
<a href="{{ $chapter->getUrl('/edit') }}" class="icon-list-item">
<span>@icon('edit')</span>
@ -129,6 +120,20 @@
<span>{{ trans('common.delete') }}</span>
</a>
@endif
<hr class="primary-background"/>
<div dropdown class="dropdown-container">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
</div>
</div>
@stop

27
resources/views/pages/show.blade.php
View File

@ -124,18 +124,6 @@
<h5>Actions</h5>
<div class="icon-list text-primary">
{{--Export--}}
<div dropdown class="dropdown-container block">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
{{--User Actions--}}
@if(userCan('page-update', $page))
@ -174,6 +162,21 @@
<span>{{ trans('common.delete') }}</span>
</a>
@endif
<hr class="primary-background"/>
{{--Export--}}
<div dropdown class="dropdown-container block">
<div dropdown-toggle class="icon-list-item">
<span>@icon('export')</span>
<span>{{ trans('entities.export') }}</span>
</div>
<ul class="wide">
<li><a href="{{ $page->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $page->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $page->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul>
</div>
</div>
</div>

2
resources/views/shelves/index.blade.php
View File

@ -9,13 +9,13 @@
<div class="actions mb-xl">
<h5>{{ trans('common.actions') }}</h5>
<div class="icon-list text-primary">
@include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
@if($currentUser->can('bookshelf-create-all'))
<a href="{{ baseUrl("/create-shelf") }}" class="icon-list-item">
<span>@icon('add')</span>
<span>{{ trans('entities.shelves_create') }}</span>
</a>
@endif
@include('partials.view-toggle', ['view' => $view, 'type' => 'shelf'])
</div>
</div>