github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-30 16:14:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated and aligned entity dashboard elements

Browse Source
This commit is contained in:
Dan Brown 2019-04-13 11:09:17 +01:00
parent 2694bb8fab
commit d66fab8bee
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/sass/_forms.scss
View File

@ -325,6 +325,10 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
&.flexible input { &.flexible input {
width: 100%; width: 100%;
} }
.search-box-cancel {
left: auto;
right: 0;
}
} }
.outline > input { .outline > input {

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

@ -96,17 +96,6 @@ $loadingSize: 10px;
} }
} }
// Search results
.search-results > h3 a {
font-size: 0.66em;
color: $primary;
padding-left: $-m;
i {
padding-right: $-s;
}
}
// Back to top link // Back to top link
$btt-size: 40px; $btt-size: 40px;
[back-to-top] { [back-to-top] {

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

@ -45,14 +45,7 @@
@endif @endif
</div> </div>
<div class="search-results" v-cloak v-show="searching"> @include('partials.entity-dashboard-search-results')
{{--TODO--}}
<h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" v-on:click="clearSearch()" class="text-small">@icon('close'){{ trans('entities.search_clear') }}</a></h3>
<div v-if="!searchResults">
@include('partials.loading-icon')
</div>
<div v-html="searchResults"></div>
</div>
</div> </div>
@stop @stop
@ -133,20 +126,14 @@
@section('left') @section('left')
@include('partials.entity-dashboard-search-box')
@if($book->tags->count() > 0) @if($book->tags->count() > 0)
<div class="mb-xl"> <div class="mb-xl">
@include('components.tag-list', ['entity' => $book]) @include('components.tag-list', ['entity' => $book])
</div> </div>
@endif @endif
<div class="mb-xl">
<form v-on:submit.prevent="searchBook" class="search-box flexible">
<input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.books_search_this') }}">
<button type="submit">@icon('search')</button>
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button">@icon('close')</button>
</form>
</div>
@if(count($activity) > 0) @if(count($activity) > 0)
<div class="mb-xl"> <div class="mb-xl">
<h5>{{ trans('entities.recent_activity') }}</h5> <h5>{{ trans('entities.recent_activity') }}</h5>

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

@ -44,14 +44,7 @@
@endif @endif
</div> </div>
<div class="search-results" v-cloak v-show="searching"> @include('partials.entity-dashboard-search-results')
{{--TODO--}}
<h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" @click="clearSearch()" class="text-small">@icon('close'){{ trans('entities.search_clear') }}</a></h3>
<div v-if="!searchResults">
@include('partials.loading-icon')
</div>
<div v-html="searchResults"></div>
</div>
</div> </div>
@stop @stop
@ -137,20 +130,14 @@
@section('left') @section('left')
@include('partials.entity-dashboard-search-box')
@if($chapter->tags->count() > 0) @if($chapter->tags->count() > 0)
<div class="mb-xl"> <div class="mb-xl">
@include('components.tag-list', ['entity' => $chapter]) @include('components.tag-list', ['entity' => $chapter])
</div> </div>
@endif @endif
<div class="mb-xl">
<form @submit.prevent="searchBook" class="search-box flexible">
<input v-model="searchTerm" @change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.chapters_search_this') }}">
<button type="submit">@icon('search')</button>
<button v-if="searching" v-cloak class="text-neg" @click="clearSearch()" type="button">@icon('close')</button>
</form>
</div>
@include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree]) @include('partials.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
@stop @stop

7
resources/views/partials/entity-dashboard-search-box.blade.php Normal file
View File

@ -0,0 +1,7 @@
<div class="mb-xl">
<form v-on:submit.prevent="searchBook" class="search-box flexible">
<input v-model="searchTerm" v-on:change="checkSearchForm" type="text" name="term" placeholder="{{ trans('entities.books_search_this') }}">
<button type="submit">@icon('search')</button>
<button v-if="searching" v-cloak class="search-box-cancel text-neg" v-on:click="clearSearch" type="button">@icon('close')</button>
</form>
</div>

15
resources/views/partials/entity-dashboard-search-results.blade.php Normal file
View File

@ -0,0 +1,15 @@
<div class="search-results" v-cloak v-show="searching">
<div class="grid half v-center">
<h3 class="text-muted px-none">
{{ trans('entities.search_results') }}
</h3>
<div class="text-right">
<a v-if="searching" v-on:click="clearSearch" class="button outline">{{ trans('entities.search_clear') }}</a>
</div>
</div>
<div v-if="!searchResults">
@include('partials.loading-icon')
</div>
<div class="book-contents" v-html="searchResults"></div>
</div>