Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-07-17 08:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'show-tags' of https://github.com/burnoutberni/BookStack into burnoutberni-show-tags

Browse Source
This commit is contained in:
Dan Brown 2021-05-24 15:12:45 +01:00
commit 5420f3451c
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/sass/_blocks.scss
View File

@ -227,7 +227,7 @@
border: 1px solid #CCC; border: 1px solid #CCC;
overflow: hidden; overflow: hidden;
font-size: 0.85em; font-size: 0.85em;
a, a:hover, a:active { a, span, a:hover, a:active {
padding: 4px 8px; padding: 4px 8px;
@include lightDark(color, #777, #999); @include lightDark(color, #777, #999);
transition: background-color ease-in-out 80ms; transition: background-color ease-in-out 80ms;

9
resources/views/components/tag-list.blade.php
View File

@ -1,6 +1,11 @@
@foreach($entity->tags as $tag) @foreach($entity->tags as $tag)
<div class="tag-item primary-background-light"> <div class="tag-item primary-background-light">
<div class="tag-name"><a href="{{ url('/search?term=%5B' . urlencode($tag->name) .'%5D') }}">@icon('tag'){{ $tag->name }}</a></div> @if($disableLinks ?? false)
@if($tag->value) <div class="tag-value"><a href="{{ url('/search?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></div> @endif <div class="tag-name"><span>@icon('tag'){{ $tag->name }}</span></div>
@if($tag->value) <div class="tag-value"><span>{{$tag->value}}</span></div> @endif
@else
<div class="tag-name"><a href="{{ url('/search?term=%5B' . urlencode($tag->name) .'%5D') }}">@icon('tag'){{ $tag->name }}</a></div>
@if($tag->value) <div class="tag-value"><a href="{{ url('/search?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></div> @endif
@endif
</div> </div>
@endforeach @endforeach

3
resources/views/partials/entity-list-item-basic.blade.php
View File

@ -2,6 +2,9 @@
<a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}"> <a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}">
<span role="presentation" class="icon text-{{$type}}">@icon($type)</span> <span role="presentation" class="icon text-{{$type}}">@icon($type)</span>
<div class="content"> <div class="content">
@if($entity->tags->count() > 0 and $showTags ?? false)
@include('components.tag-list', ['entity' => $entity, 'disableLinks' => True ])
@endif
<h4 class="entity-list-item-name break-text">{{ $entity->name }}</h4> <h4 class="entity-list-item-name break-text">{{ $entity->name }}</h4>
{{ $slot ?? '' }} {{ $slot ?? '' }}
</div> </div>

2
resources/views/partials/entity-list-item.blade.php
View File

@ -1,4 +1,4 @@
@component('partials.entity-list-item-basic', ['entity' => $entity]) @component('partials.entity-list-item-basic', ['entity' => $entity, 'showTags' => $showTags])
<div class="entity-item-snippet"> <div class="entity-item-snippet">
@if($showPath ?? false) @if($showPath ?? false)

2
resources/views/partials/entity-list.blade.php
View File

@ -1,7 +1,7 @@
@if(count($entities) > 0) @if(count($entities) > 0)
<div class="entity-list {{ $style ?? '' }}"> <div class="entity-list {{ $style ?? '' }}">
@foreach($entities as $index => $entity) @foreach($entities as $index => $entity)
@include('partials.entity-list-item', ['entity' => $entity, 'showPath' => $showPath ?? false]) @include('partials.entity-list-item', ['entity' => $entity, 'showPath' => $showPath ?? false, 'showTags' => $showTags ?? false])
@endforeach @endforeach
</div> </div>
@else @else

2
resources/views/search/all.blade.php
View File

@ -77,7 +77,7 @@
<h6 class="text-muted">{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}</h6> <h6 class="text-muted">{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}</h6>
<div class="book-contents"> <div class="book-contents">
@include('partials.entity-list', ['entities' => $entities, 'showPath' => true]) @include('partials.entity-list', ['entities' => $entities, 'showPath' => true, 'showTags' => true])
</div> </div>
@if($hasNextPage) @if($hasNextPage)