webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Comments: Updated to show as nested threads

Browse Source 
Initial functional implementation, a lot of tweaking and adapting to be
done.
This commit is contained in:
Dan Brown
2023-06-07 13:24:49 +01:00
parent 88785aa71b
commit 4b9f6beb37
8 changed files with 143 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/sass/_components.scss
View File

@ -704,6 +704,13 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
}
}
.comment-thread-indicator {
border-inline-start: 3px dotted #DDD;
@include lightDark(border-color, #DDD, #444);
margin-inline-start: $-xs;
width: $-l;
}
#tag-manager .drag-card {
max-width: 500px;
}

17
resources/views/comments/comment-branch.blade.php Normal file
View File

@ -0,0 +1,17 @@
<div>
<div class="mb-m">
@include('comments.comment', ['comment' => $branch['comment']])
</div>
@if(count($branch['children']) > 0)
<div class="flex-container-row">
<div class="pb-m">
<div class="comment-thread-indicator fill-height"></div>
</div>
<div class="flex">
@foreach($branch['children'] as $childBranch)
@include('comments.comment-branch', ['branch' => $childBranch])
@endforeach
</div>
</div>
@endif
</div>

2
resources/views/comments/comment.blade.php
View File

@ -1,4 +1,4 @@
<div class="comment-box mb-m" comment="{{ $comment->id }}" local-id="{{$comment->local_id}}" parent-id="{{$comment->parent_id}}" id="comment{{$comment->local_id}}">
<div class="comment-box" comment="{{ $comment->id }}" local-id="{{$comment->local_id}}" parent-id="{{$comment->parent_id}}" id="comment{{$comment->local_id}}">
<div class="header p-s">
<div class="grid half left-focus no-gap v-center">
<div class="meta text-muted text-small">

10
resources/views/comments/comments.blade.php
View File

@ -8,8 +8,8 @@
aria-label="{{ trans('entities.comments') }}">
<div refs="page-comments@commentCountBar" class="grid half left-focus v-center no-row-gap">
<h5 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
@if (count($page->comments) === 0 && userCan('comment-create-all'))
<h5 comments-title>{{ trans_choice('entities.comment_count', $commentTree->count(), ['count' => $commentTree->count()]) }}</h5>
@if ($commentTree->empty() && userCan('comment-create-all'))
<div class="text-m-right" refs="page-comments@addButtonContainer">
<button type="button" action="addComment"
class="button outline">{{ trans('entities.comment_add') }}</button>
@ -18,15 +18,15 @@
</div>
<div refs="page-comments@commentContainer" class="comment-container">
@foreach($page->comments as $comment)
@include('comments.comment', ['comment' => $comment])
@foreach($commentTree->get() as $branch)
@include('comments.comment-branch', ['branch' => $branch])
@endforeach
</div>
@if(userCan('comment-create-all'))
@include('comments.create')
@if (count($page->comments) > 0)
@if (!$commentTree->empty())
<div refs="page-comments@addButtonContainer" class="text-right">
<button type="button" action="addComment"
class="button outline">{{ trans('entities.comment_add') }}</button>

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

@ -27,7 +27,7 @@
@include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
@if ($commentsEnabled)
@if ($commentTree->enabled())
@if(($previous || $next))
<div class="px-xl">
<hr class="darker">
@ -35,7 +35,7 @@
@endif
<div class="px-xl comments-container mb-l print-hidden">
@include('comments.comments', ['page' => $page])
@include('comments.comments', ['commentTree' => $commentTree, 'page' => $page])
<div class="clearfix"></div>
</div>
@endif