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

Comments: Updated to show form in expected location

Browse Source 
Includes a change of create response to use a branch as a template.
This commit is contained in:
Dan Brown
2023-06-08 15:03:38 +01:00
parent 154924cc0c
commit 3b46b92bb9
7 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/views/comments/comment-branch.blade.php
View File

@@ -2,16 +2,14 @@
<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 class="flex-container-row">
<div class="comment-thread-indicator-parent">
<div class="comment-thread-indicator"></div>
</div>
@endif
<div class="comment-branch-children flex">
@foreach($branch['children'] as $childBranch)
@include('comments.comment-branch', ['branch' => $childBranch])
@endforeach
</div>
</div>
</div>

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

@@ -28,14 +28,14 @@
</div>
<div class="actions text-right">
@if(userCan('comment-update', $comment))
<button refs="page-comment@edit-button" type="button" class="text-button" aria-label="{{ trans('common.edit') }}" title="{{ trans('common.edit') }}">@icon('edit')</button>
<button refs="page-comment@edit-button" type="button" class="text-button icon p-xs" aria-label="{{ trans('common.edit') }}" title="{{ trans('common.edit') }}">@icon('edit')</button>
@endif
@if(userCan('comment-create-all'))
<button refs="page-comment@reply-button" type="button" class="text-button" aria-label="{{ trans('common.reply') }}" title="{{ trans('common.reply') }}">@icon('reply')</button>
<button refs="page-comment@reply-button" type="button" class="text-button icon p-xs" aria-label="{{ trans('common.reply') }}" title="{{ trans('common.reply') }}">@icon('reply')</button>
@endif
@if(userCan('comment-delete', $comment))
<div component="dropdown" class="dropdown-container">
<button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" class="text-button" title="{{ trans('common.delete') }}">@icon('delete')</button>
<button type="button" refs="dropdown@toggle" aria-haspopup="true" aria-expanded="false" class="text-button icon p-xs" title="{{ trans('common.delete') }}">@icon('delete')</button>
<ul refs="dropdown@menu" class="dropdown-menu" role="menu">
<li class="px-m text-small text-muted pb-s">{{trans('entities.comment_delete_confirm')}}</li>
<li>

44
resources/views/comments/create.blade.php
View File

@@ -1,30 +1,32 @@
<div refs="page-comments@form-container" hidden class="comment-box">
<div refs="page-comments@form-container" hidden class="comment-branch mb-m">
<div class="comment-box">
<div class="header p-s">{{ trans('entities.comment_new') }}</div>
<div refs="page-comments@reply-to-row" hidden class="primary-background-light text-muted px-s py-xs mb-s">
<div class="grid left-focus v-center">
<div>
{!! trans('entities.comment_in_reply_to', ['commentId' => '<a href=""></a>']) !!}
</div>
<div class="text-right">
<button refs="page-comments@remove-reply-to-button" class="text-button">{{ trans('common.remove') }}</button>
<div class="header p-s">{{ trans('entities.comment_new') }}</div>
<div refs="page-comments@reply-to-row" hidden class="primary-background-light text-muted px-s py-xs mb-s">
<div class="grid left-focus v-center">
<div>
{!! trans('entities.comment_in_reply_to', ['commentId' => '<a href=""></a>']) !!}
</div>
<div class="text-right">
<button refs="page-comments@remove-reply-to-button" class="text-button">{{ trans('common.remove') }}</button>
</div>
</div>
</div>
</div>
<div class="content px-s">
<form refs="page-comments@form" novalidate>
<div class="form-group description-input">
<div class="content px-s">
<form refs="page-comments@form" novalidate>
<div class="form-group description-input">
<textarea refs="page-comments@form-input" name="markdown"
rows="3"
placeholder="{{ trans('entities.comment_placeholder') }}"></textarea>
</div>
<div class="form-group text-right">
<button type="button" class="button outline"
refs="page-comments@hide-form-button">{{ trans('common.cancel') }}</button>
<button type="submit" class="button">{{ trans('entities.comment_save') }}</button>
</div>
</form>
</div>
</div>
<div class="form-group text-right">
<button type="button" class="button outline"
refs="page-comments@hide-form-button">{{ trans('common.cancel') }}</button>
<button type="submit" class="button">{{ trans('entities.comment_save') }}</button>
</div>
</form>
</div>
</div>
</div>