X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0bda5554dd4323c7fecd5004111260978dfa4f1d..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 93e7ebc05..48bf885ff 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,16 +1,46 @@
-<script type="text/ng-template" id="comment-list-item.html">
-    @include('comments/list-item')
-</script>
-<script type="text/ng-template" id="comment-reply.html">
-    @include('comments/comment-reply', ['pageId' => $pageId])
-</script>
-<div ng-controller="CommentListController as vm" ng-init="pageId = <?= $page->id ?>" class="comments-list" ng-cloak>
-<h3>@{{vm.totalCommentsStr}}</h3>
-<hr>
-    <div class="comment-box" ng-repeat="comment in vm.comments track by comment.id">
-        <div ng-include src="'comment-list-item.html'">
+<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>
+    <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>
-    @include('comments/comment-reply', ['pageId' => $pageId])
-</div>
\ No newline at end of file
+
+    <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'))
+        @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>
+        @endif
+    @endif
+
+    @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
+
+</section>
\ No newline at end of file