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

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 24a8b3e23..fc81f13ee 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,11 +1,37 @@
-<div id="page-comments" page-id="<?= $page->id ?>" class="comments-list" v-cloak>
-  <h3>@{{totalCommentsStr}}</h3>
-  <hr>
-  <comment v-for="(comment, index) in comments" :initial-comment="comment" :index="index" :level=1
-     v-on:comment-added.stop="commentAdded"
-     :key="comment.id"></comment>
-  <div v-if="canComment">
-     <comment-reply v-on:comment-added.stop="commentAdded" :page-id="<?= $page->id ?>">
-     </comment-reply>
-  </div>
-</div>
\ No newline at end of file
+<section page-comments page-id="{{ $page->id }}" class="comments-list" aria-label="{{ trans('entities.comments') }}">
+
+    @exposeTranslations([
+        'entities.comment_updated_success',
+        'entities.comment_deleted_success',
+        'entities.comment_created_success',
+        'entities.comment_count',
+    ])
+
+    <div comment-count-bar 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'))
+            <div class="text-m-right" comment-add-button-container>
+                <button type="button" action="addComment"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
+            </div>
+        @endif
+    </div>
+
+    <div class="comment-container" comment-container>
+        @foreach($page->comments as $comment)
+            @include('comments.comment', ['comment' => $comment])
+        @endforeach
+    </div>
+
+    @if(userCan('comment-create-all'))
+        @include('comments.create')
+
+        @if (count($page->comments) > 0)
+            <div class="text-right" comment-add-button-container>
+                <button type="button" action="addComment"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
+            </div>
+        @endif
+    @endif
+
+</section>
\ No newline at end of file