X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d886c6a32e633f21a38b5fc880cf14f9921404c2..refs/pull/5312/head:/resources/views/comments/comments.blade.php

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 5d3aafa10..48bf885ff 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,39 +1,46 @@
-<div page-comments page-id="{{ $page->id }}" class="comments-list">
-  <h5 comments-title class="float left">{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
+<section component="page-comments"
+         option:page-comments:page-id="{{ $page->id }}"
+         option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
+         option:page-comments:count-text="{{ trans('entities.comment_count') }}"
+         option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
+         option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
+         class="comments-list"
+         aria-label="{{ trans('entities.comments') }}">
 
-    <div class="comment-container" comment-container>
-        @foreach($page->comments as $comment)
-            @include('comments.comment', ['comment' => $comment])
+    <div refs="page-comments@comment-count-bar" class="grid half left-focus v-center no-row-gap">
+        <h5 refs="page-comments@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@add-button-container">
+                <button type="button"
+                        refs="page-comments@add-comment-button"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
+            </div>
+        @endif
+    </div>
+
+    <div refs="page-comments@commentContainer" class="comment-container">
+        @foreach($commentTree->get() as $branch)
+            @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
     </div>
 
     @if(userCan('comment-create-all'))
-
-        <div class="comment-box" comment-box style="display:none;">
-            <div class="header">@icon('comment') {{ trans('entities.comment_new') }}</div>
-            <div comment-form-reply-to class="reply-row primary-background-light text-muted" style="display: none;">
-                <button class="text-button float right" action="remove-reply-to">{{ trans('common.remove') }}</button>
-                {!! trans('entities.comment_in_reply_to', ['commentId' => '<a href=""></a>']) !!}
-            </div>
-            <div class="content" comment-form-container>
-                <form novalidate>
-                    <div class="form-group">
-                        <textarea name="markdown" rows="3" v-model="comment.text" placeholder="{{ trans('entities.comment_placeholder') }}"></textarea>
-                    </div>
-                    <div class="form-group text-right">
-                        <button type="button" class="button outline" action="hideForm">{{ trans('common.cancel') }}</button>
-                        <button type="submit" class="button pos">{{ trans('entities.comment_save') }}</button>
-                    </div>
-                    <div class="form-group loading" style="display: none;">
-                        @include('partials.loading-icon', ['text' => trans('entities.comment_saving')])
-                    </div>
-                </form>
+        @include('comments.create')
+        @if (!$commentTree->empty())
+            <div refs="page-comments@addButtonContainer" class="text-right">
+                <button type="button"
+                        refs="page-comments@add-comment-button"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
             </div>
-        </div>
+        @endif
+    @endif
 
-        <div class="form-group" comment-add-button>
-            <button type="button" action="addComment" class="button outline float right">{{ trans('entities.comment_add') }}</button>
-        </div>
+    @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
+        @push('body-end')
+            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}" defer></script>
+            @include('form.editor-translations')
+            @include('entities.selector-popup')
+        @endpush
     @endif
 
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file